forked from qt-creator/qt-creator
Git: Inline BranchUtils in BranchView
It is the only user now, after the branch dialog was removed. Change-Id: I3aa8409efeb52427cdc13799146c4aa87273b169 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
committed by
André Hartmann
André Hartmann
parent
e543ef5eb1
commit
bb6851632a
@@ -58,19 +58,18 @@ namespace Git {
|
||||
namespace Internal {
|
||||
|
||||
BranchView::BranchView() :
|
||||
BranchUtils(this),
|
||||
m_includeOldEntriesAction(new QAction(tr("Include Old Entries"), this)),
|
||||
m_includeTagsAction(new QAction(tr("Include Tags"), this)),
|
||||
m_addButton(new QToolButton(this)),
|
||||
m_refreshButton(new QToolButton(this)),
|
||||
m_repositoryLabel(new Utils::ElidingLabel(this)),
|
||||
m_branchView(new Utils::NavigationTreeView(this))
|
||||
m_branchView(new Utils::NavigationTreeView(this)),
|
||||
m_model(new BranchModel(GitPlugin::client(), this))
|
||||
{
|
||||
setBranchView(m_branchView);
|
||||
m_addButton->setIcon(Utils::Icons::PLUS_TOOLBAR.icon());
|
||||
m_addButton->setToolTip(tr("Add Branch"));
|
||||
m_addButton->setProperty("noArrow", true);
|
||||
connect(m_addButton, &QToolButton::clicked, this, [this] { add(); });
|
||||
connect(m_addButton, &QToolButton::clicked, this, &BranchView::add);
|
||||
|
||||
m_refreshButton->setIcon(Utils::Icons::RESET_TOOLBAR.icon());
|
||||
m_refreshButton->setToolTip(tr("Refresh"));
|
||||
@@ -167,14 +166,14 @@ void BranchView::slotCustomContextMenu(const QPoint &point)
|
||||
const bool currentLocal = m_model->isLocal(currentBranch);
|
||||
|
||||
QMenu contextMenu;
|
||||
contextMenu.addAction(tr("Add..."), this, [this] { add(); });
|
||||
contextMenu.addAction(tr("Add..."), this, &BranchView::add);
|
||||
if (hasActions) {
|
||||
if (!currentSelected && (isLocal || isTag))
|
||||
contextMenu.addAction(tr("Remove"), this, [this] { remove(); });
|
||||
contextMenu.addAction(tr("Remove"), this, &BranchView::remove);
|
||||
if (isLocal || isTag)
|
||||
contextMenu.addAction(tr("Rename"), this, [this] { rename(); });
|
||||
contextMenu.addAction(tr("Rename"), this, &BranchView::rename);
|
||||
if (!currentSelected) {
|
||||
contextMenu.addAction(tr("Checkout"), this, [this] { checkout(); });
|
||||
contextMenu.addAction(tr("Checkout"), this, &BranchView::checkout);
|
||||
}
|
||||
contextMenu.addSeparator();
|
||||
contextMenu.addAction(tr("Diff"), this, [this] {
|
||||
@@ -190,19 +189,19 @@ void BranchView::slotCustomContextMenu(const QPoint &point)
|
||||
contextMenu.addSeparator();
|
||||
if (!currentSelected) {
|
||||
if (currentLocal)
|
||||
contextMenu.addAction(tr("Reset"), this, [this] { reset(); });
|
||||
contextMenu.addAction(tr("Reset"), this, &BranchView::reset);
|
||||
QString mergeTitle;
|
||||
if (BranchUtils::isFastForwardMerge()) {
|
||||
if (isFastForwardMerge()) {
|
||||
contextMenu.addAction(tr("Merge (Fast-Forward)"), this, [this] { merge(true); });
|
||||
mergeTitle = tr("Merge (No Fast-Forward)");
|
||||
} else {
|
||||
mergeTitle = tr("Merge");
|
||||
}
|
||||
|
||||
contextMenu.addAction(mergeTitle, this, [this] { merge(); });
|
||||
contextMenu.addAction(tr("Rebase"), this, [this] { rebase(); });
|
||||
contextMenu.addAction(mergeTitle, this, [this] { merge(false); });
|
||||
contextMenu.addAction(tr("Rebase"), this, &BranchView::rebase);
|
||||
contextMenu.addSeparator();
|
||||
contextMenu.addAction(tr("Cherry Pick"), this, [this] { cherryPick(); });
|
||||
contextMenu.addAction(tr("Cherry Pick"), this, &BranchView::cherryPick);
|
||||
}
|
||||
if (currentLocal && !currentSelected && !isTag) {
|
||||
contextMenu.addAction(tr("Track"), this, [this] {
|
||||
@@ -231,6 +230,256 @@ void BranchView::setIncludeTags(bool includeTags)
|
||||
refreshCurrentRepository();
|
||||
}
|
||||
|
||||
QModelIndex BranchView::selectedIndex()
|
||||
{
|
||||
QModelIndexList selected = m_branchView->selectionModel()->selectedIndexes();
|
||||
if (selected.isEmpty())
|
||||
return QModelIndex();
|
||||
return selected.at(0);
|
||||
}
|
||||
|
||||
bool BranchView::add()
|
||||
{
|
||||
QModelIndex trackedIndex = selectedIndex();
|
||||
QString trackedBranch = m_model->fullName(trackedIndex);
|
||||
if (trackedBranch.isEmpty()) {
|
||||
trackedIndex = m_model->currentBranch();
|
||||
trackedBranch = m_model->fullName(trackedIndex);
|
||||
}
|
||||
const bool isLocal = m_model->isLocal(trackedIndex);
|
||||
const bool isTag = m_model->isTag(trackedIndex);
|
||||
|
||||
const QStringList localNames = m_model->localBranchNames();
|
||||
|
||||
QString suggestedName;
|
||||
if (!isTag) {
|
||||
const QString suggestedNameBase = trackedBranch.mid(trackedBranch.lastIndexOf('/') + 1);
|
||||
suggestedName = suggestedNameBase;
|
||||
int i = 2;
|
||||
while (localNames.contains(suggestedName)) {
|
||||
suggestedName = suggestedNameBase + QString::number(i);
|
||||
++i;
|
||||
}
|
||||
}
|
||||
|
||||
BranchAddDialog branchAddDialog(localNames, true, this);
|
||||
branchAddDialog.setBranchName(suggestedName);
|
||||
branchAddDialog.setTrackedBranchName(isTag ? QString() : trackedBranch, !isLocal);
|
||||
|
||||
if (branchAddDialog.exec() == QDialog::Accepted) {
|
||||
QModelIndex idx = m_model->addBranch(branchAddDialog.branchName(), branchAddDialog.track(), trackedIndex);
|
||||
if (!idx.isValid())
|
||||
return false;
|
||||
QTC_ASSERT(m_branchView, return false);
|
||||
m_branchView->selectionModel()->select(idx, QItemSelectionModel::Clear
|
||||
| QItemSelectionModel::Select
|
||||
| QItemSelectionModel::Current);
|
||||
m_branchView->scrollTo(idx);
|
||||
if (QMessageBox::question(this, tr("Checkout"), tr("Checkout branch?"),
|
||||
QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
|
||||
return checkout();
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool BranchView::checkout()
|
||||
{
|
||||
if (!Core::DocumentManager::saveAllModifiedDocuments())
|
||||
return false;
|
||||
|
||||
const QModelIndex selected = selectedIndex();
|
||||
const QString currentBranch = m_model->fullName(m_model->currentBranch());
|
||||
const QString nextBranch = m_model->fullName(selected);
|
||||
const QString popMessageStart = QCoreApplication::applicationName() +
|
||||
' ' + nextBranch + "-AutoStash ";
|
||||
|
||||
BranchCheckoutDialog branchCheckoutDialog(this, currentBranch, nextBranch);
|
||||
GitClient *client = GitPlugin::client();
|
||||
|
||||
if (client->gitStatus(m_repository, StatusMode(NoUntracked | NoSubmodules)) != GitClient::StatusChanged)
|
||||
branchCheckoutDialog.foundNoLocalChanges();
|
||||
|
||||
QList<Stash> stashes;
|
||||
client->synchronousStashList(m_repository, &stashes);
|
||||
for (const Stash &stash : qAsConst(stashes)) {
|
||||
if (stash.message.startsWith(popMessageStart)) {
|
||||
branchCheckoutDialog.foundStashForNextBranch();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!branchCheckoutDialog.hasLocalChanges() &&
|
||||
!branchCheckoutDialog.hasStashForNextBranch()) {
|
||||
// No local changes and no Auto Stash - no need to open dialog
|
||||
m_model->checkoutBranch(selected);
|
||||
} else if (branchCheckoutDialog.exec() == QDialog::Accepted) {
|
||||
|
||||
if (branchCheckoutDialog.makeStashOfCurrentBranch()) {
|
||||
if (client->synchronousStash(m_repository, currentBranch + "-AutoStash").isEmpty())
|
||||
return false;
|
||||
} else if (branchCheckoutDialog.moveLocalChangesToNextBranch()) {
|
||||
if (!client->beginStashScope(m_repository, "Checkout", NoPrompt))
|
||||
return false;
|
||||
} else if (branchCheckoutDialog.discardLocalChanges()) {
|
||||
if (!client->synchronousReset(m_repository))
|
||||
return false;
|
||||
}
|
||||
|
||||
m_model->checkoutBranch(selected);
|
||||
|
||||
QString stashName;
|
||||
client->synchronousStashList(m_repository, &stashes);
|
||||
for (const Stash &stash : qAsConst(stashes)) {
|
||||
if (stash.message.startsWith(popMessageStart)) {
|
||||
stashName = stash.name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (branchCheckoutDialog.moveLocalChangesToNextBranch())
|
||||
client->endStashScope(m_repository);
|
||||
else if (branchCheckoutDialog.popStashOfNextBranch())
|
||||
client->synchronousStashRestore(m_repository, stashName, true);
|
||||
}
|
||||
|
||||
if (QTC_GUARD(m_branchView))
|
||||
m_branchView->selectionModel()->clear();
|
||||
return true;
|
||||
}
|
||||
|
||||
// Prompt to delete a local branch and do so.
|
||||
bool BranchView::remove()
|
||||
{
|
||||
const QModelIndex selected = selectedIndex();
|
||||
QTC_CHECK(selected != m_model->currentBranch());
|
||||
|
||||
QString branchName = m_model->fullName(selected);
|
||||
if (branchName.isEmpty())
|
||||
return false;
|
||||
|
||||
const bool isTag = m_model->isTag(selected);
|
||||
const bool wasMerged = isTag ? true : m_model->branchIsMerged(selected);
|
||||
QString message;
|
||||
if (isTag)
|
||||
message = tr("Would you like to delete the tag \"%1\"?").arg(branchName);
|
||||
else if (wasMerged)
|
||||
message = tr("Would you like to delete the branch \"%1\"?").arg(branchName);
|
||||
else
|
||||
message = tr("Would you like to delete the <b>unmerged</b> branch \"%1\"?").arg(branchName);
|
||||
|
||||
if (QMessageBox::question(this, isTag ? tr("Delete Tag") : tr("Delete Branch"),
|
||||
message, QMessageBox::Yes | QMessageBox::No,
|
||||
wasMerged ? QMessageBox::Yes : QMessageBox::No) == QMessageBox::Yes) {
|
||||
if (isTag)
|
||||
m_model->removeTag(selected);
|
||||
else
|
||||
m_model->removeBranch(selected);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool BranchView::rename()
|
||||
{
|
||||
const QModelIndex selected = selectedIndex();
|
||||
QTC_CHECK(selected != m_model->currentBranch());
|
||||
const bool isTag = m_model->isTag(selected);
|
||||
QTC_CHECK(m_model->isLocal(selected) || isTag);
|
||||
|
||||
QString oldName = m_model->fullName(selected);
|
||||
QStringList localNames;
|
||||
if (!isTag)
|
||||
localNames = m_model->localBranchNames();
|
||||
|
||||
BranchAddDialog branchAddDialog(localNames, false, this);
|
||||
if (isTag)
|
||||
branchAddDialog.setWindowTitle(tr("Rename Tag"));
|
||||
branchAddDialog.setBranchName(oldName);
|
||||
branchAddDialog.setTrackedBranchName(QString(), false);
|
||||
|
||||
branchAddDialog.exec();
|
||||
|
||||
if (branchAddDialog.result() == QDialog::Accepted) {
|
||||
if (branchAddDialog.branchName() == oldName)
|
||||
return false;
|
||||
if (isTag)
|
||||
m_model->renameTag(oldName, branchAddDialog.branchName());
|
||||
else
|
||||
m_model->renameBranch(oldName, branchAddDialog.branchName());
|
||||
return true;
|
||||
}
|
||||
|
||||
if (QTC_GUARD(m_branchView))
|
||||
m_branchView->selectionModel()->clear();
|
||||
return false;
|
||||
}
|
||||
|
||||
bool BranchView::reset()
|
||||
{
|
||||
const QString currentName = m_model->fullName(m_model->currentBranch());
|
||||
const QString branchName = m_model->fullName(selectedIndex());
|
||||
if (currentName.isEmpty() || branchName.isEmpty())
|
||||
return false;
|
||||
|
||||
if (QMessageBox::question(this, tr("Git Reset"), tr("Hard reset branch \"%1\" to \"%2\"?")
|
||||
.arg(currentName).arg(branchName),
|
||||
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
|
||||
GitPlugin::client()->reset(m_repository, "--hard", branchName);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool BranchView::isFastForwardMerge()
|
||||
{
|
||||
const QModelIndex selected = selectedIndex();
|
||||
QTC_CHECK(selected != m_model->currentBranch());
|
||||
|
||||
const QString branch = m_model->fullName(selected, true);
|
||||
return GitPlugin::client()->isFastForwardMerge(m_repository, branch);
|
||||
}
|
||||
|
||||
bool BranchView::merge(bool allowFastForward)
|
||||
{
|
||||
if (!Core::DocumentManager::saveAllModifiedDocuments())
|
||||
return false;
|
||||
const QModelIndex selected = selectedIndex();
|
||||
QTC_CHECK(selected != m_model->currentBranch());
|
||||
|
||||
const QString branch = m_model->fullName(selected, true);
|
||||
GitClient *client = GitPlugin::client();
|
||||
if (client->beginStashScope(m_repository, "merge", AllowUnstashed))
|
||||
return client->synchronousMerge(m_repository, branch, allowFastForward);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void BranchView::rebase()
|
||||
{
|
||||
if (!Core::DocumentManager::saveAllModifiedDocuments())
|
||||
return;
|
||||
const QModelIndex selected = selectedIndex();
|
||||
QTC_CHECK(selected != m_model->currentBranch());
|
||||
|
||||
const QString baseBranch = m_model->fullName(selected, true);
|
||||
GitClient *client = GitPlugin::client();
|
||||
if (client->beginStashScope(m_repository, "rebase"))
|
||||
client->rebase(m_repository, baseBranch);
|
||||
}
|
||||
|
||||
bool BranchView::cherryPick()
|
||||
{
|
||||
if (!Core::DocumentManager::saveAllModifiedDocuments())
|
||||
return false;
|
||||
const QModelIndex selected = selectedIndex();
|
||||
QTC_CHECK(selected != m_model->currentBranch());
|
||||
|
||||
const QString branch = m_model->fullName(selected, true);
|
||||
return GitPlugin::client()->synchronousCherryPick(m_repository, branch);
|
||||
}
|
||||
|
||||
BranchViewFactory::BranchViewFactory()
|
||||
{
|
||||
setDisplayName(tr("Git Branches"));
|
||||
|
||||
Reference in New Issue
Block a user