diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp index 85440388b66a3ce5ab79154bbaacd8e32e1f9238..b6e2c484110bb3508cf5066cb50e49e3aa0750b8 100644 --- a/src/plugins/bazaar/bazaareditor.cpp +++ b/src/plugins/bazaar/bazaareditor.cpp @@ -57,7 +57,7 @@ using namespace Bazaar; BazaarEditor::BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent) : VCSBase::VCSBaseEditorWidget(type, parent), m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)), - m_diffIdentifier(QLatin1String(Constants::DIFFIDENTIFIER)) + m_diffFileId(QLatin1String("^(=== modified file '.*'$)")) { setAnnotateRevisionTextFormat(tr("Annotate %1")); setAnnotatePreviousRevisionTextFormat(tr("Annotate parent revision %1")); @@ -99,7 +99,7 @@ QString BazaarEditor::changeUnderCursor(const QTextCursor &cursorIn) const VCSBase::DiffHighlighter *BazaarEditor::createDiffHighlighter() const { - return new VCSBase::DiffHighlighter(m_diffIdentifier); + return new VCSBase::DiffHighlighter(m_diffFileId); } VCSBase::BaseAnnotationHighlighter *BazaarEditor::createAnnotationHighlighter(const QSet<QString> &changes) const diff --git a/src/plugins/bazaar/bazaareditor.h b/src/plugins/bazaar/bazaareditor.h index 76ec91bda1d020b91ada3b4665aa95d9cd198592..f5f55800f6891c2a48bf79d9c6f387dfba62a6ec 100644 --- a/src/plugins/bazaar/bazaareditor.h +++ b/src/plugins/bazaar/bazaareditor.h @@ -55,7 +55,7 @@ private: virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const; const QRegExp m_exactChangesetId; - const QRegExp m_diffIdentifier; + const QRegExp m_diffFileId; }; } // namespace Internal diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h index 507ce79acb19c866743cbff6e1acbbd6c36a2a5b..bd78f13340061dc590da9f47d5fb6b40bfff1bb2 100644 --- a/src/plugins/bazaar/constants.h +++ b/src/plugins/bazaar/constants.h @@ -44,7 +44,7 @@ const char * const BAZAARDEFAULT = "bzr"; //changeset identifiers const char * const CHANGESET_ID = "([0-9]+)"; // match and capture const char * const CHANGESET_ID_EXACT = "[0-9]+"; // match -const char * const DIFFIDENTIFIER = "^[-+]{3,3} [ab]{1,1}.*"; // match e.g. +++ b/filename +const char * const DIFF_ID = "^[-+]{3,3} [ab]{1,1}.*"; // match e.g. +++ b/filename //BaseEditorParameters const char * const COMMANDLOG_ID = "Bazaar Command Log Editor";