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

Fixes: Add ensureStashed() method asking user to stash before a change such as pull

Browse Source
This commit is contained in:
Friedemann Kleint
2008-12-19 11:45:30 +01:00
parent d6fbb1b573
commit 4db2f99836
4 changed files with 90 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,6 +92,7 @@ public:
bool synchronousReset(const QString &workingDirectory, const QStringList &files);
bool synchronousReset(const QString &workingDirectory, const QStringList &files, QString *errorMessage);
bool synchronousCheckout(const QString &workingDirectory, const QStringList &files, QString *errorMessage);
bool synchronousStash(const QString &workingDirectory, QString *errorMessage);
void pull(const QString &workingDirectory);
void push(const QString &workingDirectory);
@@ -105,6 +106,11 @@ public:
QString readConfigValue(const QString &workingDirectory, const QString &configVar);
enum StashResult { StashUnchanged, StashCanceled, StashFailed,
Stashed, NotStashed /* User did not want it */ };
StashResult ensureStash(const QString &workingDirectory, QString *errorMessage);
StashResult ensureStash(const QString &workingDirectory);
bool getCommitData(const QString &workingDirectory,
QString *commitTemplate,
CommitData *d,
@@ -118,7 +124,7 @@ public:
enum StatusResult { StatusChanged, StatusUnchanged, StatusFailed };
StatusResult gitStatus(const QString &workingDirectory,
bool untracked,
bool untracked = false,
QString *output = 0,
QString *errorMessage = 0);