feat(git): add branch rename and delete from picker

nullmastermind · nullmastermind · commit bafcc8abb1bd · 2026-05-27T20:58:42.000+07:00
- UI-only flows existed; rename/delete had no backing operations,
  leaving users with no way to manage local branches in-app.
- Keyboard shortcuts (F2/Delete) follow platform conventions and
  avoid forcing mouse use for common operations.
- Remote update on rename is two-phase (delete old ref, push new)
  to keep tracking refs consistent without a separate fetch cycle.
diff --git a/src/git/BranchPickerPopup.cpp b/src/git/BranchPickerPopup.cpp
@@ -23,6 +23,7 @@
 #include <QDialogButtonBox>
 #include <QFormLayout>
 #include <QGuiApplication>
+#include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QLineEdit>
@@ -33,6 +34,7 @@
 #include <QScreen>
 #include <QStandardItem>
 #include <QStandardItemModel>
+#include <QStyle>
 #include <QVBoxLayout>
 
 namespace {
@@ -234,6 +236,21 @@ void BranchPickerPopup::showItemMenu(const QModelIndex &index)
         });
     }
 
+    if (!isRemote) {
+        menu.addSeparator();
+        QAction *aRename = menu.addAction(tr("&Rename…"));
+        connect(aRename, &QAction::triggered, this, [this, payload]() {
+            showRenameBranchDialog(payload);
+        });
+
+        if (!isCurrent) {
+            QAction *aDelete = menu.addAction(tr("&Delete…"));
+            connect(aDelete, &QAction::triggered, this, [this, payload]() {
+                showDeleteBranchDialog(payload);
+            });
+        }
+    }
+
     const QRect itemRect = m_list->visualRect(index);
     const QPoint pos = m_list->mapToGlobal(itemRect.topRight());
     menu.exec(pos);
@@ -303,10 +320,134 @@ bool BranchPickerPopup::eventFilter(QObject *o, QEvent *e)
                 return true;
             }
         }
+        if (o == m_list) {
+            if (ke->key() == Qt::Key_F2) {
+                const QModelIndex idx = m_list->currentIndex();
+                if (idx.isValid()) {
+                    auto *it = m_model->itemFromIndex(idx);
+                    if (it && it->data(RoleKind).toInt() == 0) {
+                        showRenameBranchDialog(it->data(RolePayload).toString());
+                        return true;
+                    }
+                }
+            }
+            if (ke->key() == Qt::Key_Delete) {
+                const QModelIndex idx = m_list->currentIndex();
+                if (idx.isValid()) {
+                    auto *it = m_model->itemFromIndex(idx);
+                    if (it && it->data(RoleKind).toInt() == 0) {
+                        const QString payload = it->data(RolePayload).toString();
+                        if (payload != m_current) {
+                            showDeleteBranchDialog(payload);
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
         if (ke->key() == Qt::Key_Escape) {
             close();
             return true;
         }
     }
     return QWidget::eventFilter(o, e);
 }
+
+void BranchPickerPopup::showRenameBranchDialog(const QString &branchName)
+{
+    QDialog dlg(this);
+    dlg.setWindowTitle(tr("Rename Branch '%1'").arg(branchName));
+    dlg.setMinimumWidth(320);
+
+    auto *layout = new QVBoxLayout(&dlg);
+
+    auto *nameEdit = new QLineEdit(&dlg);
+    nameEdit->setText(branchName);
+
+    auto *previewLabel = new QLabel(&dlg);
+    previewLabel->setStyleSheet(QStringLiteral("color: gray; font-size: 11px;"));
+
+    auto *remoteCheck = new QCheckBox(tr("Update remote tracking"), &dlg);
+    remoteCheck->setChecked(false);
+    remoteCheck->setVisible(m_hasRemote);
+
+    auto *remoteHint = new QLabel(tr("(deletes old remote ref, pushes new)"), &dlg);
+    remoteHint->setStyleSheet(QStringLiteral("color: gray; font-size: 10px;"));
+    remoteHint->setVisible(m_hasRemote);
+
+    auto *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dlg);
+    buttons->button(QDialogButtonBox::Ok)->setText(tr("Rename"));
+    buttons->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+    layout->addWidget(new QLabel(tr("Rename branch '<b>%1</b>' to:").arg(branchName.toHtmlEscaped()), &dlg));
+    layout->addWidget(nameEdit);
+    layout->addWidget(previewLabel);
+    layout->addWidget(remoteCheck);
+    layout->addWidget(remoteHint);
+    layout->addWidget(buttons);
+
+    connect(nameEdit, &QLineEdit::textChanged, &dlg, [&](const QString &text) {
+        const QString sanitized = sanitizeBranchName(text);
+        if (sanitized.isEmpty() || sanitized == branchName) {
+            previewLabel->clear();
+            buttons->button(QDialogButtonBox::Ok)->setEnabled(false);
+        } else {
+            previewLabel->setText(tr("→ %1").arg(sanitized));
+            buttons->button(QDialogButtonBox::Ok)->setEnabled(!m_local.contains(sanitized));
+        }
+    });
+    connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
+
+    // Smart selection: select after last '/' or all if no '/'
+    const int slashPos = branchName.lastIndexOf(QLatin1Char('/'));
+    if (slashPos >= 0) {
+        nameEdit->setSelection(slashPos + 1, branchName.length() - slashPos - 1);
+    } else {
+        nameEdit->selectAll();
+    }
+    nameEdit->setFocus();
+
+    if (dlg.exec() == QDialog::Accepted) {
+        const QString newName = sanitizeBranchName(nameEdit->text());
+        if (!newName.isEmpty() && newName != branchName) {
+            emit renameBranchRequested(branchName, newName, remoteCheck->isChecked());
+            close();
+        }
+    }
+}
+
+void BranchPickerPopup::showDeleteBranchDialog(const QString &branchName)
+{
+    QDialog dlg(this);
+    dlg.setWindowTitle(tr("Delete Branch"));
+    dlg.setMinimumWidth(320);
+
+    auto *layout = new QVBoxLayout(&dlg);
+
+    auto *topRow = new QHBoxLayout;
+    auto *icon = new QLabel(&dlg);
+    icon->setPixmap(style()->standardPixmap(QStyle::SP_MessageBoxWarning));
+    auto *msg = new QLabel(tr("Are you sure you want to delete branch '<b>%1</b>'?")
+                               .arg(branchName.toHtmlEscaped()), &dlg);
+    msg->setWordWrap(true);
+    topRow->addWidget(icon, 0, Qt::AlignTop);
+    topRow->addWidget(msg, 1);
+    layout->addLayout(topRow);
+
+    auto *forceCheck = new QCheckBox(tr("Force delete (even if not fully merged)"), &dlg);
+    forceCheck->setChecked(false);
+    layout->addWidget(forceCheck);
+
+    auto *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dlg);
+    buttons->button(QDialogButtonBox::Ok)->setText(tr("Delete"));
+    layout->addWidget(buttons);
+
+    connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
+
+    if (dlg.exec() == QDialog::Accepted) {
+        emit deleteBranchRequested(branchName, forceCheck->isChecked());
+        close();
+    }
+}
diff --git a/src/git/BranchPickerPopup.h b/src/git/BranchPickerPopup.h
@@ -39,6 +39,8 @@ class BranchPickerPopup : public QWidget
                      bool detachedHead = false);
     void popupAt(const QPoint &globalPos);
 
+    void setHasRemote(bool has) { m_hasRemote = has; }
+
     // In select-only mode, clicking a branch emits branchSelected and closes
     // immediately — no context menu with Checkout/New Branch/Set Upstream.
     // Use for merge/rebase target selection.
@@ -51,6 +53,8 @@ class BranchPickerPopup : public QWidget
     void branchSelected(const QString &name);
     void createBranchRequested(const QString &name, const QString &base, bool setUpstream);
     void setUpstreamRequested(const QString &remoteBranch);
+    void renameBranchRequested(const QString &oldName, const QString &newName, bool updateRemote);
+    void deleteBranchRequested(const QString &branchName, bool force);
 
 protected:
     bool eventFilter(QObject *o, QEvent *e) override;
@@ -62,6 +66,8 @@ private slots:
 private:
     void showItemMenu(const QModelIndex &index);
     void showNewBranchDialog(const QString &base);
+    void showRenameBranchDialog(const QString &branchName);
+    void showDeleteBranchDialog(const QString &branchName);
 
     QLineEdit *m_filter;
     QListView *m_list;
@@ -72,6 +78,7 @@ private slots:
     QStringList m_remote;
     bool m_detachedHead = false;
     bool m_selectOnly = false;
+    bool m_hasRemote = false;
 };
 
 #endif // BRANCH_PICKER_POPUP_H
diff --git a/src/git/GitController.cpp b/src/git/GitController.cpp
@@ -473,6 +473,35 @@ void GitController::forcePush(const QString &remote)
     enqueue(op);
 }
 
+void GitController::renameBranch(const QString &oldName, const QString &newName, bool updateRemote)
+{
+    if (m_currentRepo.isEmpty() || oldName.isEmpty() || newName.isEmpty()) return;
+    Op op;
+    op.kind = OpKind::RenameBranch;
+    op.argv = { QStringLiteral("-C"), m_currentRepo, QStringLiteral("branch"), QStringLiteral("-m") };
+    if (oldName != m_currentBranch) op.argv.append(oldName);
+    op.argv.append(newName);
+    op.timeoutMs = kTimeoutNormal;
+    op.humanName = tr_("Renaming branch");
+    op.meta.insert(QStringLiteral("oldName"), oldName);
+    op.meta.insert(QStringLiteral("newName"), newName);
+    op.meta.insert(QStringLiteral("updateRemote"), updateRemote);
+    enqueue(op);
+}
+
+void GitController::deleteBranch(const QString &branchName, bool force)
+{
+    if (m_currentRepo.isEmpty() || branchName.isEmpty()) return;
+    Op op;
+    op.kind = OpKind::DeleteBranch;
+    op.argv = { QStringLiteral("-C"), m_currentRepo, QStringLiteral("branch"),
+                force ? QStringLiteral("-D") : QStringLiteral("-d"),
+                branchName };
+    op.timeoutMs = kTimeoutNormal;
+    op.humanName = tr_("Deleting branch");
+    enqueue(op);
+}
+
 void GitController::revertPaths(const QStringList &relPaths)
 {
     if (m_currentRepo.isEmpty() || relPaths.isEmpty()) return;
@@ -942,6 +971,8 @@ void GitController::onRunFinished(int exit, const QByteArray &out, const QByteAr
         case OpKind::Commit:
         case OpKind::SwitchBranch:
         case OpKind::CreateBranch:
+        case OpKind::RenameBranch:
+        case OpKind::DeleteBranch:
         case OpKind::SetUpstream:
         case OpKind::ConfigTracking:
         case OpKind::Stash:
@@ -970,6 +1001,38 @@ void GitController::onRunFinished(int exit, const QByteArray &out, const QByteAr
                     }
                 }
             }
+            if (kind == OpKind::RenameBranch) {
+                const bool wantRemote = m_current.meta.value(QStringLiteral("updateRemote")).toBool();
+                if (wantRemote && !m_remoteList.isEmpty()) {
+                    const QString oldName = m_current.meta.value(QStringLiteral("oldName")).toString();
+                    const QString newName = m_current.meta.value(QStringLiteral("newName")).toString();
+                    QString remote = QStringLiteral("origin");
+                    if (!m_remoteList.contains(remote))
+                        remote = m_remoteList.first();
+
+                    Op del;
+                    del.kind = OpKind::Push;
+                    del.argv = { QStringLiteral("-C"), m_currentRepo, QStringLiteral("push"),
+                                 remote, QStringLiteral(":") + oldName,
+                                 QStringLiteral("--progress") };
+                    del.timeoutMs = kTimeoutRemote;
+                    del.readErrAsProgress = true;
+                    del.humanName = tr_("Deleting old remote branch");
+                    del.meta.insert(QStringLiteral("remoteRenamePhase"), QStringLiteral("delete-old"));
+                    enqueue(del);
+
+                    Op push;
+                    push.kind = OpKind::Push;
+                    push.argv = { QStringLiteral("-C"), m_currentRepo, QStringLiteral("push"),
+                                  QStringLiteral("-u"), remote, newName,
+                                  QStringLiteral("--progress") };
+                    push.timeoutMs = kTimeoutRemote;
+                    push.readErrAsProgress = true;
+                    push.humanName = tr_("Pushing renamed branch");
+                    push.meta.insert(QStringLiteral("remoteRenamePhase"), QStringLiteral("push-new"));
+                    enqueue(push);
+                }
+            }
             if (kind == OpKind::Commit || kind == OpKind::Pull) {
                 // Commit and Pull move the current branch tip (the ref file
                 // content changes, e.g. .git/refs/heads/main). GitWatcher only
diff --git a/src/git/GitController.h b/src/git/GitController.h
@@ -93,6 +93,8 @@ public slots:
     void pull(bool rebase);
     void push(const QString &remote = {}, bool setUpstream = false);
     void forcePush(const QString &remote = {});
+    void renameBranch(const QString &oldName, const QString &newName, bool updateRemote);
+    void deleteBranch(const QString &branchName, bool force);
     void revertPaths(const QStringList &relPaths);
     void cancelCurrent();
 
@@ -152,7 +154,7 @@ public slots:
         CatFileBlob,
         Stage, Unstage, StageAll, UnstageAll,
         Commit,
-        SwitchBranch, CreateBranch, SetUpstream, ConfigTracking, Stash,
+        SwitchBranch, CreateBranch, RenameBranch, DeleteBranch, SetUpstream, ConfigTracking, Stash,
         Fetch, Pull, Push, ForcePush,
         Revert
     };
diff --git a/src/git/GitTabWidget.cpp b/src/git/GitTabWidget.cpp
@@ -714,12 +714,17 @@ void GitTabWidget::onBranchButtonClicked()
                 this, &GitTabWidget::handleCreateBranch);
         connect(m_branchPicker, &BranchPickerPopup::setUpstreamRequested,
                 this, &GitTabWidget::handleSetUpstream);
+        connect(m_branchPicker, &BranchPickerPopup::renameBranchRequested,
+                this, &GitTabWidget::handleRenameBranch);
+        connect(m_branchPicker, &BranchPickerPopup::deleteBranchRequested,
+                this, &GitTabWidget::handleDeleteBranch);
     }
     m_branchPicker->setBranches(m_controller->branchesLocal(),
                                 m_controller->branchesRemote(),
                                 m_controller->currentBranch(),
                                 QStringLiteral("main"),
                                 m_controller->currentBranch().isEmpty());
+    m_branchPicker->setHasRemote(m_controller->hasRemote());
     const QPoint pos = m_branchBtn->mapToGlobal(m_branchBtn->rect().bottomLeft());
     m_branchPicker->popupAt(pos);
 }
@@ -777,6 +782,18 @@ void GitTabWidget::handleSetUpstream(const QString &remoteBranch)
     m_controller->setUpstream(remoteBranch);
 }
 
+void GitTabWidget::handleRenameBranch(const QString &oldName, const QString &newName, bool updateRemote)
+{
+    if (!m_controller) return;
+    m_controller->renameBranch(oldName, newName, updateRemote);
+}
+
+void GitTabWidget::handleDeleteBranch(const QString &branchName, bool force)
+{
+    if (!m_controller) return;
+    m_controller->deleteBranch(branchName, force);
+}
+
 void GitTabWidget::onMenuButtonClicked()
 {
     if (!m_controller || m_controller->currentRepo().isEmpty()) return;
diff --git a/src/git/GitTabWidget.h b/src/git/GitTabWidget.h
@@ -115,6 +115,8 @@ private slots:
     void handleCheckoutRequested(const QString &name);
     void handleCreateBranch(const QString &name, const QString &base, bool setUpstream);
     void handleSetUpstream(const QString &remoteBranch);
+    void handleRenameBranch(const QString &oldName, const QString &newName, bool updateRemote);
+    void handleDeleteBranch(const QString &branchName, bool force);
     void restoreSettingsForWorkspace();
     void updateOpBanner();
 
