CommitForm: add support for ammend

We support "ammend" in commit. Its a checkbox which will ammend the last
commit and will also pull the last log.

Added a "force" push checkbox.

Author: diegoiast

CMakeLists.txt

@@ -57,7 +57,7 @@ else()
     include(cmake/CPM.cmake)
     include(cmake/icons-breeze.cmake)
 
-    CPMAddPackage("gh:diegoiast/qmdilib#483b78f3e3a995452798513620be59f79b95edf4")
+    CPMAddPackage("gh:diegoiast/qmdilib#76f0bc264c26dfa5ab1a9f41944c66ae68efcb53")
     CPMAddPackage("gh:diegoiast/qutepart-cpp#249f082d356736c750023ac41950b6ad01880810")
     CPMAddPackage("gh:diegoiast/command-palette-widget#69eb447b61c9d042394a1404c71a0d0b54ac28c0")
     CPMAddPackage("gh:diegoiast/KodoTerm#9d016815076a451ad639fa021d46602585e91247")

src/plugins/git/CommitForm.cpp

@@ -321,6 +321,18 @@ CommitForm::CommitForm(const QString &dir, GitPlugin *plugin, QWidget *parent)
     connect(ui->pushButton, &QAbstractButton::clicked, this, &CommitForm::pushImpl);
     connect(ui->revertSelectedButton, &QAbstractButton::clicked, this,
             &CommitForm::revertSelectionImpl);
+    connect(ui->amendCheckbox, &QCheckBox::toggled, this, [this](bool checked) {
+        if (checked) {
+            git->runGit({"-C", repoRoot, "log", "-1", "--pretty=%B"})
+                .then(this, [this](const std::tuple<QString, int> &res) {
+                    auto [msg, exitCode] = res;
+                    if (exitCode == 0) {
+                        ui->commitMessage->setPlainText(msg.trimmed());
+                    }
+                });
+        }
+        ui->commitButton->setEnabled(checked || !model->checkedEntries().isEmpty());
+    });
     connect(ui->tableView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
             [this](const QItemSelection &selected, const QItemSelection &) {
                 if (selected.indexes().size() == 0) {
@@ -342,7 +354,7 @@ CommitForm::CommitForm(const QString &dir, GitPlugin *plugin, QWidget *parent)
 
                 auto hasSelection = !model->checkedEntries().isEmpty();
                 ui->revertSelectedButton->setEnabled(hasSelection);
-                ui->commitButton->setEnabled(hasSelection);
+                ui->commitButton->setEnabled(hasSelection || ui->amendCheckbox->isChecked());
             });
     connect(model, &QAbstractItemModel::modelReset, this,
             [this]() { ui->revertSelectedButton->setEnabled(false); });
@@ -543,26 +555,18 @@ void CommitForm::revertSelectionImpl() {
 
 void CommitForm::commitImpl() {
     auto const &checked = model->checkedEntries();
-    if (checked.isEmpty()) {
+    if (checked.isEmpty() && !ui->amendCheckbox->isChecked()) {
         return;
     }
 
-    auto args = QStringList{"-C", repoRoot, "add"};
-    for (auto const &c : checked) {
-        args.push_back(c.filename);
-    }
-
-    ui->gitOutput->clear();
-    git->runGit(args).then(this, [this](const std::tuple<QString, int> &res) {
-        auto [output, exitCode] = res;
-        if (exitCode != 0) {
-            ui->gitOutput->setText(output.trimmed());
-            qDebug() << QString("ExitCode=%1, output=%2").arg(exitCode).arg(output);
-            return;
+    auto doCommit = [this]() {
+        auto commitLogFileName = createTempFileWithContent(ui->commitMessage->toPlainText());
+        auto commitArgs = QStringList{"-C", repoRoot, "commit"};
+        if (ui->amendCheckbox->isChecked()) {
+            commitArgs << "--amend";
         }
+        commitArgs << "-F" << commitLogFileName;
 
-        auto commitLogFileName = createTempFileWithContent(ui->commitMessage->toPlainText());
-        auto commitArgs = QStringList{"-C", repoRoot, "commit", "-F", commitLogFileName};
         git->runGit(commitArgs)
             .then(this, [this, commitLogFileName](const std::tuple<QString, int> &res2) {
                 auto [output2, exitCode2] = res2;
@@ -572,10 +576,31 @@ void CommitForm::commitImpl() {
                     qDebug() << QString("ExitCode=%1, output=%2").arg(exitCode2).arg(output2);
                 } else {
                     ui->commitMessage->clear();
+                    ui->amendCheckbox->setChecked(false);
                 }
                 updateGitStatus();
             });
-    });
+    };
+
+    if (checked.isEmpty()) {
+        doCommit();
+    } else {
+        auto args = QStringList{"-C", repoRoot, "add"};
+        for (auto const &c : checked) {
+            args.push_back(c.filename);
+        }
+
+        ui->gitOutput->clear();
+        git->runGit(args).then(this, [this, doCommit](const std::tuple<QString, int> &res) {
+            auto [output, exitCode] = res;
+            if (exitCode != 0) {
+                ui->gitOutput->setText(output.trimmed());
+                qDebug() << QString("ExitCode=%1, output=%2").arg(exitCode).arg(output);
+                return;
+            }
+            doCommit();
+        });
+    }
 }
 
 void CommitForm::pushImpl() {
@@ -585,6 +610,10 @@ void CommitForm::pushImpl() {
     ui->gitOutput->clear();
 
     auto args = QStringList{"-C", repoRoot, "push"};
+    if (ui->forcePushCheckbox->isChecked()) {
+        args << "--force";
+    }
+
     git->runGit(args).then(this, [this, t](const std::tuple<QString, int> &result) {
         auto [output, exitCode] = result;
         if (exitCode != 0) {
@@ -598,3 +627,5 @@ void CommitForm::pushImpl() {
         ui->pushButton->setEnabled(true);
     });
 };
+
+void CommitForm::setAmend(bool amend) { ui->amendCheckbox->setChecked(amend); }

src/plugins/git/CommitForm.hpp

@@ -31,6 +31,7 @@ class CommitForm : public QWidget, public qmdiClient {
     void revertSelectionImpl();
     void commitImpl();
     void pushImpl();
+    void setAmend(bool amend);
 
   private:
     Ui::CommitForm *ui;

src/plugins/git/CommitForm.ui

@@ -79,6 +79,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QCheckBox" name="amendCheckbox">
+           <property name="text">
+            <string>&amp;Amend</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
@@ -92,6 +99,13 @@
            </property>
           </spacer>
          </item>
+         <item>
+          <widget class="QCheckBox" name="forcePushCheckbox">
+           <property name="text">
+            <string>&amp;Force</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="pushButton">
            <property name="toolTip">

src/plugins/git/GitPlugin.cpp

@@ -113,6 +113,7 @@ void GitPlugin::on_client_merged(qmdiHost *host) {
     logProject = new QAction(tr("git log project/dir"), this);
     revert = new QAction(tr("git revert"), this);
     commit = new QAction(tr("git commit"), this);
+    commitAmend = new QAction(tr("git commit amend"), this);
     stash = new QAction(tr("git stash"), this);
     branches = new QAction(tr("git branch"), this);
 
@@ -126,6 +127,8 @@ void GitPlugin::on_client_merged(qmdiHost *host) {
     revert->setShortcut(QKeySequence("Ctrl+G, U"));
     commit->setToolTip(tr("Record changes to the repository"));
     commit->setShortcut(QKeySequence("Ctrl+G, C"));
+    commitAmend->setToolTip(tr("Amend the last commit"));
+    commitAmend->setShortcut(QKeySequence("Ctrl+G, A"));
     stash->setToolTip(tr("tash away changes to dirty working directory"));
     branches->setToolTip(tr("List, create, or delete branches"));
 
@@ -134,6 +137,7 @@ void GitPlugin::on_client_merged(qmdiHost *host) {
     connect(diffFile, &QAction::triggered, this, &GitPlugin::diffFileHandler);
     connect(revert, &QAction::triggered, this, &GitPlugin::revertFileHandler);
     connect(commit, &QAction::triggered, this, &GitPlugin::commitHandler);
+    connect(commitAmend, &QAction::triggered, this, &GitPlugin::commitAmendHandler);
 
     auto menuName = "&Git";
     host->menus.addActionGroup(menuName, "&Project");
@@ -142,6 +146,7 @@ void GitPlugin::on_client_merged(qmdiHost *host) {
     menus[menuName]->addAction(logProject);
     menus[menuName]->addAction(revert);
     menus[menuName]->addAction(commit);
+    menus[menuName]->addAction(commitAmend);
     menus[menuName]->addAction(stash);
     menus[menuName]->addAction(branches);
 
@@ -410,6 +415,30 @@ void GitPlugin::commitHandler() {
     });
 }
 
+void GitPlugin::commitAmendHandler() {
+    auto manager = getManager();
+    auto client = manager->getMdiServer()->getCurrentClient();
+    if (!client) {
+        return;
+    }
+    auto filename = client->mdiClientFileName();
+    if (filename.isEmpty()) {
+        qDebug() << "Cannot commit on an empty file" << filename;
+        return;
+    }
+
+    detectRepoRoot(filename).then(this, [this, manager](const std::tuple<QString, int> &res) {
+        auto [repoRoot, exitCode] = res;
+        if (exitCode != 0 || repoRoot.isEmpty()) {
+            qDebug() << "Filename is not in any git repo";
+            return;
+        }
+        auto commitForm = new CommitForm(repoRoot, this, manager);
+        commitForm->setAmend(true);
+        mdiServer->addClient(commitForm);
+    });
+}
+
 void GitPlugin::commitDisplayHandler(const QModelIndex &mi) {
     auto widget = static_cast<GitCommitDisplay *>(form->container->widget(0));
     auto manager = getManager();

src/plugins/git/GitPlugin.hpp

@@ -48,6 +48,7 @@ class GitPlugin : public IPlugin {
     void deleteBranchHandler();
     void commitDisplayHandler(const QModelIndex &mi);
     void commitHandler();
+    void commitAmendHandler();
     void logHandler(GitPlugin::GitLog log, const QString &filename);
     void on_gitCommitClicked(const QModelIndex &mi);
     void on_gitCommitDoubleClicked(const QModelIndex &mi);
@@ -65,6 +66,7 @@ class GitPlugin : public IPlugin {
     QAction *logProject = nullptr;
     QAction *revert = nullptr;
     QAction *commit = nullptr;
+    QAction *commitAmend = nullptr;
     QAction *stash = nullptr;
     QAction *branches = nullptr;
     QString gitBinary = "git";