diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-01-15 12:24:06 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-01-15 12:28:22 +0100 |
commit | 9ac98a402c60a803578779efa7e6513e37bce448 (patch) | |
tree | 3c412d34b42060a185e3b1c2327dc92cd6c68852 /src/plugins/git/gitutils.h | |
parent | cbaa9b9fc064ef4c64a6a0842aa73743c1fa597e (diff) | |
download | qt-creator-9ac98a402c60a803578779efa7e6513e37bce448.tar.gz |
VCS[git]: Add support for stashes.
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.
Diffstat (limited to 'src/plugins/git/gitutils.h')
-rw-r--r-- | src/plugins/git/gitutils.h | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/src/plugins/git/gitutils.h b/src/plugins/git/gitutils.h new file mode 100644 index 0000000000..16d80ca656 --- /dev/null +++ b/src/plugins/git/gitutils.h @@ -0,0 +1,60 @@ +/************************************************************************** +** +** 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. +** +**************************************************************************/ + +#ifndef GITUTILS_H +#define GITUTILS_H + +#include <QtCore/QString> + +QT_BEGIN_NAMESPACE +class QDebug; +class QWidget; +QT_END_NAMESPACE + +namespace Git { +namespace Internal { + +struct Stash { + void clear(); + bool parseStashLine(const QString &l); + + QString name; + QString branch; + QString message; +}; + +QDebug operator<<(QDebug d, const Stash &); + +// Make QInputDialog play nicely +bool inputText(QWidget *parent, const QString &title, const QString &prompt, QString *s); + +} // namespace Internal +} // namespace Git + +#endif // GITUTILS_H |