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

Mercurial: Run update after pull

Browse Source 
Get output of pull command and emit signal if update/merge is needed. On
update show update dialog.

Change-Id: I814f76daf3d89d0bd9485ed42a224b6b5d78bcb3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Nikita Baryshnikov
2013-07-10 21:55:52 +03:00
parent ee266048f6
commit a6eefb1ae0
3 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/mercurial/mercurialclient.h
View File

@@ -49,6 +49,9 @@ public:
const QString &srcLocation,
const QString &dstLocation,
const QStringList &extraOptions = QStringList());
bool synchronousPull(const QString &workingDir,
const QString &srcLocation,
const QStringList &extraOptions = QStringList());
bool manifestSync(const QString &repository, const QString &filename);
QString branchQuerySync(const QString &repositoryRoot);
QStringList parentRevisionsSync(const QString &workingDirectory,
@@ -86,6 +89,13 @@ protected:
const QStringList &files,
const QStringList &extraOptions);
StatusItem parseStatusLine(const QString &line) const;
signals:
void needUpdate();
void needMerge();
private:
void parsePullOutput(const QString &output);
};
} //namespace Internal