forked from qt-creator/qt-creator
9ac98a402c
Add non-modal stash management dialog and additional menu option "Stash snapshot..." to stash away changes prompting for a description, which will immediately replay the stash (take snapshot and continue working). Add interface to IVersionControl for creating/restoring/deleting snapshots for backup/complex undo operations (currently supported by git only). Add test options to VCSBasePlugin. Clean up and extend git client accordingly.
200 lines
6.3 KiB
C++
200 lines
6.3 KiB
C++
/**************************************************************************
|
|
**
|
|
** This file is part of Qt Creator
|
|
**
|
|
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
|
|
**
|
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
|
**
|
|
** Commercial Usage
|
|
**
|
|
** Licensees holding valid Qt Commercial licenses may use this file in
|
|
** accordance with the Qt Commercial License Agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and Nokia.
|
|
**
|
|
** 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 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** If you are unsure which license is appropriate for your use, please
|
|
** contact the sales department at http://qt.nokia.com/contact.
|
|
**
|
|
**************************************************************************/
|
|
|
|
#include "gitversioncontrol.h"
|
|
#include "gitclient.h"
|
|
#include "gitplugin.h"
|
|
#include "gitutils.h"
|
|
|
|
static const char stashMessageKeywordC[] = "IVersionControl@";
|
|
static const char stashRevisionIdC[] = "revision";
|
|
|
|
namespace Git {
|
|
namespace Internal {
|
|
|
|
static inline GitClient *gitClient()
|
|
{
|
|
return GitPlugin::instance()->gitClient();
|
|
}
|
|
|
|
GitVersionControl::GitVersionControl(GitClient *client) :
|
|
m_enabled(true),
|
|
m_client(client)
|
|
{
|
|
}
|
|
|
|
QString GitVersionControl::displayName() const
|
|
{
|
|
return QLatin1String("git");
|
|
}
|
|
|
|
bool GitVersionControl::supportsOperation(Operation operation) const
|
|
{
|
|
bool rc = false;
|
|
switch (operation) {
|
|
case AddOperation:
|
|
case DeleteOperation:
|
|
case OpenOperation:
|
|
break;
|
|
case CreateRepositoryOperation:
|
|
case SnapshotOperations:
|
|
rc = true;
|
|
break;
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
bool GitVersionControl::vcsOpen(const QString & /*fileName*/)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool GitVersionControl::vcsAdd(const QString & /*fileName*/)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool GitVersionControl::vcsDelete(const QString & /*fileName*/)
|
|
{
|
|
// TODO: implement using 'git rm'.
|
|
return false;
|
|
}
|
|
|
|
bool GitVersionControl::vcsCreateRepository(const QString &directory)
|
|
{
|
|
return gitClient()->synchronousInit(directory);
|
|
}
|
|
/* Snapshots are implement using stashes, relying on stash messages for
|
|
* naming as the actual stash names (stash{n}) are rotated as one adds stashes.
|
|
* Note that the snapshot interface does not care whether we have an unmodified
|
|
* repository state, in which case git refuses to stash.
|
|
* In that case, return a special identifier as "specialprefix:<branch>:<head revision>",
|
|
* which will trigger a checkout in restore(). */
|
|
|
|
QString GitVersionControl::vcsCreateSnapshot(const QString &topLevel)
|
|
{
|
|
bool repositoryUnchanged;
|
|
// Create unique keyword
|
|
static int n = 1;
|
|
QString keyword = QLatin1String(stashMessageKeywordC) + QString::number(n++);
|
|
const QString stashMessage =
|
|
gitClient()->synchronousStash(topLevel, keyword,
|
|
GitClient::StashImmediateRestore|GitClient::StashIgnoreUnchanged,
|
|
&repositoryUnchanged);
|
|
if (!stashMessage.isEmpty())
|
|
return stashMessage;
|
|
if (repositoryUnchanged) {
|
|
// For unchanged repository state: return identifier + top revision
|
|
QString topRevision;
|
|
QString branch;
|
|
if (!gitClient()->synchronousTopRevision(topLevel, &topRevision, &branch))
|
|
return QString();
|
|
const QChar colon = QLatin1Char(':');
|
|
QString id = QLatin1String(stashRevisionIdC);
|
|
id += colon;
|
|
id += branch;
|
|
id += colon;
|
|
id += topRevision;
|
|
return id;
|
|
}
|
|
return QString(); // Failure
|
|
}
|
|
|
|
QStringList GitVersionControl::vcsSnapshots(const QString &topLevel)
|
|
{
|
|
QList<Stash> stashes;
|
|
if (!gitClient()->synchronousStashList(topLevel, &stashes))
|
|
return QStringList();
|
|
// Return the git stash 'message' as identifier, ignoring empty ones
|
|
QStringList rc;
|
|
foreach(const Stash &s, stashes)
|
|
if (!s.message.isEmpty())
|
|
rc.push_back(s.message);
|
|
return rc;
|
|
}
|
|
|
|
bool GitVersionControl::vcsRestoreSnapshot(const QString &topLevel, const QString &name)
|
|
{
|
|
bool success = false;
|
|
do {
|
|
// Is this a revision or a stash
|
|
if (name.startsWith(QLatin1String(stashRevisionIdC))) {
|
|
// Restore "id:branch:revision"
|
|
const QStringList tokens = name.split(QLatin1Char(':'));
|
|
if (tokens.size() != 3)
|
|
break;
|
|
const QString branch = tokens.at(1);
|
|
const QString revision = tokens.at(2);
|
|
success = gitClient()->synchronousReset(topLevel)
|
|
&& gitClient()->synchronousCheckoutBranch(topLevel, branch)
|
|
&& gitClient()->synchronousCheckoutFiles(topLevel, QStringList(), revision);
|
|
} else {
|
|
// Restore stash if it can be resolved.
|
|
QString stashName;
|
|
success = gitClient()->stashNameFromMessage(topLevel, name, &stashName)
|
|
&& gitClient()->synchronousReset(topLevel)
|
|
&& gitClient()->synchronousStashRestore(topLevel, stashName);
|
|
}
|
|
} while (false);
|
|
return success;
|
|
}
|
|
|
|
bool GitVersionControl::vcsRemoveSnapshot(const QString &topLevel, const QString &name)
|
|
{
|
|
// Is this a revision -> happy
|
|
if (name.startsWith(QLatin1String(stashRevisionIdC)))
|
|
return true;
|
|
QString stashName;
|
|
return gitClient()->stashNameFromMessage(topLevel, name, &stashName)
|
|
&& gitClient()->synchronousStashRemove(topLevel, stashName);
|
|
}
|
|
|
|
bool GitVersionControl::managesDirectory(const QString &directory) const
|
|
{
|
|
return !GitClient::findRepositoryForDirectory(directory).isEmpty();
|
|
}
|
|
|
|
QString GitVersionControl::findTopLevelForDirectory(const QString &directory) const
|
|
{
|
|
return GitClient::findRepositoryForDirectory(directory);
|
|
}
|
|
|
|
void GitVersionControl::emitFilesChanged(const QStringList &l)
|
|
{
|
|
emit filesChanged(l);
|
|
}
|
|
|
|
void GitVersionControl::emitRepositoryChanged(const QString &r)
|
|
{
|
|
emit repositoryChanged(r);
|
|
}
|
|
|
|
} // Internal
|
|
} // Git
|