Fix default style so 'log --copies' has a start and an end.

mercurial/templates/map-cmdline.default

@@ -1,24 +1,24
 changeset = 'changeset:   {rev}:{node|short}\n{branches}{tags}{parents}user:        {author}\ndate:        {date|date}\nsummary:     {desc|firstline}\n\n'
 changeset_quiet = '{rev}:{node|short}\n'
 changeset_verbose = 'changeset:   {rev}:{node|short}\n{branches}{tags}{parents}user:        {author}\ndate:        {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n'
 changeset_debug = 'changeset:   {rev}:{node}\n{branches}{tags}{parents}{manifest}user:        {author}\ndate:        {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n'
 start_files = 'files:      '
 file = ' {file}'
 end_files = '\n'
 start_file_mods = 'files:      '
 file_mod = ' {file_mod}'
 end_file_mods = '\n'
 start_file_adds = 'files+:     '
 file_add = ' {file_add}'
 end_file_adds = '\n'
 start_file_dels = 'files-:     '
 file_del = ' {file_del}'
 end_file_dels = '\n'
-start_file_copies_switch = 'copies:     '
+start_file_copies = 'copies:     '
 file_copy = ' {name} ({source})'
-end_file_copies_switch = '\n'
+end_file_copies = '\n'
 parent = 'parent:      {rev}:{node|formatnode}\n'
 manifest = 'manifest:    {rev}:{node}\n'
 branch = 'branch:      {branch}\n'
 tag = 'tag:         {tag}\n'
 extra = 'extra:       {key}={value|stringescape}\n'

tests/test-log

@@ -1,131 +1,135
 #!/bin/sh
 
 hg init a
 
 cd a
 echo a > a
 hg ci -Ama -d '1 0'
 
 hg cp a b
 hg ci -mb -d '2 0'
 
 mkdir dir
 hg mv b dir
 hg ci -mc -d '3 0'
 
 hg mv a b
 echo a > d
 hg add d
 hg ci -md -d '4 0'
 
 hg mv dir/b e
 hg ci -me -d '5 0'
 
 hg log a
 echo % -f, directory
 hg log -f dir
 echo % -f, but no args
 hg log -f
 echo % one rename
 hg log -vf a
 echo % many renames
 hg log -vf e
 
 echo '% log copies with --copies'
 hg log -vC --template '{rev} {file_copies}\n'
 echo '% log copies switch without --copies, with old filecopy template'
 hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
 echo '% log copies switch with --copies'
 hg log -vC --template '{rev} {file_copies_switch}\n'
 
+echo '% log copies with hardcoded style and with --style=default'
+hg log -vC -r4
+hg log -vC -r4 --style=default
+
 echo % log copies, non-linear manifest
 hg up -C 3
 hg mv dir/b e
 echo foo > foo
 hg ci -Ame2 -d '6 0'
 hg log -v --template '{rev} {file_copies}\n' -r 5
 
 echo % log copies, execute bit set
 chmod +x e
 hg ci -me3 -d '7 0'
 hg log -v --template '{rev} {file_copies}\n' -r 6
 
 echo '% log -p d'
 hg log -pv d
 
 # log --follow tests
 hg init ../follow
 cd ../follow
 
 echo base > base
 hg ci -Ambase -d '1 0'
 
 echo r1 >> base
 hg ci -Amr1 -d '1 0'
 echo r2 >> base
 hg ci -Amr2 -d '1 0'
 
 hg up -C 1
 echo b1 > b1
 hg ci -Amb1 -d '1 0'
 
 echo % log -f
 hg log -f
 
 hg up -C 0
 echo b2 > b2
 hg ci -Amb2 -d '1 0'
 
 echo % log -f -r 1:tip
 hg log -f -r 1:tip
 
 hg up -C 3
 hg merge tip
 
 echo % log -r .  with two parents
 hg log -r .
 
 hg ci -mm12 -d '1 0'
 
 echo % log -r .  with one parent
 hg log -r .
 
 echo postm >> b1
 hg ci -Amb1.1 -d'1 0'
 
 echo % log --follow-first
 hg log --follow-first
 
 echo % log -P 2
 hg log -P 2
 
 echo '% log -r tip -p --git'
 hg log -r tip -p --git
 
 echo '% log -r ""'
 hg log -r ''
 
 echo '% log -r <some unknown node id>'
 hg log -r 1000000000000000000000000000000000000000
 
 echo '% log -k r1'
 hg log -k r1
 
 echo '% log -d -1'
 hg log -d -1
 
 cd ..
 
 hg init usertest
 cd usertest
 
 echo a > a
 hg ci -A -m "a" -u "User One <[e-mail]>"
 echo b > b
 hg ci -A -m "b" -u "User Two <[e-mail]>"
 
 hg log -u "User One <[e-mail]>"
 hg log -u "user1" -u "user2"
 hg log -u "user3"
 
 exit 0

tests/test-log.out

@@ -1,278 +1,299
 adding a
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     a
 
 % -f, directory
 abort: cannot follow nonexistent file: "dir"
 % -f, but no args
 changeset:   4:66c1345dc4f9
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 summary:     e
 
 changeset:   3:7c6c671bb7cc
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 summary:     d
 
 changeset:   2:41dd4284081e
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 summary:     c
 
 changeset:   1:784de7cef101
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     b
 
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     a
 
 % one rename
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files:       a
 description:
 a
 
 
 % many renames
 changeset:   4:66c1345dc4f9
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 files:       dir/b e
 description:
 e
 
 
 changeset:   2:41dd4284081e
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 files:       b dir/b
 description:
 c
 
 
 changeset:   1:784de7cef101
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
 files:       b
 description:
 b
 
 
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 files:       a
 description:
 a
 
 
 % log copies with --copies
 4 e (dir/b)
 3 b (a)
 2 dir/b (b)
 1 b (a)
 0 
 % log copies switch without --copies, with old filecopy template
 4 
 3 
 2 
 1 
 0 
 % log copies switch with --copies
 4 e (dir/b)
 3 b (a)
 2 dir/b (b)
 1 b (a)
 0 
+% log copies with hardcoded style and with --style=default
+changeset:   4:66c1345dc4f9
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:05 1970 +0000
+files:       dir/b e
+copies:      e (dir/b)
+description:
+e
+
+
+changeset:   4:66c1345dc4f9
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:05 1970 +0000
+files:       dir/b e
+copies:      e (dir/b)
+description:
+e
+
+
 % log copies, non-linear manifest
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding foo
 created new head
 5 e (dir/b)
 % log copies, execute bit set
 6 
 % log -p d
 changeset:   3:7c6c671bb7cc
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 files:       a b d
 description:
 d
 
 
 diff -r 41dd4284081e -r 7c6c671bb7cc d
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/d	Thu Jan 01 00:00:04 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 adding base
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b1
 created new head
 % log -f
 changeset:   3:e62f78d544b4
 tag:         tip
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
 changeset:   0:67e992f2c4f3
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     base
 
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding b2
 created new head
 % log -f -r 1:tip
 changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
 changeset:   2:60c670bf5b30
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r2
 
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % log -r . with two parents
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 % log -r . with one parent
 changeset:   5:302e9dd6890d
 tag:         tip
 parent:      3:e62f78d544b4
 parent:      4:ddb82e70d1a1
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     m12
 
 % log --follow-first
 changeset:   6:2404bbcab562
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1.1
 
 changeset:   5:302e9dd6890d
 parent:      3:e62f78d544b4
 parent:      4:ddb82e70d1a1
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     m12
 
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
 changeset:   0:67e992f2c4f3
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     base
 
 % log -P 2
 changeset:   6:2404bbcab562
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1.1
 
 changeset:   5:302e9dd6890d
 parent:      3:e62f78d544b4
 parent:      4:ddb82e70d1a1
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     m12
 
 changeset:   4:ddb82e70d1a1
 parent:      0:67e992f2c4f3
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b2
 
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 % log -r tip -p --git
 changeset:   6:2404bbcab562
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1.1
 
 diff --git a/b1 b/b1
 --- a/b1
 +++ b/b1
 @@ -1,1 +1,2 @@
  b1
 +postm
 
 % log -r ""
 abort: 00changelog.i@: ambiguous identifier!
 % log -r <some unknown node id>
 abort: unknown revision '1000000000000000000000000000000000000000'!
 % log -k r1
 changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
 % log -d -1
 adding a
 adding b
 changeset:   0:29a4c94f1924
 user:        User One <[e-mail]>
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a
 
 changeset:   1:e834b5e69c0e
 tag:         tip
 user:        User Two <[e-mail]>
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 
 changeset:   0:29a4c94f1924
 user:        User One <[e-mail]>
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     a