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/clearcase | |
| parent | 0bb9ab131eeb7ae1737a6dab32d703dab6239b8c (diff) | |
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/clearcase')
| -rw-r--r-- | src/plugins/clearcase/clearcaseplugin.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/clearcase/clearcaseplugin.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 0ad3228d7aa..70315932a1b 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -1253,12 +1253,12 @@ void ClearCasePlugin::annotateCurrentFile() vcsAnnotate(state.currentFileTopLevel(), state.relativeCurrentFile()); } -void ClearCasePlugin::annotateVersion(const QString &file, - const QString &revision, - int lineNr) +void ClearCasePlugin::annotateVersion(const QString &workingDirectory, + const QString &file, + const QString &revision, + int lineNr) { - const QFileInfo fi(file); - vcsAnnotate(fi.absolutePath(), fi.fileName(), revision, lineNr); + vcsAnnotate(workingDirectory, file, revision, lineNr); } void ClearCasePlugin::vcsAnnotate(const QString &workingDir, const QString &file, @@ -1402,8 +1402,8 @@ IEditor *ClearCasePlugin::showOutputInEditor(const QString& title, const QString << "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(annotateVersion(QString,QString,int))); + connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)), + this, SLOT(annotateVersion(QString,QString,QString,int))); ClearCaseEditor *e = qobject_cast<ClearCaseEditor*>(editor->widget()); if (!e) return 0; diff --git a/src/plugins/clearcase/clearcaseplugin.h b/src/plugins/clearcase/clearcaseplugin.h index fb011182da2..6d62e2e5e88 100644 --- a/src/plugins/clearcase/clearcaseplugin.h +++ b/src/plugins/clearcase/clearcaseplugin.h @@ -185,7 +185,7 @@ private slots: void startCheckInCurrentFile(); void historyCurrentFile(); void annotateCurrentFile(); - void annotateVersion(const QString &file, const QString &revision, int lineNumber); + void annotateVersion(const QString &workingDirectory, const QString &file, const QString &revision, int lineNumber); void describe(const QString &source, const QString &changeNr); void viewStatus(); void checkInSelected(); |