Add jj item

Author: ETCaton

functions/_tide_item_jj.fish

@@ -0,0 +1,35 @@
+function _tide_item_jj
+    if not command -sq jj; or not jj root --quiet &>/dev/null
+        return 1
+    end
+
+    set jj_status (jj log -r@ -n1 --no-graph --color always -T '
+    separate(" ",
+        bookmarks.map(|x| if(
+            x.name().substr(0, 10).starts_with(x.name()),
+            x.name().substr(0, 10),
+            x.name().substr(0, 9) ++ "…")
+        ).join(" "),
+        tags.map(|x| if(
+            x.name().substr(0, 10).starts_with(x.name()),
+            x.name().substr(0, 10),
+            x.name().substr(0, 9) ++ "…")
+        ).join(" "),
+        surround("\"","\"",
+            if(
+                description.first_line().substr(0, 24).starts_with(description.first_line()),
+                description.first_line().substr(0, 24),
+                description.first_line().substr(0, 23) ++ "…"
+            )
+        ),
+        change_id.shortest(),
+        commit_id.shortest(),
+        diff.files().len() ++ "m",
+        diff.stat().total_added() ++ "+",
+        diff.stat().total_removed() ++ "-",
+        if(conflict, "conflict"),
+        if(divergent, "divergent"),
+        if(hidden, "hidden"),
+    )' | string trim)
+    _tide_print_item jj $tide_jj_icon' ' "($jj_status)"
+end

functions/_tide_remove_unusable_items.fish

@@ -1,7 +1,7 @@
 function _tide_remove_unusable_items
     # Remove tool-specific items for tools the machine doesn't have installed
     set -l removed_items
-    for item in aws bun crystal direnv distrobox docker elixir gcloud git go java kubectl nix_shell node php pulumi python ruby rustc terraform toolbox zig
+    for item in aws bun crystal direnv distrobox docker elixir jj gcloud git go java kubectl nix_shell node php pulumi python ruby rustc terraform toolbox zig
         contains $item $tide_left_prompt_items $tide_right_prompt_items || continue
 
         set -l cli_names $item

functions/tide/configure/configs/classic.fish

@@ -52,7 +52,7 @@ tide_jobs_number_threshold 1000
 tide_kubectl_bg_color 444444
 tide_kubectl_color 326CE5
 tide_left_prompt_frame_enabled true
-tide_left_prompt_items pwd git newline
+tide_left_prompt_items pwd git jj newline
 tide_left_prompt_prefix ''
 tide_left_prompt_separator_diff_color 
 tide_left_prompt_separator_same_color 
@@ -79,7 +79,7 @@ tide_pwd_bg_color 444444
 tide_pwd_color_anchors $_tide_color_light_blue
 tide_pwd_color_dirs $_tide_color_dark_blue
 tide_pwd_color_truncated_dirs 8787AF
-tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform bun.lockb Cargo.toml composer.json CVS go.mod package.json build.zig
+tide_pwd_markers .bzr .citc .git .hg .jj .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform bun.lockb Cargo.toml composer.json CVS go.mod package.json build.zig
 tide_python_bg_color 444444
 tide_python_color 00AFAF
 tide_right_prompt_frame_enabled true

tests/_tide_item_jj.test.fish

@@ -0,0 +1,49 @@
+# RUN: %fish %s
+_tide_parent_dirs
+
+function _jj
+    _tide_decolor (_tide_item_jj)
+end
+
+set -l tmpdir (mktemp -d)
+cd $tmpdir
+
+mock command -sq jj "echo '/tmp/usr/bin/jj'"
+mock jj root --quiet "echo '/tmp/usr/repo'"
+mock jj log -r@ -n1 --no-graph --color always -T '
+    separate(" ",
+        bookmarks.map(|x| if(
+            x.name().substr(0, 10).starts_with(x.name()),
+            x.name().substr(0, 10),
+            x.name().substr(0, 9) ++ "…")
+        ).join(" "),
+        tags.map(|x| if(
+            x.name().substr(0, 10).starts_with(x.name()),
+            x.name().substr(0, 10),
+            x.name().substr(0, 9) ++ "…")
+        ).join(" "),
+        surround("\"","\"",
+            if(
+                description.first_line().substr(0, 24).starts_with(description.first_line()),
+                description.first_line().substr(0, 24),
+                description.first_line().substr(0, 23) ++ "…"
+            )
+        ),
+        change_id.shortest(),
+        commit_id.shortest(),
+        diff.files().len() ++ "m",
+        diff.stat().total_added() ++ "+",
+        diff.stat().total_removed() ++ "-",
+        if(conflict, "conflict"),
+        if(divergent, "divergent"),
+        if(hidden, "hidden"),
+    )' "echo 'my-bookmark \"bugfixes\" p a 1m 39+ 5-'"
+
+set -lx tide_deno_icon 󱗆
+
+_jj # CHECK:
+
+touch .jj
+_jj # CHECK: 󱗆 (my-bookmark "bugfixes" p a 1m 39+ 5-)
+
+command rm -r $tmpdir