forked from qt-creator/qt-creator
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.
This commit is contained in:
105
src/plugins/git/stashdialog.h
Normal file
105
src/plugins/git/stashdialog.h
Normal file
@@ -0,0 +1,105 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** 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 STASHDIALOG_H
|
||||
#define STASHDIALOG_H
|
||||
|
||||
#include <QtGui/QDialog>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QSortFilterProxyModel;
|
||||
class QPushButton;
|
||||
class QModelIndex;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Git {
|
||||
namespace Internal {
|
||||
|
||||
namespace Ui {
|
||||
class StashDialog;
|
||||
}
|
||||
class StashModel;
|
||||
|
||||
/* StashDialog: Non-modal dialog that manages the list of stashes
|
||||
* of the repository. Offers to show, restore, restore to branch
|
||||
* (in case restore fails due to conflicts) on current and
|
||||
* delete on selection/all. */
|
||||
|
||||
class StashDialog : public QDialog {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit StashDialog(QWidget *parent = 0);
|
||||
~StashDialog();
|
||||
|
||||
public slots:
|
||||
void refresh(const QString &repository, bool force);
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
|
||||
private slots:
|
||||
void deleteAll();
|
||||
void deleteSelection();
|
||||
void showCurrent();
|
||||
void restoreCurrent();
|
||||
void restoreCurrentInBranch();
|
||||
void enableButtons();
|
||||
void forceRefresh();
|
||||
|
||||
private:
|
||||
// Prompt dialog for modified repositories. Ask to undo or stash away.
|
||||
enum ModifiedRepositoryAction {
|
||||
ModifiedRepositoryCancel,
|
||||
ModifiedRepositoryStash,
|
||||
ModifiedRepositoryDiscard
|
||||
};
|
||||
|
||||
ModifiedRepositoryAction promptModifiedRepository(const QString &stash);
|
||||
bool promptForRestore(QString *stash, QString *branch /* = 0 */, QString *errorMessage);
|
||||
bool ask(const QString &title, const QString &what, bool defaultButton = true);
|
||||
void warning(const QString &title, const QString &what, const QString &details = QString());
|
||||
int currentRow() const;
|
||||
QList<int> selectedRows() const; \
|
||||
|
||||
Ui::StashDialog *ui;
|
||||
StashModel *m_model;
|
||||
QSortFilterProxyModel *m_proxyModel;
|
||||
QPushButton *m_deleteAllButton;
|
||||
QPushButton *m_deleteSelectionButton;
|
||||
QPushButton *m_showCurrentButton;
|
||||
QPushButton *m_restoreCurrentButton;
|
||||
QPushButton *m_restoreCurrentInBranchButton;
|
||||
QPushButton *m_refreshButton;
|
||||
QString m_repository;
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Git
|
||||
|
||||
#endif // STASHDIALOG_H
|
||||
Reference in New Issue
Block a user