Przeglądaj źródła

jj: color unpushed changes

raylu 1 miesiąc temu
rodzic
commit
218220f1c1
2 zmienionych plików z 4 dodań i 2 usunięć
  1. 3 1
      config/jj/config.toml
  2. 1 1
      zshrc

+ 3 - 1
config/jj/config.toml

@@ -52,7 +52,7 @@ if(root,
   format_root_commit(self),
   label(if(current_working_copy, "working_copy"),
     concat(
-      format_short_commit_header(self) ++ "\n",
+	  label(if(self.contained_in("remote_bookmarks().."), "unpushed"), format_short_commit_header(self)) ++ "\n",
       separate(" ",
         if(empty, label("empty", "(empty)")),
         if(description,
@@ -71,5 +71,7 @@ if(root,
 'bookmarks name' = '#d47ebe'
 'commit author email' = '#f9e2af'
 'commit change_id shortest prefix' = '#cba6f7'
+'commit unpushed change_id shortest prefix' = '#fab387'
+'commit working_copy unpushed change_id shortest prefix' = '#f38ba8'
 'commit working_copy change_id shortest prefix' = '#f38ba8'
 timestamp = '#a6adc8'

+ 1 - 1
zshrc

@@ -186,7 +186,7 @@ if builtin which fzf > /dev/null; then
 							label(if(empty, "empty"), description_placeholder)
 						)
 					)) ++ "\x00"' |
-				$(__fzfcmd) --read0 --ansi --raw --no-sort --reverse --highlight-line \
+				$(__fzfcmd) --read0 --ansi --no-sort --reverse --highlight-line \
 					--height ${FZF_TMUX_HEIGHT:-40%} --accept-nth 1 \
 					--preview='jj --ignore-working-copy --color=always show --stat {1}'
 		else