forked from qt-creator/qt-creator
Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
476 lines
18 KiB
C++
476 lines
18 KiB
C++
/**************************************************************************
|
|
**
|
|
** Copyright (c) 2014 Brian McGillion
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
** conditions see http://www.qt.io/licensing. For further information
|
|
** use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "mercurialclient.h"
|
|
#include "constants.h"
|
|
|
|
#include <vcsbase/vcscommand.h>
|
|
#include <vcsbase/vcsoutputwindow.h>
|
|
#include <vcsbase/vcsbaseplugin.h>
|
|
#include <vcsbase/vcsbaseeditor.h>
|
|
#include <vcsbase/vcsbaseeditorparameterwidget.h>
|
|
#include <utils/synchronousprocess.h>
|
|
#include <utils/fileutils.h>
|
|
#include <utils/qtcassert.h>
|
|
|
|
#include <QDateTime>
|
|
#include <QDir>
|
|
#include <QFileInfo>
|
|
#include <QTextCodec>
|
|
#include <QTextStream>
|
|
#include <QVariant>
|
|
|
|
using namespace Utils;
|
|
using namespace VcsBase;
|
|
|
|
namespace Mercurial {
|
|
namespace Internal {
|
|
|
|
MercurialClient::MercurialClient(MercurialSettings *settings) :
|
|
VcsBaseClient(settings)
|
|
{
|
|
}
|
|
|
|
MercurialSettings *MercurialClient::settings() const
|
|
{
|
|
return dynamic_cast<MercurialSettings *>(VcsBaseClient::settings());
|
|
}
|
|
|
|
bool MercurialClient::manifestSync(const QString &repository, const QString &relativeFilename)
|
|
{
|
|
// This only works when called from the repo and outputs paths relative to it.
|
|
const QStringList args(QLatin1String("manifest"));
|
|
|
|
QByteArray output;
|
|
vcsFullySynchronousExec(repository, args, &output);
|
|
const QDir repositoryDir(repository);
|
|
const QFileInfo needle = QFileInfo(repositoryDir, relativeFilename);
|
|
|
|
const QStringList files = QString::fromLocal8Bit(output).split(QLatin1Char('\n'));
|
|
foreach (const QString &fileName, files) {
|
|
const QFileInfo managedFile(repositoryDir, fileName);
|
|
if (needle == managedFile)
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
//bool MercurialClient::clone(const QString &directory, const QString &url)
|
|
bool MercurialClient::synchronousClone(const QString &workingDir,
|
|
const QString &srcLocation,
|
|
const QString &dstLocation,
|
|
const QStringList &extraOptions)
|
|
{
|
|
Q_UNUSED(workingDir);
|
|
Q_UNUSED(extraOptions);
|
|
QDir workingDirectory(srcLocation);
|
|
QByteArray output;
|
|
const unsigned flags = VcsBasePlugin::SshPasswordPrompt |
|
|
VcsBasePlugin::ShowStdOutInLogWindow |
|
|
VcsBasePlugin::ShowSuccessMessage;
|
|
|
|
if (workingDirectory.exists()) {
|
|
// Let's make first init
|
|
QStringList arguments(QLatin1String("init"));
|
|
if (!vcsFullySynchronousExec(workingDirectory.path(), arguments, &output))
|
|
return false;
|
|
|
|
// Then pull remote repository
|
|
arguments.clear();
|
|
arguments << QLatin1String("pull") << dstLocation;
|
|
const SynchronousProcessResponse resp1 =
|
|
vcsSynchronousExec(workingDirectory.path(), arguments, flags);
|
|
if (resp1.result != SynchronousProcessResponse::Finished)
|
|
return false;
|
|
|
|
// By now, there is no hgrc file -> create it
|
|
FileSaver saver(workingDirectory.path() + QLatin1String("/.hg/hgrc"));
|
|
const QString hgrc = QLatin1String("[paths]\ndefault = ") + dstLocation + QLatin1Char('\n');
|
|
saver.write(hgrc.toUtf8());
|
|
if (!saver.finalize()) {
|
|
VcsOutputWindow::appendError(saver.errorString());
|
|
return false;
|
|
}
|
|
|
|
// And last update repository
|
|
arguments.clear();
|
|
arguments << QLatin1String("update");
|
|
const SynchronousProcessResponse resp2 =
|
|
vcsSynchronousExec(workingDirectory.path(), arguments, flags);
|
|
return resp2.result == SynchronousProcessResponse::Finished;
|
|
} else {
|
|
QStringList arguments(QLatin1String("clone"));
|
|
arguments << dstLocation << workingDirectory.dirName();
|
|
workingDirectory.cdUp();
|
|
const SynchronousProcessResponse resp =
|
|
vcsSynchronousExec(workingDirectory.path(), arguments, flags);
|
|
return resp.result == SynchronousProcessResponse::Finished;
|
|
}
|
|
}
|
|
|
|
bool MercurialClient::synchronousPull(const QString &workingDir, const QString &srcLocation, const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << vcsCommandString(PullCommand) << extraOptions << srcLocation;
|
|
// Disable UNIX terminals to suppress SSH prompting
|
|
const unsigned flags =
|
|
VcsBasePlugin::SshPasswordPrompt
|
|
| VcsBasePlugin::ShowStdOutInLogWindow
|
|
| VcsBasePlugin::ShowSuccessMessage;
|
|
const FileName binary = settings()->binaryPath();
|
|
const int timeoutSec = settings()->value(settings()->timeoutKey).toInt();
|
|
|
|
// cause mercurial doesn`t understand LANG
|
|
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
|
|
env.insert(QLatin1String("LANGUAGE"), QLatin1String("C"));
|
|
const SynchronousProcessResponse resp = VcsBasePlugin::runVcs(
|
|
workingDir, binary, args, timeoutSec * 1000, flags, 0, env);
|
|
const bool ok = resp.result == SynchronousProcessResponse::Finished;
|
|
|
|
parsePullOutput(resp.stdOut.trimmed());
|
|
return ok;
|
|
}
|
|
|
|
QString MercurialClient::branchQuerySync(const QString &repositoryRoot)
|
|
{
|
|
QFile branchFile(repositoryRoot + QLatin1String("/.hg/branch"));
|
|
if (branchFile.open(QFile::ReadOnly)) {
|
|
const QByteArray branch = branchFile.readAll().trimmed();
|
|
if (!branch.isEmpty())
|
|
return QString::fromLocal8Bit(branch);
|
|
}
|
|
return QLatin1String("Unknown Branch");
|
|
}
|
|
|
|
static inline QString msgParentRevisionFailed(const QString &workingDirectory,
|
|
const QString &revision,
|
|
const QString &why)
|
|
{
|
|
return MercurialClient::tr("Unable to find parent revisions of %1 in %2: %3").
|
|
arg(revision, QDir::toNativeSeparators(workingDirectory), why);
|
|
}
|
|
|
|
static inline QString msgParseParentsOutputFailed(const QString &output)
|
|
{
|
|
return MercurialClient::tr("Cannot parse output: %1").arg(output);
|
|
}
|
|
|
|
QStringList MercurialClient::parentRevisionsSync(const QString &workingDirectory,
|
|
const QString &file /* = QString() */,
|
|
const QString &revision)
|
|
{
|
|
QStringList parents;
|
|
QStringList args;
|
|
args << QLatin1String("parents") << QLatin1String("-r") <<revision;
|
|
if (!file.isEmpty())
|
|
args << file;
|
|
QByteArray outputData;
|
|
if (!vcsFullySynchronousExec(workingDirectory, args, &outputData))
|
|
return QStringList();
|
|
const QString output = SynchronousProcess::normalizeNewlines(
|
|
QString::fromLocal8Bit(outputData));
|
|
/* Looks like: \code
|
|
changeset: 0:031a48610fba
|
|
user: ...
|
|
\endcode */
|
|
// Obtain first line and split by blank-delimited tokens
|
|
const QStringList lines = output.split(QLatin1Char('\n'));
|
|
if (lines.size() < 1) {
|
|
VcsOutputWindow::appendSilently(msgParentRevisionFailed(workingDirectory, revision, msgParseParentsOutputFailed(output)));
|
|
return QStringList();
|
|
}
|
|
QStringList changeSets = lines.front().simplified().split(QLatin1Char(' '));
|
|
if (changeSets.size() < 2) {
|
|
VcsOutputWindow::appendSilently(msgParentRevisionFailed(workingDirectory, revision, msgParseParentsOutputFailed(output)));
|
|
return QStringList();
|
|
}
|
|
// Remove revision numbers
|
|
const QChar colon = QLatin1Char(':');
|
|
const QStringList::iterator end = changeSets.end();
|
|
QStringList::iterator it = changeSets.begin();
|
|
for (++it; it != end; ++it) {
|
|
const int colonIndex = it->indexOf(colon);
|
|
if (colonIndex != -1)
|
|
parents.push_back(it->mid(colonIndex + 1));
|
|
}
|
|
return parents;
|
|
}
|
|
|
|
// Describe a change using an optional format
|
|
QString MercurialClient::shortDescriptionSync(const QString &workingDirectory,
|
|
const QString &revision,
|
|
const QString &format)
|
|
{
|
|
QString description;
|
|
QStringList args;
|
|
args << QLatin1String("log") << QLatin1String("-r") <<revision;
|
|
if (!format.isEmpty())
|
|
args << QLatin1String("--template") << format;
|
|
QByteArray outputData;
|
|
if (!vcsFullySynchronousExec(workingDirectory, args, &outputData))
|
|
return revision;
|
|
description = Utils::SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(outputData));
|
|
if (description.endsWith(QLatin1Char('\n')))
|
|
description.truncate(description.size() - 1);
|
|
return description;
|
|
}
|
|
|
|
// Default format: "SHA1 (author summmary)"
|
|
static const char defaultFormatC[] = "{node} ({author|person} {desc|firstline})";
|
|
|
|
QString MercurialClient::shortDescriptionSync(const QString &workingDirectory,
|
|
const QString &revision)
|
|
{
|
|
return shortDescriptionSync(workingDirectory, revision, QLatin1String(defaultFormatC));
|
|
}
|
|
|
|
QString MercurialClient::vcsGetRepositoryURL(const QString &directory)
|
|
{
|
|
QByteArray output;
|
|
|
|
QStringList arguments(QLatin1String("showconfig"));
|
|
arguments << QLatin1String("paths.default");
|
|
|
|
if (vcsFullySynchronousExec(directory, arguments, &output))
|
|
return QString::fromLocal8Bit(output);
|
|
return QString();
|
|
}
|
|
|
|
bool MercurialClient::managesFile(const QString &workingDirectory, const QString &fileName) const
|
|
{
|
|
QStringList args;
|
|
args << QLatin1String("status") << QLatin1String("--unknown") << fileName;
|
|
QByteArray output;
|
|
vcsFullySynchronousExec(workingDirectory, args, &output);
|
|
return output.isEmpty();
|
|
}
|
|
|
|
void MercurialClient::incoming(const QString &repositoryRoot, const QString &repository)
|
|
{
|
|
QStringList args;
|
|
args << QLatin1String("incoming") << QLatin1String("-g") << QLatin1String("-p");
|
|
if (!repository.isEmpty())
|
|
args.append(repository);
|
|
|
|
QString id = repositoryRoot;
|
|
if (!repository.isEmpty()) {
|
|
id += QDir::separator();
|
|
id += repository;
|
|
}
|
|
|
|
const QString title = tr("Hg incoming %1").arg(id);
|
|
|
|
VcsBaseEditorWidget *editor = createVcsEditor(Constants::DIFFLOG_ID, title, repositoryRoot,
|
|
true, "incoming", id);
|
|
VcsCommand *cmd = createCommand(repository, editor);
|
|
enqueueJob(cmd, args);
|
|
}
|
|
|
|
void MercurialClient::outgoing(const QString &repositoryRoot)
|
|
{
|
|
QStringList args;
|
|
args << QLatin1String("outgoing") << QLatin1String("-g") << QLatin1String("-p");
|
|
|
|
const QString title = tr("Hg outgoing %1").
|
|
arg(QDir::toNativeSeparators(repositoryRoot));
|
|
|
|
VcsBaseEditorWidget *editor = createVcsEditor(Constants::DIFFLOG_ID, title, repositoryRoot, true,
|
|
"outgoing", repositoryRoot);
|
|
|
|
VcsCommand *cmd = createCommand(repositoryRoot, editor);
|
|
enqueueJob(cmd, args);
|
|
}
|
|
|
|
void MercurialClient::annotate(const QString &workingDir, const QString &file,
|
|
const QString &revision, int lineNumber,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(extraOptions);
|
|
args << QLatin1String("-u") << QLatin1String("-c") << QLatin1String("-d");
|
|
VcsBaseClient::annotate(workingDir, file, revision, lineNumber, args);
|
|
}
|
|
|
|
void MercurialClient::commit(const QString &repositoryRoot, const QStringList &files,
|
|
const QString &commitMessageFile,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(extraOptions);
|
|
args << QLatin1String("--noninteractive") << QLatin1String("-l") << commitMessageFile << QLatin1String("-A");
|
|
VcsBaseClient::commit(repositoryRoot, files, commitMessageFile, args);
|
|
}
|
|
|
|
void MercurialClient::diff(const QString &workingDir, const QStringList &files,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args(extraOptions);
|
|
args << QLatin1String("-g") << QLatin1String("-p") << QLatin1String("-U 8");
|
|
VcsBaseClient::diff(workingDir, files, args);
|
|
}
|
|
|
|
void MercurialClient::import(const QString &repositoryRoot, const QStringList &files,
|
|
const QStringList &extraOptions)
|
|
{
|
|
VcsBaseClient::import(repositoryRoot, files,
|
|
QStringList(extraOptions) << QLatin1String("--no-commit"));
|
|
}
|
|
|
|
void MercurialClient::revertAll(const QString &workingDir, const QString &revision,
|
|
const QStringList &extraOptions)
|
|
{
|
|
VcsBaseClient::revertAll(workingDir, revision,
|
|
QStringList(extraOptions) << QLatin1String("--all"));
|
|
}
|
|
|
|
void MercurialClient::view(const QString &source, const QString &id,
|
|
const QStringList &extraOptions)
|
|
{
|
|
QStringList args;
|
|
args << QLatin1String("log") << QLatin1String("-p") << QLatin1String("-g");
|
|
VcsBaseClient::view(source, id, args << extraOptions);
|
|
}
|
|
|
|
QString MercurialClient::findTopLevelForFile(const QFileInfo &file) const
|
|
{
|
|
const QString repositoryCheckFile = QLatin1String(Constants::MERCURIALREPO) + QLatin1String("/requires");
|
|
return file.isDir() ?
|
|
VcsBasePlugin::findRepositoryForDirectory(file.absoluteFilePath(), repositoryCheckFile) :
|
|
VcsBasePlugin::findRepositoryForDirectory(file.absolutePath(), repositoryCheckFile);
|
|
}
|
|
|
|
Core::Id MercurialClient::vcsEditorKind(VcsCommandTag cmd) const
|
|
{
|
|
switch (cmd) {
|
|
case AnnotateCommand:
|
|
return Constants::ANNOTATELOG_ID;
|
|
case DiffCommand:
|
|
return Constants::DIFFLOG_ID;
|
|
case LogCommand:
|
|
return Constants::FILELOG_ID;
|
|
default:
|
|
return Core::Id();
|
|
}
|
|
}
|
|
|
|
QStringList MercurialClient::revisionSpec(const QString &revision) const
|
|
{
|
|
QStringList args;
|
|
if (!revision.isEmpty())
|
|
args << QLatin1String("-r") << revision;
|
|
return args;
|
|
}
|
|
|
|
MercurialClient::StatusItem MercurialClient::parseStatusLine(const QString &line) const
|
|
{
|
|
StatusItem item;
|
|
if (!line.isEmpty())
|
|
{
|
|
if (line.startsWith(QLatin1Char('M')))
|
|
item.flags = QLatin1String("Modified");
|
|
else if (line.startsWith(QLatin1Char('A')))
|
|
item.flags = QLatin1String("Added");
|
|
else if (line.startsWith(QLatin1Char('R')))
|
|
item.flags = QLatin1String("Removed");
|
|
else if (line.startsWith(QLatin1Char('!')))
|
|
item.flags = QLatin1String("Deleted");
|
|
else if (line.startsWith(QLatin1Char('?')))
|
|
item.flags = QLatin1String("Untracked");
|
|
else
|
|
return item;
|
|
|
|
//the status line should be similar to "M file_with_changes"
|
|
//so just should take the file name part and store it
|
|
item.file = line.mid(2);
|
|
}
|
|
return item;
|
|
}
|
|
|
|
void MercurialClient::parsePullOutput(const QString &output)
|
|
{
|
|
if (output.endsWith(QLatin1String("no changes found")))
|
|
return;
|
|
|
|
if (output.endsWith(QLatin1String("(run 'hg update' to get a working copy)"))) {
|
|
emit needUpdate();
|
|
return;
|
|
}
|
|
|
|
if (output.endsWith(QLatin1String("'hg merge' to merge)")))
|
|
emit needMerge();
|
|
}
|
|
|
|
// Collect all parameters required for a diff to be able to associate them
|
|
// with a diff editor and re-run the diff with parameters.
|
|
struct MercurialDiffParameters
|
|
{
|
|
QString workingDir;
|
|
QStringList files;
|
|
QStringList extraOptions;
|
|
};
|
|
|
|
// Parameter widget controlling whitespace diff mode, associated with a parameter
|
|
class MercurialDiffParameterWidget : public VcsBaseEditorParameterWidget
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
MercurialDiffParameterWidget(MercurialClient *client,
|
|
const MercurialDiffParameters &p, QWidget *parent = 0) :
|
|
VcsBaseEditorParameterWidget(parent), m_client(client), m_params(p)
|
|
{
|
|
mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
|
|
client->settings()->boolPointer(MercurialSettings::diffIgnoreWhiteSpaceKey));
|
|
mapSetting(addToggleButton(QLatin1String("-B"), tr("Ignore Blank Lines")),
|
|
client->settings()->boolPointer(MercurialSettings::diffIgnoreBlankLinesKey));
|
|
}
|
|
|
|
void executeCommand()
|
|
{
|
|
m_client->diff(m_params.workingDir, m_params.files, m_params.extraOptions);
|
|
}
|
|
|
|
private:
|
|
MercurialClient *m_client;
|
|
const MercurialDiffParameters m_params;
|
|
};
|
|
|
|
VcsBaseEditorParameterWidget *MercurialClient::createDiffEditor(
|
|
const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
|
|
{
|
|
MercurialDiffParameters parameters;
|
|
parameters.workingDir = workingDir;
|
|
parameters.files = files;
|
|
parameters.extraOptions = extraOptions;
|
|
return new MercurialDiffParameterWidget(this, parameters);
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace Mercurial
|
|
|
|
#include "mercurialclient.moc"
|