diff options
| author | Hugues Delorme <delorme.hugues@fougsys.fr> | 2011-11-16 11:00:43 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-11-16 13:55:08 +0100 |
| commit | 8225956d174875509abbcf1be41a13c5659b7552 (patch) | |
| tree | a070412a5c6913e1372ce1663d48af314c5e7161 | |
| parent | 803c012e622c9fd52278212997799be6d2aba6d6 (diff) | |
| download | qt-creator-8225956d174875509abbcf1be41a13c5659b7552.tar.gz | |
Bazaar: fix jumping into file from diff view
From a diff view, jumping into 'added' files wasn't working.
Actually file jumping was working only for 'modified' files.
This is fixed by using a more general diff regexp in class
BazaarEditor (attribute m_diffFileId)
This bugfix also allows to highlight all diff specs (rename, remove, ...)
Task-number: QTCREATORBUG-6531
Change-Id: I80bcbc0f77644c6caa7e7c750bd474a12263b589
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
| -rw-r--r-- | src/plugins/bazaar/bazaareditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp index 56f222c099..e277a4cced 100644 --- a/src/plugins/bazaar/bazaareditor.cpp +++ b/src/plugins/bazaar/bazaareditor.cpp @@ -56,7 +56,7 @@ using namespace Bazaar; BazaarEditor::BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent) : VCSBase::VCSBaseEditorWidget(type, parent), m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)), - m_diffFileId(QLatin1String("^=== modified file '(.*)'\\s*$")) + m_diffFileId(QLatin1String("^=== [a-z]+ [a-z]+ '(.*)'\\s*")) { setAnnotateRevisionTextFormat(tr("Annotate %1")); setAnnotatePreviousRevisionTextFormat(tr("Annotate parent revision %1")); @@ -109,7 +109,7 @@ VCSBase::BaseAnnotationHighlighter *BazaarEditor::createAnnotationHighlighter(co QString BazaarEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const { // Check for: - // === modified file 'mainwindow.cpp' + // === <change> <file|dir> 'mainwindow.cpp' for (QTextBlock block = inBlock; block.isValid(); block = block.previous()) { const QString line = block.text(); if (m_diffFileId.indexIn(line) != -1) |