feature: inline diff select commit/branch to diff

Default.sublime-keymap

@@ -743,6 +743,15 @@
             { "key": "selector", "operand": "git-savvy.make-commit meta.dropped.git.commit" }
         ]
     },
+    {
+        "keys": ["s"],
+        "command": "gs_commit_view_open_transient_view",
+        "context": [
+            { "key": "setting.command_mode", "operator": "equal", "operand": false },
+            { "key": "setting.git_savvy.commit_view", "operator": "equal", "operand": true },
+            { "key": "selector", "operand": "git-savvy.make-commit meta.dropped.git.commit" }
+        ]
+    },
 
 
     ///////////////

core/commands/commit.py

@@ -24,6 +24,7 @@
     "gs_commit_view_do_commit",
     "gs_commit_view_sign",
     "gs_commit_view_close",
+    "gs_commit_view_open_transient_view",
     "gs_commit_log_helper",
     "GsPrepareCommitFocusEventListener",
     "GsPedanticEnforceEventListener",
@@ -617,6 +618,23 @@
             self.view.close()
 
 
+class gs_commit_view_open_transient_view(WindowCommand):
+    def run(self):
+        window = sublime.active_window()
+        view = window.active_view()
+        text = view.substr(sublime.Region(0, view.size()))
+        text = text.replace(COMMIT_HELP_TEXT, "## To make a commit,\n")
+        text = text.replace(HELP_WHEN_PATCH_IS_VISIBLE, "")
+        text = text.replace(HELP_WHEN_UNSTAGING_IS_POSSIBLE, "")
+        text = text.replace(HELP_WHEN_DISCARDING_IS_POSSIBLE, "")
+        text = text.replace('diff --git', '\ndiff --git')
+
+        window.run_command('set_layout', { "cols": [0.0, 0.5, 1.0], "rows": [0.0, 1.0], "cells": [[0, 0, 1, 1], [1, 0, 2, 1]] })
+        window.run_command('focus_group', { "group": 1 })
+        view_transient = window.new_file(sublime.NewFileFlags.TRANSIENT, "Packages/GitSavvy/syntax/make_commit.sublime-syntax")
+        view_transient.run_command("append", {"characters": text})
+
+
 class gs_commit_log_helper(TextCommand, LogHelperMixin):
     def run(self, edit, prefix="fixup! ", move_to_eol=True):
         view = self.view

core/commands/inline_diff.py

@@ -34,6 +34,7 @@
     "gs_inline_diff_navigate_hunk",
     "gs_inline_diff_undo",
     "GsInlineDiffFocusEventListener",
+    "SelectInlineDiffCommitCommand",
 )
 
 
@@ -131,7 +132,8 @@
     hunks or individual lines, and to navigate between hunks.
     """
 
-    def run(self, cached=None, match_current_position="<SENTINEL>"):
+    def run(self, cached=None, match_current_position="<SENTINEL>",
+            base_commit=None, target_commit=None):
         # type: (Optional[bool], object) -> None
         if match_current_position != "<SENTINEL>":
             print(
@@ -182,7 +184,9 @@
                 "file_path": file_path,
                 "syntax": syntax_file,
                 "cached": bool(cached),
-                "match_position": cur_pos
+                "match_position": cur_pos,
+                "base_commit": base_commit,
+                "target_commit": target_commit,
             })
 
     def open_from_diff_view(self, view):
@@ -1212,3 +1216,77 @@
             "match_position": cur_pos,
             "sync": True
         })
+
+class SelectInlineDiffCommitCommand(WindowCommand, GitCommand):
+    def _on_commits(self):
+        commit_text_list = self.git('log', '--format="%h %s"', '-n', str(self._last_n_commits)).strip().splitlines()
+        if not commit_text_list:
+            return self._on_cancel()
+        self._commit_desc_list = []
+        for txt in commit_text_list:
+            txt = txt.strip('"')
+            commit_desc = txt.split(' ', 1)
+            self._commit_desc_list.append(commit_desc)
+        self.window.show_quick_panel(self._commit_desc_list, self._on_select_commits)
+
+    def _on_select_commits(self, _id):
+        if _id == -1:
+            return self._on_cancel()
+        commit_desc = self._commit_desc_list[_id]
+        commit_id = commit_desc[0]
+        self._on_done(commit_id)
+
+    def _on_branches(self):
+        branches_text_list = self.git("branch").strip().splitlines()
+        if not branches_text_list:
+            return self._on_cancel()
+        self._branch_list = []
+        for txt in branches_text_list:
+            branch = txt.strip(' *')
+            self._branch_list.append(branch)
+        self.window.show_quick_panel(self._branch_list, self._on_select_branches)
+
+    def _on_select_branches(self, _id):
+        if _id == -1:
+            return self._on_cancel()
+        branch = self._branch_list[_id]
+        commit_id = self.git("rev-parse", "--short", branch).strip().splitlines()[0]
+        if not commit_id:
+            return self._on_cancel()
+        self._on_done(commit_id)
+
+    def _on_done(self, commit_id):
+        if not commit_id:
+            return self._on_cancel()
+        view = self.window.active_view()
+        settings = view.settings()
+        base_commit = self.git("rev-parse", "--short", "HEAD").strip().splitlines()[0]
+        self.window.run_command("gs_inline_diff", {
+            "cached": self._cached,
+            "base_commit": base_commit,
+            "target_commit": commit_id,
+        })
+
+    def _on_change(self, *args, **kwargs):
+        pass
+
+    def _on_cancel(self, *args, **kwargs):
+        pass
+
+    def _on_select_mode(self, _id):
+        if _id == -1:
+            return self.on_cancel()
+        elif _id == 0:
+            self.window.show_input_panel('commit id', '', self._on_done, self._on_change, self._on_cancel)
+            return
+        mode = self._modes[_id]
+        if mode == 'commits':
+            self._on_commits()
+        else: # mode == 'branches'
+            self._on_branches()
+
+    def run(self, cached=None, last_n_commits=20):
+        self._cached = cached
+        self._last_n_commits = last_n_commits
+        self._modes = ['[commit id]', 'branches', 'commits']
+        self.window.show_quick_panel(self._modes, self._on_select_mode)