Merge pull request #1999 from timbrel/wide-jump-fixups

Author: kaste

core/commands/help_panel.py

@@ -259,7 +259,7 @@ class gs_log_graph_help_panel(GsAbstractOpenHelpPanel):
  [{cr}-r] Goto tags, branches...
  [h] Goto HEAD commit
  [up]/[down] go to previous/next commit (also: [,]/[.] or [j]/[k] in vintageous mode)
- Use [alt+up]/[alt+down] for wider jumps
+ Use [alt+up]/[alt+down] for wider jumps, e.g. to jump between fixup commits
 
  ### Other ###
  [?] show this help popup

core/commands/log_graph.py

@@ -1616,11 +1616,25 @@ def run(self, edit, forward=True):
  view.run_command("gs_log_graph_navigate", {"forward": forward})
  return
 
+ # We actually want to intertwine edge commits and marked fixup commits
+ # but I think that is difficult to do elegantly. So I do it manually.
+ marked_fixup_dots = [
+ colorizer.Char(view, r.a) for r in view.get_regions('gs_log_graph_follow_fixups')
+ if (r.a > cur_dot.pt if forward else r.a < cur_dot.pt)
+ ]
+ if marked_fixup_dots:
+ next_fixup = marked_fixup_dots[0] if forward else marked_fixup_dots[-1]
+ else:
+ next_fixup = None
+
  next_dots = follow_first_parent(cur_dot, forward)
  try:
  next_dot = next(next_dots)
  except StopIteration:
- return
+ if next_fixup:
+ next_dot = next_fixup
+ else:
+ return
 
  if line_distance(view, cur_dot.region(), next_dot.region()) < 2:
  # If the first next dot is not already a wide jump, t.i. the
@@ -1641,6 +1655,9 @@ def run(self, edit, forward=True):
  except UnboundLocalError:
  pass
 
+ if next_fixup:
+ next_dot = (min if forward else max)(next_dot, next_fixup, key=lambda dot: dot.pt)
+
  line = line_from_pt(view, next_dot.region())
  r = extract_comit_hash_span(view, line)
  if r: