aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.cpp
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2010-09-29 12:16:37 +0200
committerTobias Hunger <[email protected]>2010-09-29 12:29:13 +0200
commit2cf99100703adebb48837e848c0fa72baecf3e4f (patch)
treed7d1f9045bce80770318aff7dbfcbb429f28ce5b /src/plugins/git/gitclient.cpp
parent65e95c3aba69123bf3286ea0c8ff60da0eece479 (diff)
Fixup formating of mr2178
Merge-request: 2178 Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r--src/plugins/git/gitclient.cpp30
1 files changed, 18 insertions, 12 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 47b74c8e4a3..9837b7c35a7 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1926,9 +1926,9 @@ QString GitClient::readConfigValue(const QString &workingDirectory, const QStrin
bool GitClient::cloneRepository(const QString &directory,const QByteArray &url)
{
QDir workingDirectory(directory);
- const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt
- |VCSBase::VCSBasePlugin::ShowStdOutInLogWindow
- |VCSBase::VCSBasePlugin::ShowSuccessMessage;
+ const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt |
+ VCSBase::VCSBasePlugin::ShowStdOutInLogWindow|
+ VCSBase::VCSBasePlugin::ShowSuccessMessage;
if (workingDirectory.exists()) {
if (!synchronousInit(workingDirectory.path()))
@@ -1936,23 +1936,28 @@ bool GitClient::cloneRepository(const QString &directory,const QByteArray &url)
QStringList arguments(QLatin1String("remote"));
arguments << QLatin1String("add") << QLatin1String("origin") << url;
- if (!fullySynchronousGit(workingDirectory.path(),arguments,0,0,true))
- return false;
+ if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true))
+ return false;
arguments.clear();
arguments << QLatin1String("fetch");
- const Utils::SynchronousProcessResponse resp = synchronousGit(workingDirectory.path(),arguments,flags);
+ const Utils::SynchronousProcessResponse resp =
+ synchronousGit(workingDirectory.path(), arguments, flags);
if (resp.result != Utils::SynchronousProcessResponse::Finished)
return false;
arguments.clear();
- arguments << QLatin1String("config") << QLatin1String("branch.master.remote") << QLatin1String("origin");
- if (!fullySynchronousGit(workingDirectory.path(),arguments,0,0,true))
+ arguments << QLatin1String("config")
+ << QLatin1String("branch.master.remote")
+ << QLatin1String("origin");
+ if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true))
return false;
arguments.clear();
- arguments << QLatin1String("config") << QLatin1String("branch.master.merge") << QLatin1String("refs/heads/master");
- if (!fullySynchronousGit(workingDirectory.path(),arguments,0,0,true))
+ arguments << QLatin1String("config")
+ << QLatin1String("branch.master.merge")
+ << QLatin1String("refs/heads/master");
+ if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true))
return false;
return true;
@@ -1960,7 +1965,8 @@ bool GitClient::cloneRepository(const QString &directory,const QByteArray &url)
QStringList arguments(QLatin1String("clone"));
arguments << url << workingDirectory.dirName();
workingDirectory.cdUp();
- const Utils::SynchronousProcessResponse resp = synchronousGit(workingDirectory.path(),arguments,flags);
+ const Utils::SynchronousProcessResponse resp =
+ synchronousGit(workingDirectory.path(), arguments, flags);
return resp.result == Utils::SynchronousProcessResponse::Finished;
}
}
@@ -1972,7 +1978,7 @@ QString GitClient::vcsGetRepositoryURL(const QString &directory)
arguments << QLatin1String("remote.origin.url");
- if (fullySynchronousGit(directory,arguments,&outputText,0,false)) {
+ if (fullySynchronousGit(directory, arguments, &outputText, 0, false)) {
return commandOutputFromLocal8Bit(outputText);
}
return QString();