martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-11-11 02:30:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli: use committer timestamp instead of author timestamp in log output

Browse Source 
The author timestamp is rarely useful (in my experience). The
committer timestamp, on the other hand, can be useful for
understanding when a change was most recently modified. IIRC, I
originally picked the author timestamp to match the email (which is
the author's), but it's probably not confusing to use the author email
and the committer timestamp. I suspect few users will even reflect on
it.
This commit is contained in:
Martin von Zweigbergk 2022-12-14 14:33:00 -08:00 committed by Martin von Zweigbergk
parent bd31bfd2d7
commit b28ff2fbd9
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### New features ### New features
* The default log format now uses the committer timestamp instead of the author
timestamp.
### Fixed bugs ### Fixed bugs
* When sharing the working copy with a Git repo, we used to forget to export * When sharing the working copy with a Git repo, we used to forget to export

8
src/commands.rs
View File

@ -1471,16 +1471,16 @@ fn log_template(settings: &UserSettings) -> String {
// TODO: define a method on boolean values, so we can get auto-coloring // TODO: define a method on boolean values, so we can get auto-coloring
// with e.g. `conflict.then("conflict")` // with e.g. `conflict.then("conflict")`
let author_timestamp = if settings.relative_timestamps() { let committer_timestamp = if settings.relative_timestamps() {
"author.timestamp().ago()" "committer.timestamp().ago()"
} else { } else {
"author.timestamp()" "committer.timestamp()"
}; };
let default_template = format!( let default_template = format!(
r#" r#"
change_id.short() change_id.short()
" " author.email() " " author.email()
" " label("timestamp", {author_timestamp}) " " label("timestamp", {committer_timestamp})
if(branches, " " branches) if(branches, " " branches)
if(tags, " " tags) if(tags, " " tags)
if(working_copies, " " working_copies) if(working_copies, " " working_copies)

32
tests/test_obslog_command.rs
View File

@ -34,11 +34,11 @@ fn test_obslog_with_or_without_diff() {
let stdout = get_log_output(&test_env, &repo_path, &["obslog"]); let stdout = get_log_output(&test_env, &repo_path, &["obslog"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
@ test.user@example.com 2001-02-03 04:05:08.000 +07:00 1daafc17fefb @ test.user@example.com 2001-02-03 04:05:10.000 +07:00 1daafc17fefb
| my description | my description
o test.user@example.com 2001-02-03 04:05:08.000 +07:00 813918f7b4e6 conflict o test.user@example.com 2001-02-03 04:05:09.000 +07:00 813918f7b4e6 conflict
| my description | my description
o test.user@example.com 2001-02-03 04:05:08.000 +07:00 8f02f5470c55 o test.user@example.com 2001-02-03 04:05:09.000 +07:00 8f02f5470c55
| my description | my description
o test.user@example.com 2001-02-03 04:05:08.000 +07:00 c8ceb219336b o test.user@example.com 2001-02-03 04:05:08.000 +07:00 c8ceb219336b
my description my description
@ -48,16 +48,16 @@ fn test_obslog_with_or_without_diff() {
// (even even though it resulted in a conflict). // (even even though it resulted in a conflict).
let stdout = get_log_output(&test_env, &repo_path, &["obslog", "-p"]); let stdout = get_log_output(&test_env, &repo_path, &["obslog", "-p"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
@ test.user@example.com 2001-02-03 04:05:08.000 +07:00 1daafc17fefb @ test.user@example.com 2001-02-03 04:05:10.000 +07:00 1daafc17fefb
| my description | my description
| Resolved conflict in file1: | Resolved conflict in file1:
| 1 1: <<<<<<<resolved | 1 1: <<<<<<<resolved
| 2 : %%%%%%% | 2 : %%%%%%%
| 3 : +bar | 3 : +bar
| 4 : >>>>>>> | 4 : >>>>>>>
o test.user@example.com 2001-02-03 04:05:08.000 +07:00 813918f7b4e6 conflict o test.user@example.com 2001-02-03 04:05:09.000 +07:00 813918f7b4e6 conflict
| my description | my description
o test.user@example.com 2001-02-03 04:05:08.000 +07:00 8f02f5470c55 o test.user@example.com 2001-02-03 04:05:09.000 +07:00 8f02f5470c55
| my description | my description
| Modified regular file file1: | Modified regular file file1:
| 1 1: foo | 1 1: foo
@ -71,11 +71,11 @@ fn test_obslog_with_or_without_diff() {
// Test `--no-graph` // Test `--no-graph`
let stdout = get_log_output(&test_env, &repo_path, &["obslog", "--no-graph"]); let stdout = get_log_output(&test_env, &repo_path, &["obslog", "--no-graph"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
test.user@example.com 2001-02-03 04:05:08.000 +07:00 1daafc17fefb test.user@example.com 2001-02-03 04:05:10.000 +07:00 1daafc17fefb
my description my description
test.user@example.com 2001-02-03 04:05:08.000 +07:00 813918f7b4e6 conflict test.user@example.com 2001-02-03 04:05:09.000 +07:00 813918f7b4e6 conflict
my description my description
test.user@example.com 2001-02-03 04:05:08.000 +07:00 8f02f5470c55 test.user@example.com 2001-02-03 04:05:09.000 +07:00 8f02f5470c55
my description my description
test.user@example.com 2001-02-03 04:05:08.000 +07:00 c8ceb219336b test.user@example.com 2001-02-03 04:05:08.000 +07:00 c8ceb219336b
my description my description
@ -84,7 +84,7 @@ fn test_obslog_with_or_without_diff() {
// Test `--git` format, and that it implies `-p` // Test `--git` format, and that it implies `-p`
let stdout = get_log_output(&test_env, &repo_path, &["obslog", "--no-graph", "--git"]); let stdout = get_log_output(&test_env, &repo_path, &["obslog", "--no-graph", "--git"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
test.user@example.com 2001-02-03 04:05:08.000 +07:00 1daafc17fefb test.user@example.com 2001-02-03 04:05:10.000 +07:00 1daafc17fefb
my description my description
diff --git a/file1 b/file1 diff --git a/file1 b/file1
index e155302a24...2ab19ae607 100644 index e155302a24...2ab19ae607 100644
@ -96,9 +96,9 @@ fn test_obslog_with_or_without_diff() {
-+bar -+bar
->>>>>>> ->>>>>>>
+resolved +resolved
test.user@example.com 2001-02-03 04:05:08.000 +07:00 813918f7b4e6 conflict test.user@example.com 2001-02-03 04:05:09.000 +07:00 813918f7b4e6 conflict
my description my description
test.user@example.com 2001-02-03 04:05:08.000 +07:00 8f02f5470c55 test.user@example.com 2001-02-03 04:05:09.000 +07:00 8f02f5470c55
my description my description
diff --git a/file1 b/file1 diff --git a/file1 b/file1
index 257cc5642c...3bd1f0e297 100644 index 257cc5642c...3bd1f0e297 100644
@ -136,20 +136,20 @@ fn test_obslog_squash() {
let stdout = get_log_output(&test_env, &repo_path, &["obslog", "-p", "-r", "@-"]); let stdout = get_log_output(&test_env, &repo_path, &["obslog", "-p", "-r", "@-"]);
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
o test.user@example.com 2001-02-03 04:05:07.000 +07:00 9b6d4a272a6a o test.user@example.com 2001-02-03 04:05:10.000 +07:00 9b6d4a272a6a
|\ squashed |\ squashed
| | Modified regular file file1: | | Modified regular file file1:
| | 1 1: foo | | 1 1: foo
| | 2: bar | | 2: bar
o | test.user@example.com 2001-02-03 04:05:07.000 +07:00 803a7299cb1a o | test.user@example.com 2001-02-03 04:05:09.000 +07:00 803a7299cb1a
| | first | | first
| | Added regular file file1: | | Added regular file file1:
| | 1: foo | | 1: foo
o | test.user@example.com 2001-02-03 04:05:07.000 +07:00 85a1e2839620 o | test.user@example.com 2001-02-03 04:05:08.000 +07:00 85a1e2839620
| | first | | first
o | test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059e1b0 o | test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059e1b0
/ (no description set) / (no description set)
o test.user@example.com 2001-02-03 04:05:09.000 +07:00 69231a40d60d o test.user@example.com 2001-02-03 04:05:10.000 +07:00 69231a40d60d
| second | second
| Modified regular file file1: | Modified regular file file1:
| 1 1: foo | 1 1: foo