diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-10-06 20:47:29 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-10-10 18:59:43 +0200 |
| commit | 7b08d993bff0951428d6a7cb2d402e9571df0550 (patch) | |
| tree | 800d3d234873382f6f9d6d0ad2132fbed048f06e /src/plugins/cvs | |
| parent | 0bb9ab131eeb7ae1737a6dab32d703dab6239b8c (diff) | |
| download | qt-creator-7b08d993bff0951428d6a7cb2d402e9571df0550.tar.gz | |
VCS: Pass workingDirectory for annotate
Required for supporting renames on annotate.
The renamed file (and possibly its parent directory) doesn't exist
anymore, so it shouldn't be passed as a working directory.
Change-Id: I809e8df17c1dc5199e533b525244a668eccbcd5f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/cvs')
| -rw-r--r-- | src/plugins/cvs/cvscontrol.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/cvs/cvsplugin.h | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp index e4ddcfd380..87fdc2cf24 100644 --- a/src/plugins/cvs/cvscontrol.cpp +++ b/src/plugins/cvs/cvscontrol.cpp @@ -148,7 +148,8 @@ bool CvsControl::vcsRemoveSnapshot(const QString &, const QString &) bool CvsControl::vcsAnnotate(const QString &file, int line) { - m_plugin->vcsAnnotate(file, QString(), line); + const QFileInfo fi(file); + m_plugin->vcsAnnotate(fi.absolutePath(), fi.fileName(), QString(), line); return true; } diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index fdbd7ea1c3..646bc6b087 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -923,10 +923,10 @@ void CvsPlugin::annotateCurrentFile() annotate(state.currentFileTopLevel(), state.relativeCurrentFile()); } -void CvsPlugin::vcsAnnotate(const QString &file, const QString &revision, int lineNumber) +void CvsPlugin::vcsAnnotate(const QString &workingDirectory, const QString &file, + const QString &revision, int lineNumber) { - const QFileInfo fi(file); - annotate(fi.absolutePath(), fi.fileName(), revision, lineNumber); + annotate(workingDirectory, file, revision, lineNumber); } bool CvsPlugin::edit(const QString &topLevel, const QStringList &files) @@ -1274,8 +1274,8 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp << "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); QString s = title; IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8()); - connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)), - this, SLOT(vcsAnnotate(QString,QString,int))); + connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)), + this, SLOT(vcsAnnotate(QString,QString,QString,int))); CvsEditor *e = qobject_cast<CvsEditor*>(editor->widget()); if (!e) return 0; diff --git a/src/plugins/cvs/cvsplugin.h b/src/plugins/cvs/cvsplugin.h index 9608cd2e1b..ba5aad89b8 100644 --- a/src/plugins/cvs/cvsplugin.h +++ b/src/plugins/cvs/cvsplugin.h @@ -96,7 +96,8 @@ public: static CvsPlugin *instance(); public slots: - void vcsAnnotate(const QString &file, const QString &revision /* = QString() */, int lineNumber); + void vcsAnnotate(const QString &workingDirectory, const QString &file, + const QString &revision, int lineNumber); private slots: void addCurrentFile(); |