diff options
Diffstat (limited to 'src/plugins/git/stashdialog.cpp')
| -rw-r--r-- | src/plugins/git/stashdialog.cpp | 411 |
1 files changed, 411 insertions, 0 deletions
diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp new file mode 100644 index 00000000000..a39559ad597 --- /dev/null +++ b/src/plugins/git/stashdialog.cpp @@ -0,0 +1,411 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation ([email protected]) +** +** 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 "stashdialog.h" +#include "gitclient.h" +#include "gitplugin.h" +#include "gitutils.h" +#include "ui_stashdialog.h" + +#include <utils/qtcassert.h> +#include <vcsbase/vcsbaseoutputwindow.h> + +#include <QtCore/QDebug> +#include <QtCore/QModelIndex> +#include <QtCore/QDateTime> +#include <QtGui/QStandardItemModel> +#include <QtGui/QSortFilterProxyModel> +#include <QtGui/QItemSelectionModel> +#include <QtGui/QMessageBox> +#include <QtGui/QPushButton> + +enum { NameColumn, BranchColumn, MessageColumn, ColumnCount }; + +namespace Git { +namespace Internal { + +static inline GitClient *gitClient() +{ + return GitPlugin::instance()->gitClient(); +} + +static inline QList<QStandardItem*> stashModelRowItems(const Stash &s) +{ + Qt::ItemFlags itemFlags = Qt::ItemIsSelectable|Qt::ItemIsEnabled; + QStandardItem *nameItem = new QStandardItem(s.name); + nameItem->setFlags(itemFlags); + QStandardItem *branchItem = new QStandardItem(s.branch); + branchItem->setFlags(itemFlags); + QStandardItem *messageItem = new QStandardItem(s.message); + messageItem->setFlags(itemFlags); + QList<QStandardItem*> rc; + rc << nameItem << branchItem << messageItem; + return rc; +} + +// ----------- StashModel +class StashModel : public QStandardItemModel { +public: + explicit StashModel(QObject *parent = 0); + + void setStashes(const QList<Stash> &stashes); + const Stash &at(int i) { return m_stashes.at(i); } + +private: + QList<Stash> m_stashes; +}; + +StashModel::StashModel(QObject *parent) : + QStandardItemModel(0, ColumnCount, parent) +{ + QStringList headers; + headers << StashDialog::tr("Name") << StashDialog::tr("Branch") << StashDialog::tr("Message"); + setHorizontalHeaderLabels(headers); +} + +void StashModel::setStashes(const QList<Stash> &stashes) +{ + m_stashes = stashes; + if (const int rows = rowCount()) + removeRows(0, rows); + foreach(const Stash &s, stashes) + appendRow(stashModelRowItems(s)); +} + +// ---------- StashDialog +StashDialog::StashDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::StashDialog), + m_model(new StashModel), + m_proxyModel(new QSortFilterProxyModel), + m_deleteAllButton(new QPushButton(tr("Delete all..."))), + m_deleteSelectionButton(new QPushButton(tr("Delete..."))), + m_showCurrentButton(new QPushButton(tr("Show"))), + m_restoreCurrentButton(new QPushButton(tr("Restore..."))), + m_restoreCurrentInBranchButton(new QPushButton(tr("Restore to branch..."))), + m_refreshButton(new QPushButton(tr("Refresh"))) +{ + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + ui->setupUi(this); + // Buttons + ui->buttonBox->addButton(m_showCurrentButton, QDialogButtonBox::ActionRole); + connect(m_showCurrentButton, SIGNAL(clicked()), this, SLOT(showCurrent())); + ui->buttonBox->addButton(m_refreshButton, QDialogButtonBox::ActionRole); + connect(m_refreshButton, SIGNAL(clicked()), this, SLOT(forceRefresh())); + ui->buttonBox->addButton(m_restoreCurrentButton, QDialogButtonBox::ActionRole); + connect(m_restoreCurrentButton, SIGNAL(clicked()), this, SLOT(restoreCurrent())); + ui->buttonBox->addButton(m_restoreCurrentInBranchButton, QDialogButtonBox::ActionRole); + connect(m_restoreCurrentInBranchButton, SIGNAL(clicked()), this, SLOT(restoreCurrentInBranch())); + ui->buttonBox->addButton(m_deleteSelectionButton, QDialogButtonBox::ActionRole); + connect(m_deleteSelectionButton, SIGNAL(clicked()), this, SLOT(deleteSelection())); + ui->buttonBox->addButton(m_deleteAllButton, QDialogButtonBox::ActionRole); + connect(m_deleteAllButton, SIGNAL(clicked()), this, SLOT(deleteAll())); + // Models + m_proxyModel->setSourceModel(m_model); + m_proxyModel->setFilterKeyColumn(-1); + m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); + ui->stashView->setModel(m_proxyModel); + ui->stashView->setSelectionMode(QAbstractItemView::MultiSelection); + connect(ui->filterLineEdit, SIGNAL(filterChanged(QString)), m_proxyModel, SLOT(setFilterFixedString(QString))); + connect(ui->stashView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), + this, SLOT(enableButtons())); + connect(ui->stashView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), + this, SLOT(enableButtons())); + connect(ui->stashView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(showCurrent())); + ui->stashView->setFocus(); +} + +StashDialog::~StashDialog() +{ + delete ui; +} + +void StashDialog::changeEvent(QEvent *e) +{ + QDialog::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } +} + +void StashDialog::refresh(const QString &repository, bool force) +{ + if (m_repository == repository && !force) + return; + // Refresh + m_repository = repository; + if (m_repository.isEmpty()) { + ui->repositoryLabel->setText(tr("<No repository>")); + m_model->setStashes(QList<Stash>()); + } else { + ui->repositoryLabel->setText(tr("Repository: %1").arg(repository)); + QList<Stash> stashes; + gitClient()->synchronousStashList(m_repository, &stashes); + m_model->setStashes(stashes); + if (!stashes.isEmpty()) { + for(int c = 0; c < ColumnCount; c++) + ui->stashView->resizeColumnToContents(c); + } + } + enableButtons(); +} + +void StashDialog::deleteAll() +{ + const QString title = tr("Delete stashes"); + if (!ask(title, tr("Do you want to delete all stashes?"))) + return; + QString errorMessage; + if (gitClient()->synchronousStashRemove(m_repository, QString(), &errorMessage)) { + refresh(m_repository, true); + } else { + warning(title, errorMessage); + } +} + +void StashDialog::deleteSelection() +{ + const QList<int> rows = selectedRows(); + QTC_ASSERT(!rows.isEmpty(), return) + const QString title = tr("Delete stashes"); + if (!ask(title, tr("Do you want to delete %n stash(es)?", 0, rows.size()))) + return; + QString errorMessage; + QStringList errors; + // Delete in reverse order as stashes rotate + for (int r = rows.size() - 1; r >= 0; r--) + if (!gitClient()->synchronousStashRemove(m_repository, m_model->at(r).name, &errorMessage)) + errors.push_back(errorMessage); + refresh(m_repository, true); + if (!errors.isEmpty()) + warning(title, errors.join(QString(QLatin1Char('\n')))); +} + +void StashDialog::showCurrent() +{ + const int index = currentRow(); + QTC_ASSERT(index >= 0, return) + gitClient()->show(m_repository, m_model->at(index).name); +} + +// Suggest Branch name to restore 'stash@{0}' -> 'stash0-date' +static inline QString stashRestoreDefaultBranch(QString stash) +{ + stash.remove(QLatin1Char('{')); + stash.remove(QLatin1Char('}')); + stash.remove(QLatin1Char('@')); + stash += QLatin1Char('-'); + stash += QDateTime::currentDateTime().toString(QLatin1String("yyMMddhhmmss")); + return stash; +} + +// Return next stash id 'stash@{0}' -> 'stash@{1}' +static inline QString nextStash(const QString &stash) +{ + const int openingBracePos = stash.indexOf(QLatin1Char('{')); + if (openingBracePos == -1) + return QString(); + const int closingBracePos = stash.indexOf(QLatin1Char('}'), openingBracePos + 2); + if (closingBracePos == -1) + return QString(); + bool ok; + const int n = stash.mid(openingBracePos + 1, closingBracePos - openingBracePos - 1).toInt(&ok); + if (!ok) + return QString(); + QString rc = stash.left(openingBracePos + 1); + rc += QString::number(n + 1); + rc += QLatin1Char('}'); + return rc; +} + +StashDialog::ModifiedRepositoryAction StashDialog::promptModifiedRepository(const QString &stash) +{ + QMessageBox box(QMessageBox::Question, + tr("Repository modified"), + tr("%1 cannot be restored since the repository is modified.\n" + "You can choose between stashing the changes or discarding them.").arg(stash), + QMessageBox::Cancel, this); + QPushButton *stashButton = box.addButton(tr("Stash"), QMessageBox::AcceptRole); + QPushButton *discardButton = box.addButton(tr("Discard"), QMessageBox::AcceptRole); + box.exec(); + const QAbstractButton *clickedButton = box.clickedButton(); + if (clickedButton == stashButton) + return ModifiedRepositoryStash; + if (clickedButton == discardButton) + return ModifiedRepositoryDiscard; + return ModifiedRepositoryCancel; +} + +// Prompt for restore: Make sure repository is unmodified, +// prompt for a branch if desired or just ask to restore. +// Note that the stash to be restored changes if the user +// chooses to stash away modified repository. +bool StashDialog::promptForRestore(QString *stash, + QString *branch /* = 0*/, + QString *errorMessage) +{ + const QString stashIn = *stash; + bool modifiedPromptShown = false; + switch (gitClient()->gitStatus(m_repository, false, 0, errorMessage)) { + case GitClient::StatusFailed: + return false; + case GitClient::StatusChanged: { + switch (promptModifiedRepository(*stash)) { + case ModifiedRepositoryCancel: + return false; + case ModifiedRepositoryStash: + if (gitClient()->synchronousStash(m_repository, QString(), GitClient::StashPromptDescription).isEmpty()) + return false; + *stash = nextStash(*stash); // Our stash id to be restored changed + QTC_ASSERT(!stash->isEmpty(), return false) + break; + case ModifiedRepositoryDiscard: + if (!gitClient()->synchronousReset(m_repository)) + return false; + break; + } + modifiedPromptShown = true; + } + break; + case GitClient::StatusUnchanged: + break; + } + // Prompt for branch or just ask. + if (branch) { + *branch = stashRestoreDefaultBranch(*stash); + if (!inputText(this, tr("Restore Stash to Branch"), tr("Branch:"), branch) + || branch->isEmpty()) + return false; + } else { + if (!modifiedPromptShown && !ask(tr("Stash Restore"), tr("Would you like to restore %1?").arg(stashIn))) + return false; + } + return true; +} + +static inline QString msgRestoreFailedTitle(const QString &stash) +{ + return StashDialog::tr("Error restoring %1").arg(stash); +} + +void StashDialog::restoreCurrent() +{ + const int index = currentRow(); + QTC_ASSERT(index >= 0, return) + QString errorMessage; + QString name = m_model->at(index).name; + // Make sure repository is not modified, restore. The command will + // output to window on success. + const bool success = promptForRestore(&name, 0, &errorMessage) + && gitClient()->synchronousStashRestore(m_repository, name, QString(), &errorMessage); + if (success) { + refresh(m_repository, true); // Might have stashed away local changes. + } else { + if (!errorMessage.isEmpty()) + warning(msgRestoreFailedTitle(name), errorMessage); + } +} + +void StashDialog::restoreCurrentInBranch() +{ + const int index = currentRow(); + QTC_ASSERT(index >= 0, return) + QString errorMessage; + QString branch; + QString name = m_model->at(index).name; + const bool success = promptForRestore(&name, &branch, &errorMessage) + && gitClient()->synchronousStashRestore(m_repository, name, branch, &errorMessage); + if (success) { + refresh(m_repository, true); // git deletes the stash, unfortunately. + } else { + if (!errorMessage.isEmpty()) + warning(msgRestoreFailedTitle(name), errorMessage); + } +} + +int StashDialog::currentRow() const +{ + const QModelIndex proxyIndex = ui->stashView->currentIndex(); + if (proxyIndex.isValid()) { + const QModelIndex index = m_proxyModel->mapToSource(proxyIndex); + if (index.isValid()) + return index.row(); + } + return -1; +} + +QList<int> StashDialog::selectedRows() const +{ + QList<int> rc; + foreach(const QModelIndex &proxyIndex, ui->stashView->selectionModel()->selectedRows()) { + const QModelIndex index = m_proxyModel->mapToSource(proxyIndex); + if (index.isValid()) + rc.push_back(index.row()); + } + qSort(rc); + return rc; +} + +void StashDialog::forceRefresh() +{ + refresh(m_repository, true); +} + +void StashDialog::enableButtons() +{ + const bool hasStashes = m_model->rowCount(); + const bool hasCurrentRow = hasStashes && currentRow() >= 0; + m_deleteAllButton->setEnabled(hasStashes); + m_showCurrentButton->setEnabled(hasCurrentRow); + m_restoreCurrentButton->setEnabled(hasCurrentRow); + m_restoreCurrentInBranchButton->setEnabled(hasCurrentRow); + const bool hasSelection = !ui->stashView->selectionModel()->selectedRows().isEmpty(); + m_deleteSelectionButton->setEnabled(hasSelection); +} + +void StashDialog::warning(const QString &title, const QString &what, const QString &details) +{ + QMessageBox msgBox(QMessageBox::Warning, title, what, QMessageBox::Ok, this); + if (!details.isEmpty()) + msgBox.setDetailedText(details); + msgBox.exec(); +} + +bool StashDialog::ask(const QString &title, const QString &what, bool defaultButton) +{ + return QMessageBox::question(this, title, what, QMessageBox::Yes|QMessageBox::No, + defaultButton ? QMessageBox::Yes : QMessageBox::No) == QMessageBox::Yes; +} + +} // namespace Internal +} // namespace Git |