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

Fix const correctness

Browse Source 
Change-Id: I40728827423ef0832640de2ebd2ad6d637fb4a5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-08-13 16:22:34 +02:00
committed by Orgad Shaneh
parent 87b5db5562
commit 0b1a49a66e
2 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -739,7 +739,7 @@ GitClient::~GitClient()
{ {
} }
QString GitClient::findRepositoryForDirectory(const QString &dir) QString GitClient::findRepositoryForDirectory(const QString &dir) const
{ {
if (dir.isEmpty() || dir.endsWith(QLatin1String("/.git")) if (dir.isEmpty() || dir.endsWith(QLatin1String("/.git"))
|| dir.contains(QLatin1String("/.git/"))) { || dir.contains(QLatin1String("/.git/"))) {
@@ -963,7 +963,7 @@ VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(
void GitClient::diff(const QString &workingDirectory, void GitClient::diff(const QString &workingDirectory,
const QStringList &unstagedFileNames, const QStringList &unstagedFileNames,
const QStringList &stagedFileNames) const QStringList &stagedFileNames) const
{ {
GitDiffEditorReloader::DiffType diffType = GitDiffEditorReloader::DiffProjectList; GitDiffEditorReloader::DiffType diffType = GitDiffEditorReloader::DiffProjectList;
@@ -1011,7 +1011,7 @@ void GitClient::diff(const QString &workingDirectory,
EditorManager::activateEditorForDocument(diffEditorDocument); EditorManager::activateEditorForDocument(diffEditorDocument);
} }
void GitClient::diff(const QString &workingDirectory, const QString &fileName) void GitClient::diff(const QString &workingDirectory, const QString &fileName) const
{ {
const QString title = tr("Git Diff \"%1\"").arg(fileName); const QString title = tr("Git Diff \"%1\"").arg(fileName);
const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource( const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(
@@ -1037,7 +1037,7 @@ void GitClient::diff(const QString &workingDirectory, const QString &fileName)
} }
void GitClient::diffBranch(const QString &workingDirectory, void GitClient::diffBranch(const QString &workingDirectory,
const QString &branchName) const QString &branchName) const
{ {
const QString title = tr("Git Diff Branch \"%1\"").arg(branchName); const QString title = tr("Git Diff Branch \"%1\"").arg(branchName);
const QString documentId = QLatin1String("Branch:") + branchName; const QString documentId = QLatin1String("Branch:") + branchName;
@@ -1552,7 +1552,7 @@ static inline bool splitCommitParents(const QString &line,
} }
bool GitClient::synchronousRevListCmd(const QString &workingDirectory, const QStringList &arguments, bool GitClient::synchronousRevListCmd(const QString &workingDirectory, const QStringList &arguments,
QString *output, QString *errorMessage) QString *output, QString *errorMessage) const
{ {
QByteArray outputTextData; QByteArray outputTextData;
QByteArray errorText; QByteArray errorText;
@@ -1576,7 +1576,7 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory,
const QStringList &files /* = QStringList() */, const QStringList &files /* = QStringList() */,
const QString &revision, const QString &revision,
QStringList *parents, QStringList *parents,
QString *errorMessage) QString *errorMessage) const
{ {
QString outputText; QString outputText;
QString errorText; QString errorText;
@@ -1609,7 +1609,7 @@ bool GitClient::synchronousParentRevisions(const QString &workingDirectory,
static const char defaultShortLogFormatC[] = "%h (%an \"%s"; static const char defaultShortLogFormatC[] = "%h (%an \"%s";
static const int maxShortLogLength = 120; static const int maxShortLogLength = 120;
QString GitClient::synchronousShortDescription(const QString &workingDirectory, const QString &revision) QString GitClient::synchronousShortDescription(const QString &workingDirectory, const QString &revision) const
{ {
// Short SHA 1, author, subject // Short SHA 1, author, subject
QString output = synchronousShortDescription(workingDirectory, revision, QString output = synchronousShortDescription(workingDirectory, revision,
@@ -1624,7 +1624,7 @@ QString GitClient::synchronousShortDescription(const QString &workingDirectory,
return output; return output;
} }
QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory) QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory) const
{ {
QByteArray outputTextData; QByteArray outputTextData;
QStringList arguments; QStringList arguments;
@@ -1642,7 +1642,7 @@ QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory
} }
bool GitClient::synchronousHeadRefs(const QString &workingDirectory, QStringList *output, bool GitClient::synchronousHeadRefs(const QString &workingDirectory, QStringList *output,
QString *errorMessage) QString *errorMessage) const
{ {
QStringList args; QStringList args;
args << QLatin1String("show-ref") << QLatin1String("--head") args << QLatin1String("show-ref") << QLatin1String("--head")
@@ -1674,7 +1674,7 @@ bool GitClient::synchronousHeadRefs(const QString &workingDirectory, QStringList
} }
// Retrieve topic (branch, tag or HEAD hash) // Retrieve topic (branch, tag or HEAD hash)
QString GitClient::synchronousTopic(const QString &workingDirectory) QString GitClient::synchronousTopic(const QString &workingDirectory) const
{ {
// First try to find branch // First try to find branch
QString branch = synchronousCurrentLocalBranch(workingDirectory); QString branch = synchronousCurrentLocalBranch(workingDirectory);
@@ -1742,7 +1742,7 @@ QString GitClient::synchronousTopRevision(const QString &workingDirectory, QStri
} }
void GitClient::synchronousTagsForCommit(const QString &workingDirectory, const QString &revision, void GitClient::synchronousTagsForCommit(const QString &workingDirectory, const QString &revision,
QString &precedes, QString &follows) QString &precedes, QString &follows) const
{ {
QByteArray pr; QByteArray pr;
QStringList arguments; QStringList arguments;
@@ -1820,7 +1820,7 @@ bool GitClient::isFastForwardMerge(const QString &workingDirectory, const QStrin
// Format an entry in a one-liner for selection list using git log. // Format an entry in a one-liner for selection list using git log.
QString GitClient::synchronousShortDescription(const QString &workingDirectory, const QString &revision, QString GitClient::synchronousShortDescription(const QString &workingDirectory, const QString &revision,
const QString &format) const QString &format) const
{ {
QString description; QString description;
QByteArray outputTextData; QByteArray outputTextData;
@@ -1862,7 +1862,7 @@ static inline QString creatorStashMessage(const QString &keyword = QString())
* StashIgnoreUnchanged: Be quiet about unchanged repositories (used for IVersionControl's snapshots). */ * StashIgnoreUnchanged: Be quiet about unchanged repositories (used for IVersionControl's snapshots). */
QString GitClient::synchronousStash(const QString &workingDirectory, const QString &messageKeyword, QString GitClient::synchronousStash(const QString &workingDirectory, const QString &messageKeyword,
unsigned flags, bool *unchanged) unsigned flags, bool *unchanged) const
{ {
if (unchanged) if (unchanged)
*unchanged = false; *unchanged = false;
@@ -1905,7 +1905,7 @@ QString GitClient::synchronousStash(const QString &workingDirectory, const QStri
bool GitClient::executeSynchronousStash(const QString &workingDirectory, bool GitClient::executeSynchronousStash(const QString &workingDirectory,
const QString &message, const QString &message,
QString *errorMessage) QString *errorMessage) const
{ {
QByteArray outputText; QByteArray outputText;
QByteArray errorText; QByteArray errorText;
@@ -1924,7 +1924,7 @@ bool GitClient::executeSynchronousStash(const QString &workingDirectory,
// Resolve a stash name from message // Resolve a stash name from message
bool GitClient::stashNameFromMessage(const QString &workingDirectory, bool GitClient::stashNameFromMessage(const QString &workingDirectory,
const QString &message, QString *name, const QString &message, QString *name,
QString *errorMessage) QString *errorMessage) const
{ {
// All happy // All happy
if (message.startsWith(QLatin1String(stashNamePrefix))) { if (message.startsWith(QLatin1String(stashNamePrefix))) {
@@ -1948,7 +1948,7 @@ bool GitClient::stashNameFromMessage(const QString &workingDirectory,
} }
bool GitClient::synchronousBranchCmd(const QString &workingDirectory, QStringList branchArgs, bool GitClient::synchronousBranchCmd(const QString &workingDirectory, QStringList branchArgs,
QString *output, QString *errorMessage) QString *output, QString *errorMessage) const
{ {
branchArgs.push_front(QLatin1String("branch")); branchArgs.push_front(QLatin1String("branch"));
QByteArray outputText; QByteArray outputText;
@@ -1962,7 +1962,7 @@ bool GitClient::synchronousBranchCmd(const QString &workingDirectory, QStringLis
} }
bool GitClient::synchronousTagCmd(const QString &workingDirectory, QStringList tagArgs, bool GitClient::synchronousTagCmd(const QString &workingDirectory, QStringList tagArgs,
QString *output, QString *errorMessage) QString *output, QString *errorMessage) const
{ {
tagArgs.push_front(QLatin1String("tag")); tagArgs.push_front(QLatin1String("tag"));
QByteArray outputText; QByteArray outputText;
@@ -1976,7 +1976,7 @@ bool GitClient::synchronousTagCmd(const QString &workingDirectory, QStringList t
} }
bool GitClient::synchronousForEachRefCmd(const QString &workingDirectory, QStringList args, bool GitClient::synchronousForEachRefCmd(const QString &workingDirectory, QStringList args,
QString *output, QString *errorMessage) QString *output, QString *errorMessage) const
{ {
args.push_front(QLatin1String("for-each-ref")); args.push_front(QLatin1String("for-each-ref"));
QByteArray outputText; QByteArray outputText;
@@ -1991,7 +1991,7 @@ bool GitClient::synchronousForEachRefCmd(const QString &workingDirectory, QStrin
} }
bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs, bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs,
QString *output, QString *errorMessage, bool silent) QString *output, QString *errorMessage, bool silent) const
{ {
remoteArgs.push_front(QLatin1String("remote")); remoteArgs.push_front(QLatin1String("remote"));
QByteArray outputText; QByteArray outputText;
@@ -2006,7 +2006,7 @@ bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringLis
} }
QMap<QString,QString> GitClient::synchronousRemotesList(const QString &workingDirectory, QMap<QString,QString> GitClient::synchronousRemotesList(const QString &workingDirectory,
QString *errorMessage) QString *errorMessage) const
{ {
QMap<QString,QString> result; QMap<QString,QString> result;
QString output; QString output;
@@ -2032,7 +2032,7 @@ QMap<QString,QString> GitClient::synchronousRemotesList(const QString &workingDi
} }
QStringList GitClient::synchronousSubmoduleStatus(const QString &workingDirectory, QStringList GitClient::synchronousSubmoduleStatus(const QString &workingDirectory,
QString *errorMessage) QString *errorMessage) const
{ {
QByteArray outputTextData; QByteArray outputTextData;
QByteArray errorText; QByteArray errorText;
@@ -2049,7 +2049,7 @@ QStringList GitClient::synchronousSubmoduleStatus(const QString &workingDirector
return commandOutputLinesFromLocal8Bit(outputTextData); return commandOutputLinesFromLocal8Bit(outputTextData);
} }
SubmoduleDataMap GitClient::submoduleList(const QString &workingDirectory) SubmoduleDataMap GitClient::submoduleList(const QString &workingDirectory) const
{ {
SubmoduleDataMap result; SubmoduleDataMap result;
QString gitmodulesFileName = workingDirectory + QLatin1String("/.gitmodules"); QString gitmodulesFileName = workingDirectory + QLatin1String("/.gitmodules");
@@ -2107,7 +2107,7 @@ SubmoduleDataMap GitClient::submoduleList(const QString &workingDirectory)
} }
bool GitClient::synchronousShow(const QString &workingDirectory, const QString &id, bool GitClient::synchronousShow(const QString &workingDirectory, const QString &id,
QString *output, QString *errorMessage) QString *output, QString *errorMessage) const
{ {
if (!canShow(id)) { if (!canShow(id)) {
*errorMessage = msgCannotShow(id); *errorMessage = msgCannotShow(id);
@@ -2282,7 +2282,7 @@ bool GitClient::isValidRevision(const QString &revision) const
Utils::SynchronousProcessResponse GitClient::synchronousGit(const QString &workingDirectory, Utils::SynchronousProcessResponse GitClient::synchronousGit(const QString &workingDirectory,
const QStringList &gitArguments, const QStringList &gitArguments,
unsigned flags, unsigned flags,
QTextCodec *outputCodec) QTextCodec *outputCodec) const
{ {
return VcsBasePlugin::runVcs(workingDirectory, gitExecutable(), gitArguments, return VcsBasePlugin::runVcs(workingDirectory, gitExecutable(), gitArguments,
settings()->intValue(GitSettings::timeoutKey) * 1000, settings()->intValue(GitSettings::timeoutKey) * 1000,
@@ -2368,7 +2368,7 @@ void GitClient::fetchFinished(const QVariant &cookie)
} }
GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, StatusMode mode, GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, StatusMode mode,
QString *output, QString *errorMessage) QString *output, QString *errorMessage) const
{ {
// Run 'status'. Note that git returns exitcode 1 if there are no added files. // Run 'status'. Note that git returns exitcode 1 if there are no added files.
QByteArray outputText; QByteArray outputText;
@@ -2407,7 +2407,7 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, St
return StatusUnchanged; return StatusUnchanged;
} }
QString GitClient::commandInProgressDescription(const QString &workingDirectory) QString GitClient::commandInProgressDescription(const QString &workingDirectory) const
{ {
switch (checkCommandInProgress(workingDirectory)) { switch (checkCommandInProgress(workingDirectory)) {
case NoCommand: case NoCommand:
@@ -2425,7 +2425,7 @@ QString GitClient::commandInProgressDescription(const QString &workingDirectory)
return QString(); return QString();
} }
GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &workingDirectory) GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &workingDirectory) const
{ {
const QString gitDir = findGitDirForRepository(workingDirectory); const QString gitDir = findGitDirForRepository(workingDirectory);
if (QFile::exists(gitDir + QLatin1String("/MERGE_HEAD"))) if (QFile::exists(gitDir + QLatin1String("/MERGE_HEAD")))
@@ -2519,7 +2519,7 @@ void GitClient::continuePreviousGitCommand(const QString &workingDirectory,
} }
} }
QString GitClient::extendedShowDescription(const QString &workingDirectory, const QString &text) QString GitClient::extendedShowDescription(const QString &workingDirectory, const QString &text) const
{ {
if (!text.startsWith(QLatin1String("commit "))) if (!text.startsWith(QLatin1String("commit ")))
return text; return text;
@@ -2538,7 +2538,7 @@ QString GitClient::extendedShowDescription(const QString &workingDirectory, cons
// Quietly retrieve branch list of remote repository URL // Quietly retrieve branch list of remote repository URL
// //
// The branch HEAD is pointing to is always returned first. // The branch HEAD is pointing to is always returned first.
QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryURL) QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryURL) const
{ {
QStringList arguments(QLatin1String("ls-remote")); QStringList arguments(QLatin1String("ls-remote"));
arguments << repositoryURL << QLatin1String(HEAD) << QLatin1String("refs/heads/*"); arguments << repositoryURL << QLatin1String(HEAD) << QLatin1String("refs/heads/*");
@@ -3099,7 +3099,7 @@ void GitClient::fetch(const QString &workingDirectory, const QString &remote)
bool GitClient::executeAndHandleConflicts(const QString &workingDirectory, bool GitClient::executeAndHandleConflicts(const QString &workingDirectory,
const QStringList &arguments, const QStringList &arguments,
const QString &abortCommand) const QString &abortCommand) const
{ {
// Disable UNIX terminals to suppress SSH prompting. // Disable UNIX terminals to suppress SSH prompting.
const unsigned flags = VcsBasePlugin::SshPasswordPrompt const unsigned flags = VcsBasePlugin::SshPasswordPrompt
@@ -3404,7 +3404,7 @@ void GitClient::stashPop(const QString &workingDirectory)
bool GitClient::synchronousStashRestore(const QString &workingDirectory, bool GitClient::synchronousStashRestore(const QString &workingDirectory,
const QString &stash, const QString &stash,
bool pop, bool pop,
const QString &branch /* = QString()*/) const QString &branch /* = QString()*/) const
{ {
QStringList arguments(QLatin1String("stash")); QStringList arguments(QLatin1String("stash"));
if (branch.isEmpty()) if (branch.isEmpty())
@@ -3416,7 +3416,7 @@ bool GitClient::synchronousStashRestore(const QString &workingDirectory,
bool GitClient::synchronousStashRemove(const QString &workingDirectory, bool GitClient::synchronousStashRemove(const QString &workingDirectory,
const QString &stash /* = QString() */, const QString &stash /* = QString() */,
QString *errorMessage /* = 0 */) QString *errorMessage /* = 0 */) const
{ {
QStringList arguments(QLatin1String("stash")); QStringList arguments(QLatin1String("stash"));
if (stash.isEmpty()) if (stash.isEmpty())
@@ -3438,7 +3438,7 @@ bool GitClient::synchronousStashRemove(const QString &workingDirectory,
bool GitClient::synchronousStashList(const QString &workingDirectory, bool GitClient::synchronousStashList(const QString &workingDirectory,
QList<Stash> *stashes, QList<Stash> *stashes,
QString *errorMessage /* = 0 */) QString *errorMessage /* = 0 */) const
{ {
stashes->clear(); stashes->clear();
QStringList arguments(QLatin1String("stash")); QStringList arguments(QLatin1String("stash"));

66
src/plugins/git/gitclient.h
View File

@@ -139,16 +139,16 @@ public:
QString gitExecutable(bool *ok = 0, QString *errorMessage = 0) const; QString gitExecutable(bool *ok = 0, QString *errorMessage = 0) const;
unsigned gitVersion(QString *errorMessage = 0) const; unsigned gitVersion(QString *errorMessage = 0) const;
QString findRepositoryForDirectory(const QString &dir); QString findRepositoryForDirectory(const QString &dir) const;
QString findGitDirForRepository(const QString &repositoryDir) const; QString findGitDirForRepository(const QString &repositoryDir) const;
bool managesFile(const QString &workingDirectory, const QString &fileName) const; bool managesFile(const QString &workingDirectory, const QString &fileName) const;
void diff(const QString &workingDirectory, const QString &fileName); void diff(const QString &workingDirectory, const QString &fileName) const;
void diff(const QString &workingDirectory, void diff(const QString &workingDirectory,
const QStringList &unstagedFileNames, const QStringList &unstagedFileNames,
const QStringList &stagedFileNames = QStringList()); const QStringList &stagedFileNames = QStringList()) const;
void diffBranch(const QString &workingDirectory, void diffBranch(const QString &workingDirectory,
const QString &branchName); const QString &branchName) const;
void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList()); void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList());
void status(const QString &workingDirectory); void status(const QString &workingDirectory);
@@ -193,57 +193,57 @@ public:
enum { StashPromptDescription = 0x1, StashImmediateRestore = 0x2, StashIgnoreUnchanged = 0x4 }; enum { StashPromptDescription = 0x1, StashImmediateRestore = 0x2, StashIgnoreUnchanged = 0x4 };
QString synchronousStash(const QString &workingDirectory, QString synchronousStash(const QString &workingDirectory,
const QString &messageKeyword = QString(), const QString &messageKeyword = QString(),
unsigned flags = 0, bool *unchanged = 0); unsigned flags = 0, bool *unchanged = 0) const;
bool executeSynchronousStash(const QString &workingDirectory, bool executeSynchronousStash(const QString &workingDirectory,
const QString &message = QString(), const QString &message = QString(),
QString *errorMessage = 0); QString *errorMessage = 0) const;
bool synchronousStashRestore(const QString &workingDirectory, bool synchronousStashRestore(const QString &workingDirectory,
const QString &stash, const QString &stash,
bool pop = false, bool pop = false,
const QString &branch = QString()); const QString &branch = QString()) const;
bool synchronousStashRemove(const QString &workingDirectory, bool synchronousStashRemove(const QString &workingDirectory,
const QString &stash = QString(), const QString &stash = QString(),
QString *errorMessage = 0); QString *errorMessage = 0) const;
bool synchronousBranchCmd(const QString &workingDirectory, QStringList branchArgs, bool synchronousBranchCmd(const QString &workingDirectory, QStringList branchArgs,
QString *output, QString *errorMessage); QString *output, QString *errorMessage) const;
bool synchronousTagCmd(const QString &workingDirectory, QStringList tagArgs, bool synchronousTagCmd(const QString &workingDirectory, QStringList tagArgs,
QString *output, QString *errorMessage); QString *output, QString *errorMessage) const;
bool synchronousForEachRefCmd(const QString &workingDirectory, QStringList args, bool synchronousForEachRefCmd(const QString &workingDirectory, QStringList args,
QString *output, QString *errorMessage = 0); QString *output, QString *errorMessage = 0) const;
bool synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs, bool synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs,
QString *output, QString *errorMessage, bool silent = false); QString *output, QString *errorMessage, bool silent = false) const;
QMap<QString,QString> synchronousRemotesList(const QString &workingDirectory, QMap<QString,QString> synchronousRemotesList(const QString &workingDirectory,
QString *errorMessage = 0); QString *errorMessage = 0) const;
QStringList synchronousSubmoduleStatus(const QString &workingDirectory, QStringList synchronousSubmoduleStatus(const QString &workingDirectory,
QString *errorMessage = 0); QString *errorMessage = 0) const;
SubmoduleDataMap submoduleList(const QString &workingDirectory); SubmoduleDataMap submoduleList(const QString &workingDirectory) const;
bool synchronousShow(const QString &workingDirectory, const QString &id, bool synchronousShow(const QString &workingDirectory, const QString &id,
QString *output, QString *errorMessage); QString *output, QString *errorMessage) const;
bool synchronousRevListCmd(const QString &workingDirectory, const QStringList &arguments, bool synchronousRevListCmd(const QString &workingDirectory, const QStringList &arguments,
QString *output, QString *errorMessage = 0); QString *output, QString *errorMessage = 0) const;
bool synchronousParentRevisions(const QString &workingDirectory, bool synchronousParentRevisions(const QString &workingDirectory,
const QStringList &files /* = QStringList() */, const QStringList &files /* = QStringList() */,
const QString &revision, const QString &revision,
QStringList *parents, QStringList *parents,
QString *errorMessage); QString *errorMessage) const;
QString synchronousShortDescription(const QString &workingDirectory, const QString &revision); QString synchronousShortDescription(const QString &workingDirectory, const QString &revision) const;
QString synchronousShortDescription(const QString &workingDirectory, const QString &revision, QString synchronousShortDescription(const QString &workingDirectory, const QString &revision,
const QString &format); const QString &format) const;
QString synchronousCurrentLocalBranch(const QString &workingDirectory); QString synchronousCurrentLocalBranch(const QString &workingDirectory) const;
bool synchronousHeadRefs(const QString &workingDirectory, QStringList *output, bool synchronousHeadRefs(const QString &workingDirectory, QStringList *output,
QString *errorMessage = 0); QString *errorMessage = 0) const;
QString synchronousTopic(const QString &workingDirectory); QString synchronousTopic(const QString &workingDirectory) const;
bool synchronousRevParseCmd(const QString &workingDirectory, const QString &ref, bool synchronousRevParseCmd(const QString &workingDirectory, const QString &ref,
QString *output, QString *errorMessage = 0) const; QString *output, QString *errorMessage = 0) const;
QString synchronousTopRevision(const QString &workingDirectory, QString *errorMessage = 0); QString synchronousTopRevision(const QString &workingDirectory, QString *errorMessage = 0);
void synchronousTagsForCommit(const QString &workingDirectory, const QString &revision, void synchronousTagsForCommit(const QString &workingDirectory, const QString &revision,
QString &precedes, QString &follows); QString &precedes, QString &follows) const;
bool isRemoteCommit(const QString &workingDirectory, const QString &commit); bool isRemoteCommit(const QString &workingDirectory, const QString &commit);
bool isFastForwardMerge(const QString &workingDirectory, const QString &branch); bool isFastForwardMerge(const QString &workingDirectory, const QString &branch);
@@ -279,11 +279,11 @@ public:
void revert(const QStringList &files, bool revertStaging); void revert(const QStringList &files, bool revertStaging);
bool synchronousStashList(const QString &workingDirectory, bool synchronousStashList(const QString &workingDirectory,
QList<Stash> *stashes, QList<Stash> *stashes,
QString *errorMessage = 0); QString *errorMessage = 0) const;
// Resolve a stash name from message (for IVersionControl's names). // Resolve a stash name from message (for IVersionControl's names).
bool stashNameFromMessage(const QString &workingDirectory, bool stashNameFromMessage(const QString &workingDirectory,
const QString &messge, QString *name, const QString &messge, QString *name,
QString *errorMessage = 0); QString *errorMessage = 0) const;
QString readConfigValue(const QString &workingDirectory, const QString &configVar) const; QString readConfigValue(const QString &workingDirectory, const QString &configVar) const;
@@ -305,14 +305,14 @@ public:
StatusResult gitStatus(const QString &workingDirectory, StatusResult gitStatus(const QString &workingDirectory,
StatusMode mode, StatusMode mode,
QString *output = 0, QString *output = 0,
QString *errorMessage = 0); QString *errorMessage = 0) const;
CommandInProgress checkCommandInProgress(const QString &workingDirectory); CommandInProgress checkCommandInProgress(const QString &workingDirectory) const;
QString commandInProgressDescription(const QString &workingDirectory); QString commandInProgressDescription(const QString &workingDirectory) const;
void continueCommandIfNeeded(const QString &workingDirectory, bool allowContinue = true); void continueCommandIfNeeded(const QString &workingDirectory, bool allowContinue = true);
QString extendedShowDescription(const QString &workingDirectory, const QString &text); QString extendedShowDescription(const QString &workingDirectory, const QString &text) const;
void launchGitK(const QString &workingDirectory, const QString &fileName); void launchGitK(const QString &workingDirectory, const QString &fileName);
void launchGitK(const QString &workingDirectory) { launchGitK(workingDirectory, QString()); } void launchGitK(const QString &workingDirectory) { launchGitK(workingDirectory, QString()); }
@@ -321,7 +321,7 @@ public:
void launchRepositoryBrowser(const QString &workingDirectory); void launchRepositoryBrowser(const QString &workingDirectory);
QStringList synchronousRepositoryBranches(const QString &repositoryURL); QStringList synchronousRepositoryBranches(const QString &repositoryURL) const;
GitSettings *settings() const; GitSettings *settings() const;
@@ -397,7 +397,7 @@ private:
// log windows updating (using VcsBasePlugin::runVcs with flags). // log windows updating (using VcsBasePlugin::runVcs with flags).
inline Utils::SynchronousProcessResponse inline Utils::SynchronousProcessResponse
synchronousGit(const QString &workingDirectory, const QStringList &arguments, synchronousGit(const QString &workingDirectory, const QStringList &arguments,
unsigned flags = 0, QTextCodec *outputCodec = 0); unsigned flags = 0, QTextCodec *outputCodec = 0) const;
// determine version as '(major << 16) + (minor << 8) + patch' or 0. // determine version as '(major << 16) + (minor << 8) + patch' or 0.
unsigned synchronousGitVersion(QString *errorMessage = 0) const; unsigned synchronousGitVersion(QString *errorMessage = 0) const;
@@ -409,7 +409,7 @@ private:
bool revertStaging); bool revertStaging);
void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd); void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd);
bool executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments, bool executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments,
const QString &abortCommand = QString()); const QString &abortCommand = QString()) const;
bool tryLauchingGitK(const QProcessEnvironment &env, bool tryLauchingGitK(const QProcessEnvironment &env,
const QString &workingDirectory, const QString &workingDirectory,
const QString &fileName, const QString &fileName,