feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Rename diffBaseDirectory -> workingDirectory

Browse Source 
Can have other usages than diff

Change-Id: Ieb01a88eb95503ac89b2f2c1120eddf404cdce5a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-10-06 20:52:09 +03:00
committed by Orgad Shaneh
parent 7b08d993bf
commit 2da85dc686
8 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/gitclient.cpp
View File

@@ -1122,7 +1122,7 @@ void GitClient::diff(const QString &workingDirectory,
vcsEditor->configurationWidget());
argWidget->setFileNames(unstagedFileNames, stagedFileNames);
QStringList userDiffArgs = argWidget->arguments();
vcsEditor->setDiffBaseDirectory(workingDirectory);
vcsEditor->setWorkingDirectory(workingDirectory);
// Create a batch of 2 commands to be run after each other in case
// we have a mixture of staged/unstaged files as is the case
@@ -1220,7 +1220,7 @@ void GitClient::diff(const QString &workingDirectory, const QString &fileName)
connect(vcsEditor, SIGNAL(diffChunkReverted(VcsBase::DiffChunk)),
argWidget, SLOT(executeCommand()));
}
vcsEditor->setDiffBaseDirectory(workingDirectory);
vcsEditor->setWorkingDirectory(workingDirectory);
QStringList cmdArgs;
cmdArgs << QLatin1String("diff")
@@ -1280,7 +1280,7 @@ void GitClient::diffBranch(const QString &workingDirectory,
branchName));
newEditor = vcsEditor->editor();
}
vcsEditor->setDiffBaseDirectory(workingDirectory);
vcsEditor->setWorkingDirectory(workingDirectory);
QStringList cmdArgs;
cmdArgs << QLatin1String("diff")
@@ -1331,7 +1331,7 @@ void GitClient::log(const QString &workingDirectory, const QString &fileName,
enableAnnotationContextMenu,
args, fileName));
editor->setFileLogAnnotateEnabled(enableAnnotationContextMenu);
editor->setDiffBaseDirectory(workingDirectory);
editor->setWorkingDirectory(workingDirectory);
QStringList arguments;
arguments << QLatin1String("log") << QLatin1String(noColorOption)
@@ -1444,7 +1444,7 @@ void GitClient::show(const QString &source, const QString &id,
<< vcsEditor->configurationWidget()->arguments()
<< id;
vcsEditor->setDiffBaseDirectory(workingDirectory);
vcsEditor->setWorkingDirectory(workingDirectory);
executeGit(workingDirectory, arguments, vcsEditor);
}
if (newEditor) {