mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-28 15:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

cmd jj log: Move divergent label next to the change id

Browse source 
The divergent label is most relevant when the user is about to
refer to a commit by its change id.

It's also good to put it far from the `conflicts` label, to
reduce confusion between very different concepts that have
similar names.

Finally, I think it is a feature rather than a bug that the
`divergent` label now upsets the alignment of different lines
of `jj log`.
This commit is contained in:
Ilya Grigoriev 2022-12-22 17:09:06 -08:00
parent d99e85269f
commit 5a681d31d0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commands.rs
View file

@ -1493,13 +1493,13 @@ fn log_template(settings: &UserSettings) -> String {
let default_template = format!(
r#"
change_id.short()
if(divergent, label("divergent", " divergent"))
" " author.email()
" " label("timestamp", {committer_timestamp})
if(branches, " " branches)
if(tags, " " tags)
if(working_copies, " " working_copies)
if(is_git_head, label("git_head", " HEAD@git"))
if(divergent, label("divergent", " divergent"))
" " commit_id.short()
if(conflict, label("conflict", " conflict"))
"\n"