Update commit formatting in common.sh

Author: jcmuller

lib/common.sh

@@ -61,15 +61,15 @@ if(commit.root(),
     ),
     concat(
       separate(" ",
-        format_short_change_id_with_hidden_and_divergent_info(commit),
+        format_short_change_id_with_change_offset(commit),
         format_short_signature_oneline(commit.author()),
         format_timestamp(commit_timestamp(commit)),
         commit.commit_id().short(20),
         commit.bookmarks(),
         commit.tags(),
         commit.working_copies(),
         if(commit.git_head(), label("git_head", "git_head()")),
-        if(commit.conflict(), label("conflict", "conflict")),
+        format_commit_labels(commit),
         if(config("ui.show-cryptographic-signatures").as_boolean(),
           format_short_cryptographic_signature(commit.signature())),
         if(commit.empty(), label("empty", "(empty)")),

lib/evolog.sh

@@ -23,7 +23,7 @@ TITLE='Evolution Log'
 export JJFZF_EVOLOG_SRC=$(jj --no-pager --ignore-working-copy log --no-graph -T commit_id -r "${1-@}")
 LONG_IDS="--config=template-aliases.'format_short_change_id(id)'='id.shortest(32)'"
 FOOTER="$TITLE for Change ID:"$'\n'
-FOOTER="$FOOTER"$(jj --no-pager --ignore-working-copy log --no-graph $LONG_IDS $JJFZF_COLOR -T 'format_short_change_id_with_hidden_and_divergent_info(self)' -r "${1-@}")
+FOOTER="$FOOTER"$(jj --no-pager --ignore-working-copy log --no-graph $LONG_IDS $JJFZF_COLOR -T 'format_short_change_id_with_change_offset(self)' -r "${1-@}")
 jjfzf_log_detailed	# for preview, assigns $JJFZF_LOG_DETAILED_CONFIG
 B=() H=()