terminal user interface to jujutsu. Focused on speed and clarity
fix elided revisions bug during rebase
+8
-2
+8
-2
jj_tui/lib/render_jj_graph.ml
+8
-2
jj_tui/lib/render_jj_graph.ml
···
554
554
~preview_before
555
555
~preview_after
556
556
in
557
+
if not (Hashtbl.mem base_nodes elided_marker)
558
+
then Hashtbl.replace base_nodes elided_marker (make_elided_node ());
557
559
let final_nodes = Hashtbl.create (List.length ordered_ids) in
558
560
let rec build_node id =
559
561
match Hashtbl.find_opt final_nodes id with
···
563
565
let base = Hashtbl.find base_nodes id in
564
566
let parent_ids =
565
567
Option.value (Hashtbl.find_opt parent_map id) ~default:[]
566
-
|> List.filter (fun parent_id -> Hashtbl.mem base_nodes parent_id)
568
+
|> List.filter (fun parent_id ->
569
+
Hashtbl.mem base_nodes parent_id || parent_id = elided_marker)
567
570
in
568
571
let parents = List.map build_node parent_ids in
569
572
let node = { base with parents } in
···
766
769
~preview_before
767
770
~preview_after
768
771
in
772
+
if not (Hashtbl.mem base_nodes elided_marker)
773
+
then Hashtbl.replace base_nodes elided_marker (make_elided_node ());
769
774
let final_nodes = Hashtbl.create (List.length ordered_ids) in
770
775
let rec build_node id =
771
776
match Hashtbl.find_opt final_nodes id with
···
775
780
let base = Hashtbl.find base_nodes id in
776
781
let parent_ids =
777
782
Option.value (Hashtbl.find_opt parent_map id) ~default:[]
778
-
|> List.filter (fun parent_id -> Hashtbl.mem base_nodes parent_id)
783
+
|> List.filter (fun parent_id ->
784
+
Hashtbl.mem base_nodes parent_id || parent_id = elided_marker)
779
785
in
780
786
let parents = List.map build_node parent_ids in
781
787
let node = { base with parents } in