fish-shell/share/functions/fish_jj_prompt.fish

function fish_jj_prompt
    # If jj isn't installed, there's nothing we can do
    # Return 1 so the calling prompt can deal with it
    if not command -sq jj
        return 1
    end
    jj log 2>/dev/null --no-graph --ignore-working-copy --color=always --revisions @ \
        --template '
            concat(
                " ",
                separate(" ",
                    format_short_change_id_with_hidden_and_divergent_info(self),
                    bookmarks,
                    tags,
                    if(conflict, label("conflict", "×")),
                    if(empty, label("empty", "(empty)"))
                ),
            )'
end
-												Add a simple fish_jj_prompt

jj is often colocated with Git so the Git prompt also works, but
jj is always in a detached HEAD state, which is atypical for Git.
The jj prompt improves things by showing the revision ID which is
usually more useful than the commit ID.

This prompt is mostly adapted from the defaults for "jj log -r @".

Showing conflicting/empty commits seems useful.
Also perhaps bookmarks and tags, not sure.

The main problem with this prompt is that due to --ignore-working-copy,
the information may be stale.  That will be rectified after every jj
command, so hopefully this doesn't cause issues.

											
										
										
											2024-11-19 08:43:29 +00:00
+								function fish_jj_prompt
-												fish_jj_prompt: don't error if jj not installed

											
										
										
											2025-01-03 04:38:14 +00:00
+								    # If jj isn't installed, there's nothing we can do
 								    # Return 1 so the calling prompt can deal with it
 								    if not command -sq jj
 								        return 1
 								    end
-												Add a simple fish_jj_prompt

jj is often colocated with Git so the Git prompt also works, but
jj is always in a detached HEAD state, which is atypical for Git.
The jj prompt improves things by showing the revision ID which is
usually more useful than the commit ID.

This prompt is mostly adapted from the defaults for "jj log -r @".

Showing conflicting/empty commits seems useful.
Also perhaps bookmarks and tags, not sure.

The main problem with this prompt is that due to --ignore-working-copy,
the information may be stale.  That will be rectified after every jj
command, so hopefully this doesn't cause issues.

											
										
										
											2024-11-19 08:43:29 +00:00
+								    jj log 2>/dev/null --no-graph --ignore-working-copy --color=always --revisions @ \
 								        --template '
 								            concat(
 								                " ",
 								                separate(" ",
 								                    format_short_change_id_with_hidden_and_divergent_info(self),
 								                    bookmarks,
 								                    tags,
 								                    if(conflict, label("conflict", "×")),
 								                    if(empty, label("empty", "(empty)"))
 								                ),
 								            )'
 								end