diff tests/test-tags.out @ 9143:a604c98dbf62

test-tags: clarify test output; simplify test script a bit (issue548).

- use simpler way ('hg id') to get current changeset id
- add 'echo' statements to guide the eye when reading output
- add some more output to clarify the state of .hgtags
- drop '-d' option from every commit/tag, since run-tests.py
  does this (although with a different timestamp, so changeset
  ids differ)

--- a/tests/test-tags.out	Wed Jul 15 17:44:47 2009 +0200
+++ b/tests/test-tags.out	Thu Jul 16 10:39:41 2009 -0400
@@ -1,78 +1,108 @@
+% setup
 000000000000 tip
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0acdaf898367 tip
-tip                                0:0acdaf898367
-This is a local tag with a really long name!     0:0acdaf898367
-0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first
-tip                                1:8a3ca90d111d
-first                              0:0acdaf898367
-8a3ca90d111d tip
+acb14030fe0a tip
+% create local tag with long name
+tip                                0:acb14030fe0a
+This is a local tag with a really long name!     0:acb14030fe0a
+% create a tag behind hg's back
+acb14030fe0a21b60322c440ad2d20cf7685a376 first
+tip                                1:b9154636be93
+first                              0:acb14030fe0a
+b9154636be93 tip
+% create a branch
 M a
-8a3ca90d111d+ tip
+b9154636be93+ tip
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-0acdaf898367+ first
-0acdaf898367+ first
+acb14030fe0a+ first
+acb14030fe0a+ first
 M a
 created new head
-8216907a933d tip
+c8edf04160c7 tip
+% merge the two heads
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-8216907a933d+8a3ca90d111d+ tip
+c8edf04160c7+b9154636be93+ tip
 M .hgtags
-tip                                6:e2174d339386
-first                              0:0acdaf898367
+% create fake head, make sure tag not visible afterwards
+tip                                6:35ff301afafe
+first                              0:acb14030fe0a
+% add invalid tags
+committing .hgtags:
+acb14030fe0a21b60322c440ad2d20cf7685a376 first
+spam
+
+foo bar
+% report tag parse error on other head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
-.hgtags@c071f74ab5eb, line 2: cannot parse entry
-.hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
-.hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
-tip                                8:4ca6f1b1a68c
-first                              0:0acdaf898367
-changeset:   8:4ca6f1b1a68c
-.hgtags@c071f74ab5eb, line 2: cannot parse entry
-.hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
-.hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
+.hgtags@75d9f02dfe28, line 2: cannot parse entry
+.hgtags@75d9f02dfe28, line 4: node 'foo' is not well formed
+.hgtags@c4be69a18c11, line 2: node 'x' is not well formed
+tip                                8:c4be69a18c11
+first                              0:acb14030fe0a
+changeset:   8:c4be69a18c11
+.hgtags@75d9f02dfe28, line 2: cannot parse entry
+.hgtags@75d9f02dfe28, line 4: node 'foo' is not well formed
+.hgtags@c4be69a18c11, line 2: node 'x' is not well formed
 tag:         tip
-parent:      3:b2ef3841386b
+parent:      3:ac5e980c4dc0
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     head
 
+% test tag precedence rules
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
-tip                                4:36195b728445
-bar                                1:b204a97e6e8d
-changeset:   5:1f98c77278de
+tip                                4:0c192d7d5e6b
+bar                                1:78391a272241
+% test tag removal
+changeset:   5:5f6e8655b1c7
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     Removed tag bar
+date:        Thu Jan 01 00:00:00 1970 +0000
+files:       .hgtags
+description:
+Removed tag bar
+
 
-tip                                5:1f98c77278de
+diff -r 0c192d7d5e6b -r 5f6e8655b1c7 .hgtags
+--- a/.hgtags	Thu Jan 01 00:00:00 1970 +0000
++++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,1 +1,3 @@
+ bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar
++78391a272241d70354aa14c874552cad6b51bb42 bar
++0000000000000000000000000000000000000000 bar
+
+tip                                5:5f6e8655b1c7
 % remove nonexistent tag
 abort: tag 'foobar' does not exist
-changeset:   5:1f98c77278de
+changeset:   5:5f6e8655b1c7
 tag:         tip
 user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
+date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     Removed tag bar
 
-tip                                5:e86d7ed95fd3
-bar                                0:b409d9da318e
+% test tag rank
+tip                                5:85f05169d91d
+bar                                0:bbd179dfa0a7
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
-tip                                6:b744fbe1f6dd
-bar                                0:b409d9da318e
+tip                                6:735c3ca72986
+bar                                0:bbd179dfa0a7
+% don't allow moving tag without -f
 abort: tag 'bar' already exists (use -f to force)
-tip                                6:b744fbe1f6dd
-bar                                0:b409d9da318e
+tip                                6:735c3ca72986
+bar                                0:bbd179dfa0a7
+% test tag rank with 3 heads
 adding foo
 tip                                3:197c21bbbf2c
 bar                                2:6fa450212aeb
 % bar should still point to rev 2
 tip                                4:3b4b14ed0202
 bar                                2:6fa450212aeb
+% remove local as global and global as local
 adding foo
 abort: tag 'localtag' is not a global tag
 abort: tag 'globaltag' is not a local tag