add commit-drop window and keyboard shortcut

src/core/OSTreeTUI.cpp

@@ -114,9 +114,14 @@ OSTreeTUI::OSTreeTUI(const std::string& repo, const std::vector<std::string>& st
 
     // add application shortcuts
     mainContainer = CatchEvent(container | border, [&](const Event& event) {
+        // start commit promotion window
         if (event == Event::AltP) {
             SetViewMode(ViewMode::COMMIT_PROMOTION, visibleCommitViewMap.at(selectedCommit));
         }
+        // start commit deletion window
+        if (event == Event::AltD) {
+            SetViewMode(ViewMode::COMMIT_DROP, visibleCommitViewMap.at(selectedCommit));
+        }
         // copy commit id
         if (event == Event::AltC) {
             std::string hash = visibleCommitViewMap.at(selectedCommit);
@@ -210,6 +215,10 @@ bool OSTreeTUI::RefreshOSTreeRepository() {
 }
 
 bool OSTreeTUI::SetViewMode(ViewMode newViewMode, const std::string& hash, bool setModeBranch) {
+    // nothing to change
+    if (newViewMode == viewMode && hash == modeHash) {
+        return false;
+    }
     // deactivate promotion mode
     if (newViewMode == ViewMode::DEFAULT) {
         viewMode = ViewMode::DEFAULT;
@@ -218,14 +227,19 @@ bool OSTreeTUI::SetViewMode(ViewMode newViewMode, const std::string& hash, bool
         return true;
     }
     // set promotion mode
-    if (viewMode == ViewMode::DEFAULT || hash != modeHash) {
+    if (newViewMode == ViewMode::COMMIT_PROMOTION) {
         viewMode = ViewMode::COMMIT_PROMOTION;
         if (setModeBranch) {
             modeBranch = modeBranch.empty() ? columnToBranchMap.at(0) : modeBranch;
         }
         modeHash = hash;
         return true;
     }
+    // set deletion mode
+    if (newViewMode == ViewMode::COMMIT_DROP) {
+        viewMode = newViewMode;
+        modeHash = hash;
+    }
     // nothing to update
     return false;
 }
@@ -250,7 +264,7 @@ bool OSTreeTUI::PromoteCommit(const std::string& hash,
 
 bool OSTreeTUI::DropLastCommit(const cpplibostree::Commit& commit) {
     bool success = ostreeRepo.DropLastCommit(commit);
-    // SetDeletionMode(false);
+    SetViewMode(ViewMode::DEFAULT);
     // reload repository
     if (success) {
         scrollOffset = 0;

src/core/OSTreeTUI.hpp

@@ -132,7 +132,7 @@ class OSTreeTUI {
 
     // view states
     int scrollOffset{0};
-    ViewMode viewMode = DEFAULT;
+    ViewMode viewMode = ViewMode::DEFAULT;
     std::string modeHash;
     std::string modeBranch;
 

src/core/commit.cpp

@@ -120,7 +120,6 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
         width() = PROMOTION_WINDOW_WIDTH;
         height() = PROMOTION_WINDOW_HEIGHT;
         // change inner to promotion layout
-        simpleCommit = inner;
         DetachAllChildren();
         Add(promotionView);
         if (!Focused()) {
@@ -135,6 +134,16 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
         }
     }
 
+    void startDeletionWindow() {
+        left() = std::max(left(), -2);
+        width() = DELETION_WINDOW_WIDTH;
+        height() = DELETION_WINDOW_HEIGHT;
+        // change inner to deletion layout
+        DetachAllChildren();
+        Add(deletionView);
+        TakeFocus();
+    }
+
     void executePromotion() {
         // promote on the ostree repo
         std::vector<std::string> metadataStrings;
@@ -145,7 +154,13 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
         resetWindow();
     }
 
-    void cancelPromotion() {
+    void executeDeletion() {
+        // delete on the ostree repo
+        ostreetui.DropLastCommit(ostreetui.GetOstreeRepo().getCommitList().at(hash));
+        resetWindow();
+    }
+
+    void cancelSpecialWindow() {
         ostreetui.SetViewMode(ViewMode::DEFAULT);
         resetWindow();
     }
@@ -159,6 +174,9 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
             } else {
                 resetWindow(false);
             }
+        } else if (ostreetui.GetViewMode() == ViewMode::COMMIT_DROP &&
+                   ostreetui.GetModeHash() == hash) {
+            startDeletionWindow();
         }
 
         auto element = ComponentBase::Render();
@@ -211,7 +229,7 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
             }
             // cancel
             if (event == Event::Escape) {
-                cancelPromotion();
+                cancelSpecialWindow();
                 return true;
             }
         }
@@ -356,9 +374,28 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
                           text(" ☐ " + ostreetui.GetModeBranch()) | bold, text(" │") | bold});
          }),
          Container::Horizontal({
-             Button(" Cancel ", [&] { cancelPromotion(); }) | color(Color::Red) | flex,
+             Button(" Cancel ", [&] { cancelSpecialWindow(); }) | color(Color::Red) | flex,
              Button(" Promote ", [&] { executePromotion(); }) | color(Color::Green) | flex,
          })});
+    Component deletionView = Container::Vertical(
+        {Renderer([&] {
+             return vbox({text(""), text(" Remove Commit...") | bold, text(""),
+                          hbox({
+                              text(" ✖ ") | color(Color::Red),
+                              text(hash.substr(0, 8)) | bold | color(Color::Red),
+                          }),
+                          text(" ✖ " + commit.subject) | color(Color::Red),
+                          text(" ✖") | color(Color::Red),
+                          hbox({
+                              text(" ✖ ") | color(Color::Red),
+                              text("from branch:") | dim,
+                          }),
+                          text(" ☐ " + ostreetui.GetModeBranch()) | dim, text(" │") | dim});
+         }),
+         Container::Horizontal({
+             Button(" Cancel ", [&] { cancelSpecialWindow(); }) | color(Color::Red) | flex,
+             Button(" Remove ", [&] { executeDeletion(); }) | color(Color::Green) | flex,
+         })});
 };
 
 }  // namespace

src/core/commit.hpp

@@ -32,6 +32,8 @@ constexpr int COMMIT_WINDOW_HEIGHT{4};
 constexpr int COMMIT_WINDOW_WIDTH{32};
 constexpr int PROMOTION_WINDOW_HEIGHT{COMMIT_WINDOW_HEIGHT + 11};
 constexpr int PROMOTION_WINDOW_WIDTH{COMMIT_WINDOW_WIDTH + 8};
+constexpr int DELETION_WINDOW_HEIGHT{COMMIT_WINDOW_HEIGHT + 11};
+constexpr int DELETION_WINDOW_WIDTH{COMMIT_WINDOW_WIDTH + 8};
 // render tree types
 enum RenderTree : uint8_t {
     TREE_LINE_NODE,          // ☐ | |

src/core/footer.hpp

@@ -19,7 +19,7 @@ class Footer {
 
    private:
     const std::string DEFAULT_CONTENT{
-        "  || Alt+Q : Quit || Alt+R : Refresh || Alt+C : Copy commit hash || Alt+P : Promote "
-        "Commit "};
+        "  || Alt+Q : Quit || Alt+R : Refresh || Alt+C : Copy Hash || Alt+P : Promote || Alt+D: "
+        "Drop || "};
     std::string content{DEFAULT_CONTENT};
 };