Merge branch 'master' into randy3k/rebase_check

common/util/debug.py

@@ -3,7 +3,7 @@
 import pprint as _pprint
 
 import sublime
-
+from contextlib import contextmanager
 
 _log = []
 enabled = False
@@ -21,6 +21,16 @@ def stop_logging():
     enabled = False
 
 
+@contextmanager
+def disable_logging():
+    global enabled
+    enabled = False
+    try:
+        yield
+    finally:
+        enabled = True
+
+
 def get_log():
     return json.dumps(_log, indent=2)
 

core/commands/show_commit.py

@@ -23,7 +23,7 @@ def run(self, commit_hash):
         view.settings().set("git_savvy.show_commit_view.show_word_diff", False)
         view.settings().set("word_wrap", False)
         view.settings().set("line_numbers", False)
-        view.set_name(SHOW_COMMIT_TITLE.format(commit_hash[:7]))
+        view.set_name(SHOW_COMMIT_TITLE.format(self.get_short_hash(commit_hash)))
         view.set_scratch(True)
         view.run_command("gs_show_commit_refresh")
         view.run_command("gs_diff_navigate")

core/commands/show_file_at_commit.py

@@ -30,7 +30,7 @@ def run_async(self, commit_hash, filepath, lineno=1, lang=None):
         view.settings().set("git_savvy.file_path", filepath)
         view.settings().set("git_savvy.show_file_at_commit_view.lineno", lineno)
         view.settings().set("git_savvy.repo_path", repo_path)
-        view.set_name(SHOW_COMMIT_TITLE.format(commit_hash[:7], self.get_rel_path(filepath)))
+        view.set_name(SHOW_COMMIT_TITLE.format(self.get_short_hash(commit_hash), self.get_rel_path(filepath)))
         sublime.set_timeout_async(lambda: self.render_text(view), 0)
 
     def render_text(self, view):

core/commands/status_bar.py

@@ -3,6 +3,7 @@
 from sublime_plugin import TextCommand, EventListener
 
 from ..git_command import GitCommand
+from ...common.util import debug
 
 
 class GsStatusBarEventListener(EventListener):
@@ -57,7 +58,8 @@ def run_async(self):
             self.view.erase_status("gitsavvy-repo-status")
             return
 
-        short_status = self.get_branch_status_short()
+        with debug.disable_logging():
+            short_status = self.get_branch_status_short()
         self.view.set_status("gitsavvy-repo-status", short_status)
 
         global update_status_bar_soon

core/git_mixins/history.py

@@ -114,3 +114,6 @@ def commit_parents(self, commit_hash):
     def commit_is_merge(self, commit_hash):
         sha = self.git("rev-list", "--merges", "-1", "{0}~1..{0}".format(commit_hash)).strip()
         return sha is not ""
+
+    def get_short_hash(self, commit_hash):
+        return self.git("rev-parse", "--short", commit_hash).strip()

core/interfaces/rebase.py

@@ -1,4 +1,5 @@
 import os
+import re
 
 import sublime
 from sublime_plugin import WindowCommand, TextCommand
@@ -12,6 +13,11 @@
 from ..ui_mixins.quick_panel import show_log_panel
 
 
+COMMIT_NODE_CHAR = "●"
+COMMIT_NODE_CHAR_OPTIONS = "●*"
+COMMIT_LINE = re.compile("\s*[%s]\s*([a-z0-9]{3,})" % COMMIT_NODE_CHAR_OPTIONS)
+
+
 def filter_quick_panel(fn):
     return lambda idx: fn(idx) if idx != -1 else None
 
@@ -152,7 +158,7 @@ def render_base_ref(self):
 
     @ui.partial("base_commit")
     def render_base_commit(self):
-        return self.base_commit()[:7]
+        return self.get_short_hash(self.base_commit())
 
     @ui.partial("status")
     def render_status(self):
@@ -231,7 +237,7 @@ def _get_diverged_in_rebase(self):
         for entry in self.entries:
             conflicts = ""
             was_rewritten = entry.long_hash in rewritten
-            new_hash = rewritten[entry.long_hash][:7] if was_rewritten else None
+            new_hash = rewritten[entry.long_hash] if was_rewritten else None
             is_merge = self.commit_is_merge(entry.long_hash)
             if self.in_rebase_merge() and is_merge:
                 is_conflict = conflict_commit in self.commits_of_merge(entry.long_hash)
@@ -264,7 +270,7 @@ def _get_diverged_in_rebase(self):
                 "status": (self.SUCCESS if was_rewritten else
                            self.CONFLICT if is_conflict else
                            self.UNKNOWN),
-                "commit_hash": new_hash if was_rewritten else entry.short_hash,
+                "commit_hash": self.get_short_hash(new_hash) if was_rewritten else entry.short_hash,
                 "commit_summary": ("(was {}) {}".format(entry.short_hash, entry.summary)
                                    if was_rewritten else
                                    entry.summary),
@@ -485,7 +491,9 @@ def get_selected_short_hash(self):
 
         line = self.view.line(sels[0])
         line_str = self.view.substr(line)
-        return line_str[7:14]
+        m = COMMIT_LINE.match(line_str)
+        if m:
+            return m.group(1)
 
     def get_idx_entry_and_prev(self, short_hash):
         entry_before_selected = None
@@ -556,7 +564,8 @@ def run_async(self):
     def do_action(self, target_commit):
 
         squash_idx, squash_entry, _ = self.get_idx_entry_and_prev(self.squash_entry.short_hash)
-        target_idx, target_entry, before_target = self.get_idx_entry_and_prev(target_commit[:7])
+        target_idx, target_entry, before_target = \
+            self.get_idx_entry_and_prev(self.get_short_hash(target_commit))
 
         if self.commit_is_merge(target_entry.long_hash):
             sublime.message_dialog("Unable to squash a merge.")
@@ -691,7 +700,8 @@ def run_async(self):
     def do_action(self, target_commit):
 
         move_idx, move_entry, _ = self.get_idx_entry_and_prev(self.move_entry.short_hash)
-        target_idx, target_entry, before_target = self.get_idx_entry_and_prev(target_commit[:7])
+        target_idx, target_entry, before_target = \
+            self.get_idx_entry_and_prev(self.get_short_hash(target_commit))
         idx = move_idx - target_idx
 
         commit_chain = self.perpare_rewrites(self.interface.entries[target_idx:])
@@ -737,7 +747,8 @@ def run_async(self):
     def do_action(self, target_commit):
 
         move_idx, move_entry, before_move = self.get_idx_entry_and_prev(self.move_entry.short_hash)
-        target_idx, target_entry, _ = self.get_idx_entry_and_prev(target_commit[:7])
+        target_idx, target_entry, _ = \
+            self.get_idx_entry_and_prev(self.get_short_hash(target_commit))
         idx = target_idx - move_idx
 
         commit_chain = self.perpare_rewrites(self.interface.entries[move_idx:])

core/interfaces/tags.py

@@ -109,7 +109,7 @@ def render_local_tags(self):
             return NO_LOCAL_TAGS_MESSAGE
 
         return "\n".join(
-            "    {} {}".format(tag.sha[:7], tag.tag)
+            "    {} {}".format(self.get_short_hash(tag.sha), tag.tag)
             for tag in self.local_tags
             )
 
@@ -148,7 +148,7 @@ def get_remote_tags_list(self, remote, remote_name):
         if "tags" in remote:
             if remote["tags"]:
                 msg = "\n".join(
-                    "    {} {}".format(tag.sha[:7], tag.tag)
+                    "    {} {}".format(self.get_short_hash(tag.sha), tag.tag)
                     for tag in remote["tags"] if tag.tag[-3:] != "^{}"
                     )
             else: