fix remaining references to branch rather than bookmark

faldor20 · Nov 1, 2024 · 20d9bc2 · 20d9bc2
1 parent d44f804
commit 20d9bc2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/jj_tui/bin/global_funcs.ml b/jj_tui/bin/global_funcs.ml
@@ -52,7 +52,7 @@ let update_views ?(cause_snapshot = false) () =
   safe_jj (fun () ->
     let rev = Vars.get_hovered_rev () in
     let branches =
-      jj_no_log ~snapshot:cause_snapshot [ "branch"; "list"; "-a" ] |> colored_string
+      jj_no_log ~snapshot:cause_snapshot [ "bookmark"; "list"; "-a" ] |> colored_string
     in
     (* From now on we use ignore-working-copy so we don't re-snapshot the state and so
        we can operate in paralell *)

diff --git a/jj_tui/bin/jj_widgets.ml b/jj_tui/bin/jj_widgets.ml
@@ -17,7 +17,7 @@ module Make (Vars : Global_vars.Vars) = struct
 
   (*List of branches, containing the full output string as well as the string name*)
   let get_branches template =
-    let log = jj_no_log ~snapshot:false [ "branch"; "list"; "-a"; "-T"; template ] in
+    let log = jj_no_log ~snapshot:false [ "bookmark"; "list"; "-a"; "-T"; template ] in
     let lines = String.split_on_char '\n' log in
     lines
     |> List.filter_map (fun line ->
@@ -49,29 +49,29 @@ module Make (Vars : Global_vars.Vars) = struct
     get_branches_selectable
       ({|if(!remote,name++"|}
        ^ "\u{1C}"
-       ^ {|"++label("branch", name)  ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
+       ^ {|"++label("bookmark", name)  ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
       )
   ;;
 
   let branches_remotes_no_git =
     get_branches_selectable
     @@ {|if(remote && !(remote.starts_with("git")&&remote.ends_with("git")), name++"|}
     ^ "\u{1C}"
-    ^ {|"++label("branch", name++" @"++remote)  ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
+    ^ {|"++label("bookmark", name++" @"++remote)  ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
   ;;
 
   let branches_remotes_not_tracked =
     get_branches_selectable
     @@ {|if(remote && !(remote.starts_with("git")&&remote.ends_with("git")) && !tracked, name++"@"++remote++"|}
     ^ "\u{1C}"
-    ^ {|"++label("branch", name++" @"++remote)  ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
+    ^ {|"++label("bookmark", name++" @"++remote)  ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
   ;;
 
   let branches_remotes_tracked =
     get_branches_selectable
     @@ {|if(remote && !(remote.starts_with("git")&&remote.ends_with("git")) && tracked, name++"@"++remote++"|}
     ^ "\u{1C}"
-    ^ {|"++label("branch", name++" @"++remote)  ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
+    ^ {|"++label("bookmark", name++" @"++remote)  ++ if(present, format_ref_targets(self), " (deleted)")++ "\n")|}
   ;;
 
   let selection_list ?(focus = Focus.make ()) items =