terminal user interface to jujutsu. Focused on speed and clarity
fix remaining references to branch rather than bookmark
+10
-9
+1
-1
jj_tui/bin/global_funcs.ml
+1
-1
jj_tui/bin/global_funcs.ml
···
52
52
safe_jj (fun () ->
53
53
let rev = Vars.get_hovered_rev () in
54
54
let branches =
55
-
jj_no_log ~snapshot:cause_snapshot [ "branch"; "list"; "-a" ] |> colored_string
55
+
jj_no_log ~snapshot:cause_snapshot [ "bookmark"; "list"; "-a" ] |> colored_string
56
56
in
57
57
(* From now on we use ignore-working-copy so we don't re-snapshot the state and so
58
58
we can operate in paralell *)
+4
-3
jj_tui/bin/jj_process.ml
+4
-3
jj_tui/bin/jj_process.ml
···
222
222
])
223
223
with
224
224
| Picos_std_structured.Control.Terminate as e ->
225
-
[%log debug "Terminated command: %s" (args |> String.concat " ")];
226
-
if locked then Mutex.unlock access_lock;
227
-
raise e
225
+
Control.protect (fun () ->
226
+
if locked then Mutex.unlock access_lock;
227
+
[%log debug "Terminated command: %s" (args |> String.concat " ")];
228
+
raise e)
228
229
| e ->
229
230
[%log warn "Exception running jj: %s" (Printexc.to_string e)];
230
231
Error (`Exception (Printexc.to_string e))
+5
-5
jj_tui/bin/jj_widgets.ml
+5
-5
jj_tui/bin/jj_widgets.ml
···
17
17
18
18
(*List of branches, containing the full output string as well as the string name*)
19
19
let get_branches template =
20
-
let log = jj_no_log ~snapshot:false [ "branch"; "list"; "-a"; "-T"; template ] in
20
+
let log = jj_no_log ~snapshot:false [ "bookmark"; "list"; "-a"; "-T"; template ] in
21
21
let lines = String.split_on_char '\n' log in
22
22
lines
23
23
|> List.filter_map (fun line ->
···
49
49
get_branches_selectable
50
50
({|if(!remote,name++"|}
51
51
^ "\u{1C}"
52
-
^ {|"++label("branch", name) ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
52
+
^ {|"++label("bookmark", name) ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
53
53
)
54
54
;;
55
55
···
57
57
get_branches_selectable
58
58
@@ {|if(remote && !(remote.starts_with("git")&&remote.ends_with("git")), name++"|}
59
59
^ "\u{1C}"
60
-
^ {|"++label("branch", name++" @"++remote) ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
60
+
^ {|"++label("bookmark", name++" @"++remote) ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
61
61
;;
62
62
63
63
let branches_remotes_not_tracked =
64
64
get_branches_selectable
65
65
@@ {|if(remote && !(remote.starts_with("git")&&remote.ends_with("git")) && !tracked, name++"@"++remote++"|}
66
66
^ "\u{1C}"
67
-
^ {|"++label("branch", name++" @"++remote) ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
67
+
^ {|"++label("bookmark", name++" @"++remote) ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
68
68
;;
69
69
70
70
let branches_remotes_tracked =
71
71
get_branches_selectable
72
72
@@ {|if(remote && !(remote.starts_with("git")&&remote.ends_with("git")) && tracked, name++"@"++remote++"|}
73
73
^ "\u{1C}"
74
-
^ {|"++label("branch", name++" @"++remote) ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
74
+
^ {|"++label("bookmark", name++" @"++remote) ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
75
75
;;
76
76
77
77
let selection_list ?(focus = Focus.make ()) items =