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

Git: Refactor branch/HEAD access

Browse Source 
Change-Id: I0c9955737033c0f839ac1f6ea053fecc20c24d48
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-10-21 15:12:21 +02:00
committed by Orgad Shaneh
parent 4eedda04d3
commit a1e3a5de9e
3 changed files with 44 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/git/gitversioncontrol.cpp
View File

@@ -161,10 +161,10 @@ QString GitVersionControl::vcsCreateSnapshot(const QString &topLevel)
return stashMessage;
if (repositoryUnchanged) {
// For unchanged repository state: return identifier + top revision
QString topRevision;
QString branch;
if (!m_client->synchronousTopRevision(topLevel, &topRevision, &branch))
QString topRevision = m_client->synchronousTopRevision(topLevel);
if (topRevision.isEmpty())
return QString();
QString branch = m_client->synchronousBranch(topLevel);
const QChar colon = QLatin1Char(':');
QString id = QLatin1String(stashRevisionIdC);
id += colon;
@@ -201,9 +201,13 @@ bool GitVersionControl::vcsRestoreSnapshot(const QString &topLevel, const QStrin
break;
const QString branch = tokens.at(1);
const QString revision = tokens.at(2);
success = m_client->synchronousReset(topLevel)
&& m_client->synchronousCheckoutBranch(topLevel, branch)
&& m_client->synchronousCheckoutFiles(topLevel, QStringList(), revision);
success = m_client->synchronousReset(topLevel);
if (success && !branch.isEmpty()) {
success = m_client->synchronousCheckoutBranch(topLevel, branch) &&
m_client->synchronousCheckoutFiles(topLevel, QStringList(), revision);
} else {
success = m_client->synchronousCheckoutBranch(topLevel, revision);
}
} else {
// Restore stash if it can be resolved.
QString stashName;