From 3f74332f97b3f75e95d021e391227e38de5304c5 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 29 Jul 2012 17:56:59 +0300 Subject: [PATCH] VCS: Prevent display of "Describe Change" for invalid revision Change-Id: I0e0d3429819c4dc72071106c680e9db5d4f5cd32 Reviewed-by: Tobias Hunger --- src/plugins/vcsbase/vcsbaseeditor.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 381fd2f9442..445bf48ac13 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -337,26 +337,29 @@ void ChangeTextCursorHandler::handleCurrentContents() void ChangeTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType type) const { + VcsBaseEditorWidget *widget = editorWidget(); switch (type) { case LogOutput: { // Describe current / Annotate file of current menu->addSeparator(); menu->addAction(createCopyRevisionAction(m_currentChange)); menu->addAction(createDescribeAction(m_currentChange)); - if (editorWidget()->isFileLogAnnotateEnabled()) + if (widget->isFileLogAnnotateEnabled()) menu->addAction(createAnnotateAction(m_currentChange, false)); break; } case AnnotateOutput: { // Describe current / annotate previous + bool currentValid = widget->isValidRevision(m_currentChange); menu->addSeparator(); menu->addAction(createCopyRevisionAction(m_currentChange)); - menu->addAction(createDescribeAction(m_currentChange)); + if (currentValid) + menu->addAction(createDescribeAction(m_currentChange)); menu->addSeparator(); - if (editorWidget()->isValidRevision(m_currentChange)) - menu->addAction(createAnnotateAction(editorWidget()->decorateVersion(m_currentChange), false)); - const QStringList previousVersions = editorWidget()->annotationPreviousVersions(m_currentChange); + if (currentValid) + menu->addAction(createAnnotateAction(widget->decorateVersion(m_currentChange), false)); + const QStringList previousVersions = widget->annotationPreviousVersions(m_currentChange); if (!previousVersions.isEmpty()) { foreach (const QString &pv, previousVersions) - menu->addAction(createAnnotateAction(editorWidget()->decorateVersion(pv), true)); + menu->addAction(createAnnotateAction(widget->decorateVersion(pv), true)); } break; }