diff options
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 154 |
1 files changed, 77 insertions, 77 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index b176370baeb..5956f085403 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -82,7 +82,7 @@ static const char GIT_DIRECTORY[] = ".git"; namespace Git { namespace Internal { -class BaseGitDiffArgumentsWidget : public VCSBase::VCSBaseEditorParameterWidget +class BaseGitDiffArgumentsWidget : public VcsBase::VcsBaseEditorParameterWidget { Q_OBJECT @@ -210,7 +210,7 @@ private: QString m_id; }; -class GitBlameArgumentsWidget : public VCSBase::VCSBaseEditorParameterWidget +class GitBlameArgumentsWidget : public VcsBase::VcsBaseEditorParameterWidget { Q_OBJECT @@ -235,7 +235,7 @@ public: setBaseArguments(args); } - void setEditor(VCSBase::VCSBaseEditorWidget *editor) + void setEditor(VcsBase::VcsBaseEditorWidget *editor) { Q_ASSERT(editor); m_editor = editor; @@ -250,7 +250,7 @@ public: } private: - VCSBase::VCSBaseEditorWidget *m_editor; + VcsBase::VcsBaseEditorWidget *m_editor; GitClient *m_client; QString m_workingDirectory; QString m_revision; @@ -322,9 +322,9 @@ static inline QStringList commandOutputLinesFromLocal8Bit(const QByteArray &a) return output.split(newLine); } -static inline VCSBase::VCSBaseOutputWindow *outputWindow() +static inline VcsBase::VcsBaseOutputWindow *outputWindow() { - return VCSBase::VCSBaseOutputWindow::instance(); + return VcsBase::VcsBaseOutputWindow::instance(); } static inline QString msgRepositoryNotFound(const QString &dir) @@ -363,13 +363,13 @@ QString GitClient::findRepositoryForDirectory(const QString &dir) { // Check for ".git/config" const QString checkFile = QLatin1String(GIT_DIRECTORY) + QLatin1String("/config"); - return VCSBase::VCSBasePlugin::findRepositoryForDirectory(dir, checkFile); + return VcsBase::VcsBasePlugin::findRepositoryForDirectory(dir, checkFile); } -VCSBase::VCSBaseEditorWidget *GitClient::findExistingVCSEditor(const char *registerDynamicProperty, +VcsBase::VcsBaseEditorWidget *GitClient::findExistingVCSEditor(const char *registerDynamicProperty, const QString &dynamicPropertyValue) const { - VCSBase::VCSBaseEditorWidget *rc = 0; + VcsBase::VcsBaseEditorWidget *rc = 0; Core::IEditor *outputEditor = locateEditor(m_core, registerDynamicProperty, dynamicPropertyValue); if (!outputEditor) return 0; @@ -377,7 +377,7 @@ VCSBase::VCSBaseEditorWidget *GitClient::findExistingVCSEditor(const char *regis // Exists already Core::EditorManager::instance()->activateEditor(outputEditor, Core::EditorManager::ModeSwitch); outputEditor->createNew(m_msgWait); - rc = VCSBase::VCSBaseEditorWidget::getVcsBaseEditor(outputEditor); + rc = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor); return rc; } @@ -386,7 +386,7 @@ VCSBase::VCSBaseEditorWidget *GitClient::findExistingVCSEditor(const char *regis * (using the file's codec). Makes use of a dynamic property to find an * existing instance and to reuse it (in case, say, 'git diff foo' is * already open). */ -VCSBase::VCSBaseEditorWidget *GitClient::createVCSEditor(const Core::Id &id, +VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(const Core::Id &id, QString title, // Source file or directory const QString &source, @@ -396,19 +396,19 @@ VCSBase::VCSBaseEditorWidget *GitClient::createVCSEditor(const Core::Id &id, const QString &dynamicPropertyValue, QWidget *configWidget) const { - VCSBase::VCSBaseEditorWidget *rc = 0; + VcsBase::VcsBaseEditorWidget *rc = 0; Q_ASSERT(!findExistingVCSEditor(registerDynamicProperty, dynamicPropertyValue)); // Create new, set wait message, set up with source and codec Core::IEditor *outputEditor = m_core->editorManager()->openEditorWithContents(id, &title, m_msgWait); outputEditor->file()->setProperty(registerDynamicProperty, dynamicPropertyValue); - rc = VCSBase::VCSBaseEditorWidget::getVcsBaseEditor(outputEditor); + rc = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor); connect(rc, SIGNAL(annotateRevisionRequested(QString,QString,int)), this, SLOT(slotBlameRevisionRequested(QString,QString,int))); QTC_ASSERT(rc, return 0); rc->setSource(source); if (codecType == CodecSource) { - rc->setCodec(VCSBase::VCSBaseEditorWidget::getCodec(source)); + rc->setCodec(VcsBase::VcsBaseEditorWidget::getCodec(source)); } else if (codecType == CodecLogOutput) { QString encodingName = readConfigValue(source, QLatin1String("i18n.logOutputEncoding")); if (encodingName.isEmpty()) @@ -434,15 +434,15 @@ void GitClient::diff(const QString &workingDirectory, const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID; const QString title = tr("Git Diff"); - VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", workingDirectory); + VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", workingDirectory); if (!editor) { GitCommitDiffArgumentsWidget *argWidget = new GitCommitDiffArgumentsWidget(this, workingDirectory, diffArgs, unstagedFileNames, stagedFileNames); - editor = createVCSEditor(editorId, title, + editor = createVcsEditor(editorId, title, workingDirectory, CodecSource, "originalFileName", workingDirectory, argWidget); - connect(editor, SIGNAL(diffChunkReverted(VCSBase::DiffChunk)), argWidget, SLOT(executeCommand())); + connect(editor, SIGNAL(diffChunkReverted(VcsBase::DiffChunk)), argWidget, SLOT(executeCommand())); editor->setRevertDiffChunkEnabled(true); } @@ -453,7 +453,7 @@ void GitClient::diff(const QString &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 // when using the submit dialog. - VCSBase::Command *command = createCommand(workingDirectory, editor); + VcsBase::Command *command = createCommand(workingDirectory, editor); // Directory diff? QStringList cmdArgs; @@ -492,15 +492,15 @@ void GitClient::diff(const QString &workingDirectory, { const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID; const QString title = tr("Git Diff \"%1\"").arg(fileName); - const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, fileName); + const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, fileName); - VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", sourceFile); + VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("originalFileName", sourceFile); if (!editor) { GitFileDiffArgumentsWidget *argWidget = new GitFileDiffArgumentsWidget(this, workingDirectory, diffArgs, fileName); - editor = createVCSEditor(editorId, title, sourceFile, CodecSource, "originalFileName", sourceFile, argWidget); - connect(editor, SIGNAL(diffChunkReverted(VCSBase::DiffChunk)), argWidget, SLOT(executeCommand())); + editor = createVcsEditor(editorId, title, sourceFile, CodecSource, "originalFileName", sourceFile, argWidget); + connect(editor, SIGNAL(diffChunkReverted(VcsBase::DiffChunk)), argWidget, SLOT(executeCommand())); editor->setRevertDiffChunkEnabled(true); } @@ -522,11 +522,11 @@ void GitClient::diffBranch(const QString &workingDirectory, { const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID; const QString title = tr("Git Diff Branch \"%1\"").arg(branchName); - const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, QStringList()); + const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, QStringList()); - VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("BranchName", branchName); + VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("BranchName", branchName); if (!editor) - editor = createVCSEditor(editorId, title, sourceFile, CodecSource, "BranchName", branchName, + editor = createVcsEditor(editorId, title, sourceFile, CodecSource, "BranchName", branchName, new GitBranchDiffArgumentsWidget(this, workingDirectory, diffArgs, branchName)); @@ -545,9 +545,9 @@ void GitClient::status(const QString &workingDirectory) // @TODO: Use "--no-color" once it is supported QStringList statusArgs(QLatin1String("status")); statusArgs << QLatin1String("-u"); - VCSBase::VCSBaseOutputWindow *outwin = outputWindow(); + VcsBase::VcsBaseOutputWindow *outwin = outputWindow(); outwin->setRepository(workingDirectory); - VCSBase::Command *command = executeGit(workingDirectory, statusArgs, 0, true); + VcsBase::Command *command = executeGit(workingDirectory, statusArgs, 0, true); connect(command, SIGNAL(finished(bool,int,QVariant)), outwin, SLOT(clearRepository()), Qt::QueuedConnection); } @@ -574,10 +574,10 @@ void GitClient::graphLog(const QString &workingDirectory, const QString & branch arguments << branch; } const Core::Id editorId = Git::Constants::GIT_LOG_EDITOR_ID; - const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, QStringList()); - VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("logFileName", sourceFile); + const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, QStringList()); + VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("logFileName", sourceFile); if (!editor) - editor = createVCSEditor(editorId, title, sourceFile, CodecLogOutput, "logFileName", sourceFile, 0); + editor = createVcsEditor(editorId, title, sourceFile, CodecLogOutput, "logFileName", sourceFile, 0); executeGit(workingDirectory, arguments, editor); } @@ -588,10 +588,10 @@ void GitClient::log(const QString &workingDirectory, const QStringList &fileName fileNames.join(QString(", ")); const QString title = tr("Git Log \"%1\"").arg(msgArg); const Core::Id editorId = Git::Constants::GIT_LOG_EDITOR_ID; - const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, fileNames); - VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("logFileName", sourceFile); + const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, fileNames); + VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("logFileName", sourceFile); if (!editor) - editor = createVCSEditor(editorId, title, sourceFile, CodecLogOutput, "logFileName", sourceFile, + editor = createVcsEditor(editorId, title, sourceFile, CodecLogOutput, "logFileName", sourceFile, new GitLogArgumentsWidget(this, workingDirectory, enableAnnotationContextMenu, args, fileNames)); @@ -640,9 +640,9 @@ void GitClient::show(const QString &source, const QString &id, const QStringList const QString title = tr("Git Show \"%1\"").arg(id); const Core::Id editorId = Git::Constants::GIT_DIFF_EDITOR_ID; - VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("show", id); + VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("show", id); if (!editor) - editor = createVCSEditor(editorId, title, source, CodecSource, "show", id, + editor = createVcsEditor(editorId, title, source, CodecSource, "show", id, new GitShowArgumentsWidget(this, source, args, id)); GitShowArgumentsWidget *argWidget = qobject_cast<GitShowArgumentsWidget *>(editor->configurationWidget()); @@ -682,16 +682,16 @@ void GitClient::blame(const QString &workingDirectory, int lineNumber) { const Core::Id editorId = Git::Constants::GIT_BLAME_EDITOR_ID; - const QString id = VCSBase::VCSBaseEditorWidget::getTitleId(workingDirectory, QStringList(fileName), revision); + const QString id = VcsBase::VcsBaseEditorWidget::getTitleId(workingDirectory, QStringList(fileName), revision); const QString title = tr("Git Blame \"%1\"").arg(id); - const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, fileName); + const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, fileName); - VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("blameFileName", id); + VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("blameFileName", id); if (!editor) { GitBlameArgumentsWidget *argWidget = new GitBlameArgumentsWidget(this, workingDirectory, args, revision, fileName); - editor = createVCSEditor(editorId, title, sourceFile, CodecSource, "blameFileName", id, argWidget); + editor = createVcsEditor(editorId, title, sourceFile, CodecSource, "blameFileName", id, argWidget); argWidget->setEditor(editor); } @@ -704,14 +704,14 @@ void GitClient::blame(const QString &workingDirectory, arguments << QLatin1String("--") << fileName; if (!revision.isEmpty()) arguments << revision; - executeGit(workingDirectory, arguments, editor, false, VCSBase::Command::NoReport, lineNumber); + executeGit(workingDirectory, arguments, editor, false, VcsBase::Command::NoReport, lineNumber); } void GitClient::checkoutBranch(const QString &workingDirectory, const QString &branch) { QStringList arguments(QLatin1String("checkout")); arguments << branch; - VCSBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true); + VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true); connectRepositoryChanged(workingDirectory, cmd); } @@ -761,7 +761,7 @@ void GitClient::hardReset(const QString &workingDirectory, const QString &commit if (!commit.isEmpty()) arguments << commit; - VCSBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true); + VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true); connectRepositoryChanged(workingDirectory, cmd); } @@ -881,7 +881,7 @@ bool GitClient::synchronousInit(const QString &workingDirectory) if (!rc) outputWindow()->appendError(commandOutputFromLocal8Bit(errorText)); else { - // TODO: Turn this into a VCSBaseClient and use resetCachedVcsInfo(...) + // TODO: Turn this into a VcsBaseClient and use resetCachedVcsInfo(...) Core::VcsManager *vcsManager = m_core->vcsManager(); vcsManager->resetVersionControlForDirectory(workingDirectory); } @@ -1314,12 +1314,12 @@ bool GitClient::synchronousApplyPatch(const QString &workingDirectory, } // Factory function to create an asynchronous command -VCSBase::Command *GitClient::createCommand(const QString &workingDirectory, - VCSBase::VCSBaseEditorWidget* editor, +VcsBase::Command *GitClient::createCommand(const QString &workingDirectory, + VcsBase::VcsBaseEditorWidget* editor, bool useOutputToWindow, int editorLineNumber) { - VCSBase::Command *command = new VCSBase::Command(gitBinaryPath(), workingDirectory, processEnvironment()); + VcsBase::Command *command = new VcsBase::Command(gitBinaryPath(), workingDirectory, processEnvironment()); command->setCookie(QVariant(editorLineNumber)); if (editor) connect(command, SIGNAL(finished(bool,int,QVariant)), editor, SLOT(commandFinishedGotoLine(bool,int,QVariant))); @@ -1339,16 +1339,16 @@ VCSBase::Command *GitClient::createCommand(const QString &workingDirectory, } // Execute a single command -VCSBase::Command *GitClient::executeGit(const QString &workingDirectory, +VcsBase::Command *GitClient::executeGit(const QString &workingDirectory, const QStringList &arguments, - VCSBase::VCSBaseEditorWidget* editor, + VcsBase::VcsBaseEditorWidget* editor, bool useOutputToWindow, - VCSBase::Command::TerminationReportMode tm, + VcsBase::Command::TerminationReportMode tm, int editorLineNumber, bool unixTerminalDisabled) { outputWindow()->appendCommand(workingDirectory, settings()->stringValue(GitSettings::binaryPathKey), arguments); - VCSBase::Command *command = createCommand(workingDirectory, editor, useOutputToWindow, editorLineNumber); + VcsBase::Command *command = createCommand(workingDirectory, editor, useOutputToWindow, editorLineNumber); command->addJob(arguments, settings()->intValue(GitSettings::timeoutKey)); command->setTerminationReportMode(tm); command->setUnixTerminalDisabled(unixTerminalDisabled); @@ -1367,7 +1367,7 @@ QProcessEnvironment GitClient::processEnvironment() const environment.insert(QLatin1String("HOME"), QDir::toNativeSeparators(QDir::homePath())); #endif // Q_OS_WIN // Set up SSH and C locale (required by git using perl). - VCSBase::VCSBasePlugin::setProcessEnvironment(&environment, false); + VcsBase::VcsBasePlugin::setProcessEnvironment(&environment, false); return environment; } @@ -1378,7 +1378,7 @@ Utils::SynchronousProcessResponse GitClient::synchronousGit(const QString &worki unsigned flags, QTextCodec *stdOutCodec) { - return VCSBase::VCSBasePlugin::runVCS(workingDirectory, gitBinaryPath(), gitArguments, + return VcsBase::VcsBasePlugin::runVcs(workingDirectory, gitBinaryPath(), gitArguments, settings()->intValue(GitSettings::timeoutKey) * 1000, processEnvironment(), flags, stdOutCodec); @@ -1390,7 +1390,7 @@ bool GitClient::fullySynchronousGit(const QString &workingDirectory, QByteArray* errorText, bool logCommandToWindow) const { - return VCSBase::VCSBasePlugin::runFullySynchronous(workingDirectory, gitBinaryPath(), gitArguments, + return VcsBase::VcsBasePlugin::runFullySynchronous(workingDirectory, gitBinaryPath(), gitArguments, processEnvironment(), outputText, errorText, settings()->intValue(GitSettings::timeoutKey) * 1000, logCommandToWindow); @@ -1506,9 +1506,9 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR QStringList arguments(QLatin1String("ls-remote")); arguments << repositoryURL << QLatin1String("HEAD") << QLatin1String("refs/heads/*"); const unsigned flags = - VCSBase::VCSBasePlugin::SshPasswordPrompt| - VCSBase::VCSBasePlugin::SuppressStdErrInLogWindow| - VCSBase::VCSBasePlugin::SuppressFailMessageInLogWindow; + VcsBase::VcsBasePlugin::SshPasswordPrompt| + VcsBase::VcsBasePlugin::SuppressStdErrInLogWindow| + VcsBase::VcsBasePlugin::SuppressFailMessageInLogWindow; const Utils::SynchronousProcessResponse resp = synchronousGit(QString(), arguments, flags); QStringList branches; branches << "<detached HEAD>"; @@ -1564,7 +1564,7 @@ bool GitClient::tryLauchingGitK(const QProcessEnvironment &env, const QString binary = gitBinDirectory + QLatin1String("/gitk"); QStringList arguments; #endif - VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance(); + VcsBase::VcsBaseOutputWindow *outwin = VcsBase::VcsBaseOutputWindow::instance(); const QString gitkOpts = settings()->stringValue(GitSettings::gitkOptionsKey); if (!gitkOpts.isEmpty()) arguments.append(Utils::QtcProcess::splitArgs(gitkOpts)); @@ -1667,7 +1667,7 @@ bool GitClient::getCommitData(const QString &workingDirectory, // Filter out untracked files that are not part of the project QStringList untrackedFiles = commitData->filterFiles(CommitData::UntrackedFile); - VCSBase::VCSBaseSubmitEditor::filterUntrackedFilesOfProject(repoDirectory, &untrackedFiles); + VcsBase::VcsBaseSubmitEditor::filterUntrackedFilesOfProject(repoDirectory, &untrackedFiles); QList<CommitData::StateFilePair> filteredFiles; QList<CommitData::StateFilePair>::const_iterator it = commitData->files.constBegin(); for ( ; it != commitData->files.constEnd(); ++it) { @@ -1736,7 +1736,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory, const GitSubmitEditorPanelData &data, const QString &amendSHA1, const QString &messageFile, - VCSBase::SubmitFileModel *model) + VcsBase::SubmitFileModel *model) { const QString renameSeparator = QLatin1String(" -> "); const bool amend = !amendSHA1.isEmpty(); @@ -1827,7 +1827,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory, * files) or a single directory (revert all). Qt Creator currently has only * 'revert single' in its VCS menus, but the code is prepared to deal with * reverting a directory pending a sophisticated selection dialog in the - * VCSBase plugin. */ + * VcsBase plugin. */ GitClient::RevertResult GitClient::revertI(QStringList files, bool *ptrToIsDirectory, QString *errorMessage, @@ -1938,8 +1938,8 @@ bool GitClient::synchronousFetch(const QString &workingDirectory, const QString if (!remote.isEmpty()) arguments << remote; // Disable UNIX terminals to suppress SSH prompting. - const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt|VCSBase::VCSBasePlugin::ShowStdOutInLogWindow - |VCSBase::VCSBasePlugin::ShowSuccessMessage; + const unsigned flags = VcsBase::VcsBasePlugin::SshPasswordPrompt|VcsBase::VcsBasePlugin::ShowStdOutInLogWindow + |VcsBase::VcsBasePlugin::ShowSuccessMessage; const Utils::SynchronousProcessResponse resp = synchronousGit(workingDirectory, arguments, flags); return resp.result == Utils::SynchronousProcessResponse::Finished; } @@ -1955,7 +1955,7 @@ bool GitClient::synchronousPull(const QString &workingDirectory, bool rebase) if (rebase) arguments << QLatin1String("--rebase"); // Disable UNIX terminals to suppress SSH prompting. - const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt|VCSBase::VCSBasePlugin::ShowStdOutInLogWindow; + const unsigned flags = VcsBase::VcsBasePlugin::SshPasswordPrompt|VcsBase::VcsBasePlugin::ShowStdOutInLogWindow; const Utils::SynchronousProcessResponse resp = synchronousGit(workingDirectory, arguments, flags); // Notify about changed files or abort the rebase. const bool ok = resp.result == Utils::SynchronousProcessResponse::Finished; @@ -1971,7 +1971,7 @@ bool GitClient::synchronousPull(const QString &workingDirectory, bool rebase) void GitClient::syncAbortPullRebase(const QString &workingDir) { // Abort rebase to clean if something goes wrong - VCSBase::VCSBaseOutputWindow *outwin = VCSBase::VCSBaseOutputWindow::instance(); + VcsBase::VcsBaseOutputWindow *outwin = VcsBase::VcsBaseOutputWindow::instance(); outwin->appendError(tr("The command 'git pull --rebase' failed, aborting rebase.")); QStringList arguments; arguments << QLatin1String("rebase") << QLatin1String("--abort"); @@ -1989,8 +1989,8 @@ void GitClient::synchronousSubversionFetch(const QString &workingDirectory) QStringList args; args << QLatin1String("svn") << QLatin1String("fetch"); // Disable UNIX terminals to suppress SSH prompting. - const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt|VCSBase::VCSBasePlugin::ShowStdOutInLogWindow - |VCSBase::VCSBasePlugin::ShowSuccessMessage; + const unsigned flags = VcsBase::VcsBasePlugin::SshPasswordPrompt|VcsBase::VcsBasePlugin::ShowStdOutInLogWindow + |VcsBase::VcsBasePlugin::ShowSuccessMessage; const Utils::SynchronousProcessResponse resp = synchronousGit(workingDirectory, args, flags); // Notify about changes. if (resp.result == Utils::SynchronousProcessResponse::Finished) @@ -2008,18 +2008,18 @@ void GitClient::subversionLog(const QString &workingDirectory) // Create a command editor, no highlighting or interaction. const QString title = tr("Git SVN Log"); const Core::Id editorId = Git::Constants::C_GIT_COMMAND_LOG_EDITOR; - const QString sourceFile = VCSBase::VCSBaseEditorWidget::getSource(workingDirectory, QStringList()); - VCSBase::VCSBaseEditorWidget *editor = findExistingVCSEditor("svnLog", sourceFile); + const QString sourceFile = VcsBase::VcsBaseEditorWidget::getSource(workingDirectory, QStringList()); + VcsBase::VcsBaseEditorWidget *editor = findExistingVCSEditor("svnLog", sourceFile); if (!editor) - editor = createVCSEditor(editorId, title, sourceFile, CodecNone, "svnLog", sourceFile, 0); + editor = createVcsEditor(editorId, title, sourceFile, CodecNone, "svnLog", sourceFile, 0); executeGit(workingDirectory, arguments, editor); } bool GitClient::synchronousPush(const QString &workingDirectory, const QString &remote) { // Disable UNIX terminals to suppress SSH prompting. - const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt|VCSBase::VCSBasePlugin::ShowStdOutInLogWindow - |VCSBase::VCSBasePlugin::ShowSuccessMessage; + const unsigned flags = VcsBase::VcsBasePlugin::SshPasswordPrompt|VcsBase::VcsBasePlugin::ShowStdOutInLogWindow + |VcsBase::VcsBasePlugin::ShowSuccessMessage; QStringList arguments(QLatin1String("push")); if (!remote.isEmpty()) arguments << remote; @@ -2037,7 +2037,7 @@ void GitClient::stashPop(const QString &workingDirectory) { QStringList arguments(QLatin1String("stash")); arguments << QLatin1String("pop"); - VCSBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true); + VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true); connectRepositoryChanged(workingDirectory, cmd); } @@ -2171,9 +2171,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())) @@ -2212,7 +2212,7 @@ bool GitClient::cloneRepository(const QString &directory,const QByteArray &url) workingDirectory.cdUp(); const Utils::SynchronousProcessResponse resp = synchronousGit(workingDirectory.path(), arguments, flags); - // TODO: Turn this into a VCSBaseClient and use resetCachedVcsInfo(...) + // TODO: Turn this into a VcsBaseClient and use resetCachedVcsInfo(...) Core::VcsManager *vcsManager = m_core->vcsManager(); vcsManager->resetVersionControlForDirectory(workingDirectory.absolutePath()); return (resp.result == Utils::SynchronousProcessResponse::Finished); @@ -2236,7 +2236,7 @@ GitSettings *GitClient::settings() const return m_settings; } -void GitClient::connectRepositoryChanged(const QString & repository, VCSBase::Command *cmd) +void GitClient::connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd) { // Bind command success termination with repository to changed signal if (!m_repositoryChangedSignalMapper) { |