From 9ac98a402c60a803578779efa7e6513e37bce448 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 15 Jan 2010 12:24:06 +0100 Subject: 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. --- src/plugins/git/gitutils.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/plugins/git/gitutils.h (limited to 'src/plugins/git/gitutils.h') 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 + +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 -- cgit v1.2.1