Remove dummy branch hack from tests

tests/test-diffdir

@@ -1,21 +1,20 b''
 #!/bin/sh
 
 hg init
-hg branch dummy # needed so -r "" doesn't point to the unnamed/default branch
 touch a
 hg add a
 hg ci -m "a" -d "1000000 0"
 
 echo 123 > b
 hg add b
 hg diff --nodates
 
 hg diff --nodates -r tip
 
 echo foo > a
 hg diff --nodates
 
 hg diff -r ""
 hg diff -r tip -r ""
 
 true

tests/test-diffdir.out

@@ -1,22 +1,22 b''
-diff -r 4da5fa99f904 b
+diff -r acd8075edac9 b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +123
-diff -r 4da5fa99f904 b
+diff -r acd8075edac9 b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +123
-diff -r 4da5fa99f904 a
+diff -r acd8075edac9 a
 --- a/a
 +++ b/a
 @@ -0,0 +1,1 @@
 +foo
-diff -r 4da5fa99f904 b
+diff -r acd8075edac9 b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +123
 abort: Ambiguous identifier!
 abort: Ambiguous identifier!

tests/test-log

@@ -1,89 +1,88 b''
 #!/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
 hg log -vC --template '{rev} {file_copies%filecopy}\n'
 
 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 -vC --template '{rev} {file_copies%filecopy}\n' -r 5
 
 echo '% log -p d'
 hg log -pv d
 
 # log --follow tests
 hg init ../follow
 cd ../follow
-hg branch dummy # needed so -r "" doesn't point to the unnamed/default branch
 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
 hg ci -mm12 -d '1 0'
 
 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 ""'
 hg log -r ''
 
 exit 0

tests/test-log.out

@@ -1,219 +1,204 b''
 adding a
 changeset:   0:8580ff50825a
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     a
 
 % -f, directory
 abort: can only follow copies/renames for explicit file names
 % -f, but no args
 changeset:   4:b30c444c7c84
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 summary:     e
 
 changeset:   3:16b60bf3f99a
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 summary:     d
 
 changeset:   2:21fba396af4c
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 summary:     c
 
 changeset:   1:c0296dabce9b
 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:b30c444c7c84
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:05 1970 +0000
 files:       dir/b e
 description:
 e
 
 
 changeset:   2:21fba396af4c
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
 files:       b dir/b
 description:
 c
 
 
 changeset:   1:c0296dabce9b
 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
 4 e (dir/b)
 3 b (a)
 2 dir/b (b)
 1 b (a)
 0 
 % log copies, non-linear manifest
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding foo
 5 e (dir/b)
 % log -p d
 changeset:   3:16b60bf3f99a
 user:        test
 date:        Thu Jan 01 00:00:04 1970 +0000
 files:       a b d
 description:
 d
 
 
 diff -r 21fba396af4c -r 16b60bf3f99a 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
 % log -f
-changeset:   3:07a62f044f0d
-branch:      dummy
+changeset:   3:e62f78d544b4
 tag:         tip
-parent:      1:fb3d4e35b279
+parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
-changeset:   1:fb3d4e35b279
-branch:      dummy
+changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
-changeset:   0:ea445bfed6b9
-branch:      dummy
+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
 % log -f -r 1:tip
-changeset:   1:fb3d4e35b279
-branch:      dummy
+changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
-changeset:   2:e8882cbc828c
-branch:      dummy
+changeset:   2:60c670bf5b30
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r2
 
-changeset:   3:07a62f044f0d
-branch:      dummy
-parent:      1:fb3d4e35b279
+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 --follow-first
-changeset:   6:0f621dafa603
-branch:      dummy
+changeset:   6:2404bbcab562
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1.1
 
-changeset:   5:0cf53fb6dfd5
-branch:      dummy
-parent:      3:07a62f044f0d
-parent:      4:b76598590bc3
+changeset:   5:302e9dd6890d
+parent:      3:e62f78d544b4
+parent:      4:ddb82e70d1a1
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     m12
 
-changeset:   3:07a62f044f0d
-branch:      dummy
-parent:      1:fb3d4e35b279
+changeset:   3:e62f78d544b4
+parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
-changeset:   1:fb3d4e35b279
-branch:      dummy
+changeset:   1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     r1
 
-changeset:   0:ea445bfed6b9
-branch:      dummy
+changeset:   0:67e992f2c4f3
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     base
 
 % log -P 2
-changeset:   6:0f621dafa603
-branch:      dummy
+changeset:   6:2404bbcab562
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1.1
 
-changeset:   5:0cf53fb6dfd5
-branch:      dummy
-parent:      3:07a62f044f0d
-parent:      4:b76598590bc3
+changeset:   5:302e9dd6890d
+parent:      3:e62f78d544b4
+parent:      4:ddb82e70d1a1
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     m12
 
-changeset:   4:b76598590bc3
-branch:      dummy
-parent:      0:ea445bfed6b9
+changeset:   4:ddb82e70d1a1
+parent:      0:67e992f2c4f3
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b2
 
-changeset:   3:07a62f044f0d
-branch:      dummy
-parent:      1:fb3d4e35b279
+changeset:   3:e62f78d544b4
+parent:      1:3d5bf5654eda
 user:        test
 date:        Thu Jan 01 00:00:01 1970 +0000
 summary:     b1
 
 % log -r ""
 abort: Ambiguous identifier!