Mercurial > public > mercurial-scm > hg

diff tests/test-tag.t @ 12156:4c94b6d0fb1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.
author Martin Geisler <mg@lazybytes.net>
date Thu, 02 Sep 2010 23:22:51 +0200
parents b3de1438028d
children 4134686b83e1
line wrap: on
line diff
--- a/tests/test-tag.t	Thu Sep 02 22:17:22 2010 +0200
+++ b/tests/test-tag.t	Thu Sep 02 23:22:51 2010 +0200
@@ -3,87 +3,87 @@
 
   $ echo a > a
   $ hg add a
-  $ hg commit -m "test" -d "1000000 0"
+  $ hg commit -m "test"
   $ hg history
-  changeset:   0:0acdaf898367
+  changeset:   0:acb14030fe0a
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
   $ hg tag ' '
   abort: tag names cannot consist entirely of whitespace
 
-  $ hg tag -d "1000000 0" "bleah"
+  $ hg tag "bleah"
   $ hg history
-  changeset:   1:3ecf002a1c57
+  changeset:   1:d4f0d2909abc
   tag:         tip
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag bleah for changeset 0acdaf898367
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag bleah for changeset acb14030fe0a
   
-  changeset:   0:0acdaf898367
+  changeset:   0:acb14030fe0a
   tag:         bleah
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
 
   $ echo foo >> .hgtags
-  $ hg tag -d "1000000 0" "bleah2" || echo "failed"
+  $ hg tag "bleah2" || echo "failed"
   abort: working copy of .hgtags is changed (please commit .hgtags manually)
   failed
 
   $ hg revert .hgtags
-  $ hg tag -d "1000000 0" -r 0 x y z y y z || echo "failed"
+  $ hg tag -r 0 x y z y y z || echo "failed"
   abort: tag names must be unique
   failed
-  $ hg tag -d "1000000 0" tap nada dot tip null . || echo "failed"
+  $ hg tag tap nada dot tip null . || echo "failed"
   abort: the name 'tip' is reserved
   failed
-  $ hg tag -d "1000000 0" "bleah" || echo "failed"
+  $ hg tag "bleah" || echo "failed"
   abort: tag 'bleah' already exists (use -f to force)
   failed
-  $ hg tag -d "1000000 0" "blecch" "bleah" || echo "failed"
+  $ hg tag "blecch" "bleah" || echo "failed"
   abort: tag 'bleah' already exists (use -f to force)
   failed
 
-  $ hg tag -d "1000000 0" --remove "blecch" || echo "failed"
+  $ hg tag --remove "blecch" || echo "failed"
   abort: tag 'blecch' does not exist
   failed
-  $ hg tag -d "1000000 0" --remove "bleah" "blecch" "blough" || echo "failed"
+  $ hg tag --remove "bleah" "blecch" "blough" || echo "failed"
   abort: tag 'blecch' does not exist
   failed
 
-  $ hg tag -d "1000000 0" -r 0 "bleah0"
-  $ hg tag -l -d "1000000 0" -r 1 "bleah1"
-  $ hg tag -d "1000000 0" gack gawk gorp
-  $ hg tag -d "1000000 0" -f gack
-  $ hg tag -d "1000000 0" --remove gack gorp
+  $ hg tag -r 0 "bleah0"
+  $ hg tag -l -r 1 "bleah1"
+  $ hg tag gack gawk gorp
+  $ hg tag -f gack
+  $ hg tag --remove gack gorp
 
   $ cat .hgtags
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gack
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gawk
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gorp
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gack
-  3807bcf62c5614cb6c16436b514d7764ca5f1631 gack
-  3807bcf62c5614cb6c16436b514d7764ca5f1631 gack
+  acb14030fe0a21b60322c440ad2d20cf7685a376 bleah
+  acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0
+  336fccc858a4eb69609a291105009e484a6b6b8d gack
+  336fccc858a4eb69609a291105009e484a6b6b8d gawk
+  336fccc858a4eb69609a291105009e484a6b6b8d gorp
+  336fccc858a4eb69609a291105009e484a6b6b8d gack
+  799667b6f2d9b957f73fa644a918c2df22bab58f gack
+  799667b6f2d9b957f73fa644a918c2df22bab58f gack
   0000000000000000000000000000000000000000 gack
-  868cc8fbb43b754ad09fa109885d243fc49adae7 gorp
+  336fccc858a4eb69609a291105009e484a6b6b8d gorp
   0000000000000000000000000000000000000000 gorp
   $ cat .hg/localtags
-  3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
+  d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
 
   $ hg update 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg tag -d "1000000 0" "foobar"
+  $ hg tag "foobar"
   $ cat .hgtags
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
+  acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
   $ cat .hg/localtags
-  3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
+  d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
 
   $ hg tag -l 'xx
   > newline'
@@ -95,49 +95,49 @@
 
   $ cd ..
   $ hg -R test log -r0:5
-  changeset:   0:0acdaf898367
+  changeset:   0:acb14030fe0a
   tag:         bleah
   tag:         bleah0
   tag:         foobar
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
-  changeset:   1:3ecf002a1c57
+  changeset:   1:d4f0d2909abc
   tag:         bleah1
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag bleah for changeset 0acdaf898367
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag bleah for changeset acb14030fe0a
   
-  changeset:   2:868cc8fbb43b
+  changeset:   2:336fccc858a4
   tag:         gawk
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag bleah0 for changeset 0acdaf898367
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag bleah0 for changeset acb14030fe0a
   
-  changeset:   3:3807bcf62c56
+  changeset:   3:799667b6f2d9
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag gack, gawk, gorp for changeset 868cc8fbb43b
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag gack, gawk, gorp for changeset 336fccc858a4
   
-  changeset:   4:140c6e8597b4
+  changeset:   4:154eeb7c0138
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
-  summary:     Added tag gack for changeset 3807bcf62c56
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     Added tag gack for changeset 799667b6f2d9
   
-  changeset:   5:470a65fa7cc9
+  changeset:   5:b4bb47aaff09
   user:        test
-  date:        Mon Jan 12 13:46:40 1970 +0000
+  date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Removed tag gack, gorp
   
   $ hg clone -q -rbleah1 test test1
   $ hg -R test1 parents --style=compact
-  1[tip]   3ecf002a1c57   1970-01-12 13:46 +0000   test
-    Added tag bleah for changeset 0acdaf898367
+  1[tip]   d4f0d2909abc   1970-01-01 00:00 +0000   test
+    Added tag bleah for changeset acb14030fe0a
   
   $ hg clone -q -r5 test#bleah1 test2
   $ hg -R test2 parents --style=compact
-  5[tip]   470a65fa7cc9   1970-01-12 13:46 +0000   test
+  5[tip]   b4bb47aaff09   1970-01-01 00:00 +0000   test
     Removed tag gack, gorp
   
   $ hg clone -q -U test#bleah1 test3
@@ -152,24 +152,24 @@
   > f = file('.hg/localtags', 'w'); f.write(last); f.close()
   > EOF
   $ cat .hg/localtags; echo
-  3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
+  d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
   $ hg tag -l localnewline
   $ cat .hg/localtags; echo
-  3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
-  f68b039e72eacbb2e68b0543e1f6e50990aa2bb5 localnewline
+  d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
+  c2899151f4e76890c602a2597a650a72666681bf localnewline
   
 
   $ python << EOF
   > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close()
   > f = file('.hgtags', 'w'); f.write(last); f.close()
   > EOF
-  $ hg ci -d '1000000 0' -m'broken manual edit of .hgtags'
+  $ hg ci -m'broken manual edit of .hgtags'
   $ cat .hgtags; echo
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
-  $ hg tag -d '1000000 0' newline
+  acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
+  $ hg tag newline
   $ cat .hgtags; echo
-  0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
-  6ae703d793c8b1f097116869275ecd97b2977a2b newline
+  acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
+  a0eea09de1eeec777b46f2085260a373b2fbc293 newline
   
 
 tag and branch using same name