Mercurial > hg
changeset 6127:25c372e8f261
Simplify the output of test-bheads
Also remove unneeded -d and -u commit options.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 15 Feb 2008 23:38:18 -0200 |
| parents | 11a09d5779f4 |
| children | b3286a92f4bc |
| files | tests/test-bheads tests/test-bheads.out |
| diffstat | 2 files changed, 119 insertions(+), 571 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bheads Fri Feb 15 21:34:33 2008 +0100 +++ b/tests/test-bheads Fri Feb 15 23:38:18 2008 -0200 @@ -1,108 +1,113 @@ #!/bin/sh +heads() +{ + hg heads --template '#rev#: #desc|firstline|strip#\n' "$@" +} + hg init a cd a echo 'root' >root hg add root -hg commit -d '0 0' -u test -m "Adding root node" -hg heads +hg commit -m "Adding root node" +heads echo '-------' -hg heads . +heads . echo '=======' echo 'a' >a hg add a hg branch a -hg commit -d '1 0' -u test -m "Adding a branch" -hg heads +hg commit -m "Adding a branch" +heads echo '-------' -hg heads . +heads . echo '=======' hg update -C 0 echo 'b' >b hg add b hg branch b -hg commit -d '2 0' -u test -m "Adding b branch" -hg heads +hg commit -m "Adding b branch" +heads echo '-------' -hg heads . +heads . echo '=======' echo 'bh1' >bh1 hg add bh1 -hg commit -d '3 0' -u test -m "Adding b branch head 1" -hg heads +hg commit -m "Adding b branch head 1" +heads echo '-------' -hg heads . +heads . echo '=======' hg update -C 2 echo 'bh2' >bh2 hg add bh2 -hg commit -d '4 0' -u test -m "Adding b branch head 2" -hg heads +hg commit -m "Adding b branch head 2" +heads echo '-------' -hg heads . +heads . echo '=======' hg update -C 2 echo 'bh3' >bh3 hg add bh3 -hg commit -d '5 0' -u test -m "Adding b branch head 3" -hg heads +hg commit -m "Adding b branch head 3" +heads echo '-------' -hg heads . +heads . echo '=======' hg merge 4 -hg commit -d '6 0' -u test -m "Merging b branch head 2 and b branch head 3" -hg heads +hg commit -m "Merging b branch head 2 and b branch head 3" +heads echo '-------' -hg heads . +heads . echo '=======' echo 'c' >c hg add c hg branch c -hg commit -d '7 0' -u test -m "Adding c branch" -hg heads +hg commit -m "Adding c branch" +heads echo '-------' -hg heads . +heads . echo '=======' -hg heads -r 3 . +heads -r 3 . echo $? echo '-------' -hg heads -r 2 . +heads -r 2 . echo $? echo '-------' hg update -C 4 echo $? echo '-------' -hg heads -r 3 . +heads -r 3 . echo $? echo '-------' -hg heads -r 2 . +heads -r 2 . echo $? echo '-------' -hg heads -r 7 . +heads -r 7 . echo $? echo '=======' for i in 0 1 2 3 4 5 6 7; do hg update -C "$i" - hg heads + heads echo '-------' - hg heads . + heads . echo '-------' done echo '=======' for i in a b c z; do - hg heads "$i" + heads "$i" echo '-------' done echo '=======' -hg heads 0 1 2 3 4 5 6 7 +heads 0 1 2 3 4 5 6 7
--- a/tests/test-bheads.out Fri Feb 15 21:34:33 2008 +0100 +++ b/tests/test-bheads.out Fri Feb 15 23:38:18 2008 -0200 @@ -1,608 +1,151 @@ -changeset: 0:19709c5a4e75 -tag: tip -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Adding root node - +0: Adding root node ------- -changeset: 0:19709c5a4e75 -tag: tip -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Adding root node - +0: Adding root node ======= marked working directory as branch a -changeset: 1:dd6b440dd85a -branch: a -tag: tip -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +1: Adding a branch ------- -changeset: 1:dd6b440dd85a -branch: a -tag: tip -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +1: Adding a branch ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch b -changeset: 2:ac22033332d1 -branch: b -tag: tip -parent: 0:19709c5a4e75 -user: test -date: Thu Jan 01 00:00:02 1970 +0000 -summary: Adding b branch - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +2: Adding b branch +1: Adding a branch ------- -changeset: 2:ac22033332d1 -branch: b -tag: tip -parent: 0:19709c5a4e75 -user: test -date: Thu Jan 01 00:00:02 1970 +0000 -summary: Adding b branch - +2: Adding b branch ======= -changeset: 3:aee39cd168d0 -branch: b -tag: tip -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 3:aee39cd168d0 -branch: b -tag: tip -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +3: Adding b branch head 1 ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved -changeset: 4:22df7444f7c1 -branch: b -tag: tip -parent: 2:ac22033332d1 -user: test -date: Thu Jan 01 00:00:04 1970 +0000 -summary: Adding b branch head 2 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +4: Adding b branch head 2 +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 4:22df7444f7c1 -branch: b -tag: tip -parent: 2:ac22033332d1 -user: test -date: Thu Jan 01 00:00:04 1970 +0000 -summary: Adding b branch head 2 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +4: Adding b branch head 2 +3: Adding b branch head 1 ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved -changeset: 5:0d57af4f9583 -branch: b -tag: tip -parent: 2:ac22033332d1 -user: test -date: Thu Jan 01 00:00:05 1970 +0000 -summary: Adding b branch head 3 - -changeset: 4:22df7444f7c1 -branch: b -parent: 2:ac22033332d1 -user: test -date: Thu Jan 01 00:00:04 1970 +0000 -summary: Adding b branch head 2 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +5: Adding b branch head 3 +4: Adding b branch head 2 +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 5:0d57af4f9583 -branch: b -tag: tip -parent: 2:ac22033332d1 -user: test -date: Thu Jan 01 00:00:05 1970 +0000 -summary: Adding b branch head 3 - -changeset: 4:22df7444f7c1 -branch: b -parent: 2:ac22033332d1 -user: test -date: Thu Jan 01 00:00:04 1970 +0000 -summary: Adding b branch head 2 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +5: Adding b branch head 3 +4: Adding b branch head 2 +3: Adding b branch head 1 ======= 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -changeset: 6:00432327d822 -branch: b -tag: tip -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 6:00432327d822 -branch: b -tag: tip -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 ======= marked working directory as branch c -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - +7: Adding c branch ======= no changes on branch c containing . are reachable from 3 1 ------- -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - +7: Adding c branch 0 ------- 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 ------- -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +3: Adding b branch head 1 0 ------- -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 6:00432327d822 -branch: b -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - +3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 0 ------- no changes on branch b containing . are reachable from 7 1 ======= 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 0:19709c5a4e75 -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Adding root node - +0: Adding root node ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +1: Adding a branch ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 6:00432327d822 -branch: b -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 6:00432327d822 -branch: b -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 6:00432327d822 -branch: b -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 6:00432327d822 -branch: b -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 6:00432327d822 -branch: b -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +7: Adding c branch +3: Adding b branch head 1 +1: Adding a branch ------- -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - +7: Adding c branch ------- ======= -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - +1: Adding a branch ------- -changeset: 6:00432327d822 -branch: b -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 ------- -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - +7: Adding c branch ------- abort: unknown revision 'z'! ------- ======= -changeset: 0:19709c5a4e75 -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Adding root node - -changeset: 1:dd6b440dd85a -branch: a -user: test -date: Thu Jan 01 00:00:01 1970 +0000 -summary: Adding a branch - -changeset: 6:00432327d822 -branch: b -parent: 5:0d57af4f9583 -parent: 4:22df7444f7c1 -user: test -date: Thu Jan 01 00:00:06 1970 +0000 -summary: Merging b branch head 2 and b branch head 3 - -changeset: 3:aee39cd168d0 -branch: b -user: test -date: Thu Jan 01 00:00:03 1970 +0000 -summary: Adding b branch head 1 - -changeset: 7:9fb091bb9835 -branch: c -tag: tip -user: test -date: Thu Jan 01 00:00:07 1970 +0000 -summary: Adding c branch - +0: Adding root node +1: Adding a branch +6: Merging b branch head 2 and b branch head 3 +3: Adding b branch head 1 +7: Adding c branch