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

Git: Rename synchronousBranch -> synchronousTopic

Browse Source 
Change-Id: I272e9db7a560f6e72dda6a0368d463da820f5b0b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-29 22:19:19 +02:00
committed by Orgad Shaneh
parent 2118d542e6
commit 6a58cdffc2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -1110,7 +1110,7 @@ static inline QString msgCannotDetermineBranch(const QString &workingDirectory,
}
// Retrieve head branch
QString GitClient::synchronousBranch(const QString &workingDirectory)
QString GitClient::synchronousTopic(const QString &workingDirectory)
{
QByteArray outputTextData;
QStringList arguments;

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

@@ -161,7 +161,7 @@ public:
QString synchronousShortDescription(const QString &workingDirectory, const QString &revision);
QString synchronousShortDescription(const QString &workingDirectory, const QString &revision,
const QString &format);
QString synchronousBranch(const QString &workingDirectory);
QString synchronousTopic(const QString &workingDirectory);
QString synchronousTopRevision(const QString &workingDirectory, QString *errorMessage = 0);
void synchronousTagsForCommit(const QString &workingDirectory, const QString &revision,
QByteArray &precedes, QByteArray &follows);

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

@@ -142,7 +142,7 @@ QString GitVersionControl::vcsGetRepositoryURL(const QString &directory)
QString GitVersionControl::vcsTopic(const QString &directory)
{
return m_client->synchronousBranch(directory);
return m_client->synchronousTopic(directory);
}
/* Snapshots are implemented using stashes, relying on stash messages for
@@ -169,7 +169,7 @@ QString GitVersionControl::vcsCreateSnapshot(const QString &topLevel)
QString topRevision = m_client->synchronousTopRevision(topLevel);
if (topRevision.isEmpty())
return QString();
QString branch = m_client->synchronousBranch(topLevel);
QString branch = m_client->synchronousTopic(topLevel);
const QChar colon = QLatin1Char(':');
QString id = QLatin1String(stashRevisionIdC);
id += colon;