##// END OF EJS Templates
branch: move note about permanence to the top, add 'global'
branch: move note about permanence to the top, add 'global'

File last commit:

r15519:bb9ad375 default
r15610:09b20039 stable
Show More
test-tag.t
298 lines | 7.7 KiB | text/troff | Tads3Lexer
Nicolas Dumazet
tests: unify test-tag
r11788 $ hg init test
$ cd test
$ echo a > a
$ hg add a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "test"
Nicolas Dumazet
tests: unify test-tag
r11788 $ hg history
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:acb14030fe0a
Nicolas Dumazet
tests: unify test-tag
r11788 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-tag
r11788 summary: test
$ hg tag ' '
abort: tag names cannot consist entirely of whitespace
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Nicolas Dumazet
tests: unify test-tag
r11788
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg tag "bleah"
Nicolas Dumazet
tests: unify test-tag
r11788 $ hg history
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:d4f0d2909abc
Nicolas Dumazet
tests: unify test-tag
r11788 tag: tip
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
summary: Added tag bleah for changeset acb14030fe0a
Nicolas Dumazet
tests: unify test-tag
r11788
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:acb14030fe0a
Nicolas Dumazet
tests: unify test-tag
r11788 tag: bleah
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-tag
r11788 summary: test
$ echo foo >> .hgtags
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg tag "bleah2"
Nicolas Dumazet
tests: unify test-tag
r11788 abort: working copy of .hgtags is changed (please commit .hgtags manually)
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
Nicolas Dumazet
tests: unify test-tag
r11788
$ hg revert .hgtags
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg tag -r 0 x y z y y z
Nicolas Dumazet
tests: unify test-tag
r11788 abort: tag names must be unique
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
$ hg tag tap nada dot tip null .
Nicolas Dumazet
tests: unify test-tag
r11788 abort: the name 'tip' is reserved
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
$ hg tag "bleah"
Nicolas Dumazet
tests: unify test-tag
r11788 abort: tag 'bleah' already exists (use -f to force)
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
$ hg tag "blecch" "bleah"
Nicolas Dumazet
tests: unify test-tag
r11788 abort: tag 'bleah' already exists (use -f to force)
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
Nicolas Dumazet
tests: unify test-tag
r11788
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg tag --remove "blecch"
Nicolas Dumazet
tests: unify test-tag
r11788 abort: tag 'blecch' does not exist
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
$ hg tag --remove "bleah" "blecch" "blough"
Nicolas Dumazet
tests: unify test-tag
r11788 abort: tag 'blecch' does not exist
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
Nicolas Dumazet
tests: unify test-tag
r11788
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ 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
Nicolas Dumazet
tests: unify test-tag
r11788
Afuna
tag: add tests for tags with whitespace (issue2174)
r13399 $ hg tag "bleah "
abort: tag 'bleah' already exists (use -f to force)
[255]
$ hg tag " bleah"
abort: tag 'bleah' already exists (use -f to force)
[255]
$ hg tag " bleah"
abort: tag 'bleah' already exists (use -f to force)
[255]
$ hg tag -r 0 " bleahbleah "
$ hg tag -r 0 " bleah bleah "
Nicolas Dumazet
tests: unify test-tag
r11788 $ cat .hgtags
Martin Geisler
tests: remove unneeded -d flags...
r12156 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah
acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0
336fccc858a4eb69609a291105009e484a6b6b8d gack
336fccc858a4eb69609a291105009e484a6b6b8d gawk
336fccc858a4eb69609a291105009e484a6b6b8d gorp
336fccc858a4eb69609a291105009e484a6b6b8d gack
799667b6f2d9b957f73fa644a918c2df22bab58f gack
799667b6f2d9b957f73fa644a918c2df22bab58f gack
Nicolas Dumazet
tests: unify test-tag
r11788 0000000000000000000000000000000000000000 gack
Martin Geisler
tests: remove unneeded -d flags...
r12156 336fccc858a4eb69609a291105009e484a6b6b8d gorp
Nicolas Dumazet
tests: unify test-tag
r11788 0000000000000000000000000000000000000000 gorp
Afuna
tag: add tests for tags with whitespace (issue2174)
r13399 acb14030fe0a21b60322c440ad2d20cf7685a376 bleahbleah
acb14030fe0a21b60322c440ad2d20cf7685a376 bleah bleah
Nicolas Dumazet
tests: unify test-tag
r11788 $ cat .hg/localtags
Martin Geisler
tests: remove unneeded -d flags...
r12156 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
Nicolas Dumazet
tests: unify test-tag
r11788
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135 tagging on a non-head revision
Nicolas Dumazet
tests: unify test-tag
r11788 $ hg update 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135 $ hg tag -l localblah
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg tag "foobar"
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135 abort: not at a branch head (use -f to force)
[255]
$ hg tag -f "foobar"
Nicolas Dumazet
tests: unify test-tag
r11788 $ cat .hgtags
Martin Geisler
tests: remove unneeded -d flags...
r12156 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
Nicolas Dumazet
tests: unify test-tag
r11788 $ cat .hg/localtags
Martin Geisler
tests: remove unneeded -d flags...
r12156 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
Nicolas Dumazet
tests: unify test-tag
r11788
$ hg tag -l 'xx
> newline'
abort: '\n' cannot be used in a tag name
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Nicolas Dumazet
tests: unify test-tag
r11788 $ hg tag -l 'xx:xx'
abort: ':' cannot be used in a tag name
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Nicolas Dumazet
tests: unify test-tag
r11788
cloning local tags
$ cd ..
$ hg -R test log -r0:5
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:acb14030fe0a
Nicolas Dumazet
tests: unify test-tag
r11788 tag: bleah
Afuna
tag: add tests for tags with whitespace (issue2174)
r13399 tag: bleah bleah
Nicolas Dumazet
tests: unify test-tag
r11788 tag: bleah0
Afuna
tag: add tests for tags with whitespace (issue2174)
r13399 tag: bleahbleah
Nicolas Dumazet
tests: unify test-tag
r11788 tag: foobar
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135 tag: localblah
Nicolas Dumazet
tests: unify test-tag
r11788 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-tag
r11788 summary: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:d4f0d2909abc
Nicolas Dumazet
tests: unify test-tag
r11788 tag: bleah1
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
summary: Added tag bleah for changeset acb14030fe0a
Nicolas Dumazet
tests: unify test-tag
r11788
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:336fccc858a4
Nicolas Dumazet
tests: unify test-tag
r11788 tag: gawk
user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
summary: Added tag bleah0 for changeset acb14030fe0a
Nicolas Dumazet
tests: unify test-tag
r11788
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:799667b6f2d9
Nicolas Dumazet
tests: unify test-tag
r11788 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
summary: Added tag gack, gawk, gorp for changeset 336fccc858a4
Nicolas Dumazet
tests: unify test-tag
r11788
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 4:154eeb7c0138
Nicolas Dumazet
tests: unify test-tag
r11788 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
summary: Added tag gack for changeset 799667b6f2d9
Nicolas Dumazet
tests: unify test-tag
r11788
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 5:b4bb47aaff09
Nicolas Dumazet
tests: unify test-tag
r11788 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-tag
r11788 summary: Removed tag gack, gorp
$ hg clone -q -rbleah1 test test1
$ hg -R test1 parents --style=compact
Martin Geisler
tests: remove unneeded -d flags...
r12156 1[tip] d4f0d2909abc 1970-01-01 00:00 +0000 test
Added tag bleah for changeset acb14030fe0a
Nicolas Dumazet
tests: unify test-tag
r11788
$ hg clone -q -r5 test#bleah1 test2
$ hg -R test2 parents --style=compact
Martin Geisler
tests: remove unneeded -d flags...
r12156 5[tip] b4bb47aaff09 1970-01-01 00:00 +0000 test
Nicolas Dumazet
tests: unify test-tag
r11788 Removed tag gack, gorp
$ hg clone -q -U test#bleah1 test3
$ hg -R test3 parents --style=compact
$ cd test
Martin Geisler
tests: added a short description to issue numbers...
r12399 Issue601: hg tag doesn't do the right thing if .hgtags or localtags
doesn't end with EOL
Nicolas Dumazet
tests: unify test-tag
r11788
$ python << EOF
> f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close()
> f = file('.hg/localtags', 'w'); f.write(last); f.close()
> EOF
$ cat .hg/localtags; echo
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
Nicolas Dumazet
tests: unify test-tag
r11788 $ hg tag -l localnewline
$ cat .hg/localtags; echo
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
Martin Geisler
tests: remove unneeded -d flags...
r12156 c2899151f4e76890c602a2597a650a72666681bf localnewline
Nicolas Dumazet
tests: unify test-tag
r11788
$ python << EOF
> f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close()
> f = file('.hgtags', 'w'); f.write(last); f.close()
> EOF
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m'broken manual edit of .hgtags'
Nicolas Dumazet
tests: unify test-tag
r11788 $ cat .hgtags; echo
Martin Geisler
tests: remove unneeded -d flags...
r12156 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
$ hg tag newline
Nicolas Dumazet
tests: unify test-tag
r11788 $ cat .hgtags; echo
Martin Geisler
tests: remove unneeded -d flags...
r12156 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
a0eea09de1eeec777b46f2085260a373b2fbc293 newline
Nicolas Dumazet
tests: unify test-tag
r11788
tag and branch using same name
$ hg branch tag-and-branch-same-name
marked working directory as branch tag-and-branch-same-name
$ hg ci -m"discouraged"
$ hg tag tag-and-branch-same-name
warning: tag tag-and-branch-same-name conflicts with existing branch name
test custom commit messages
Mads Kiilerich
tests: remove the last traces of $HGTMP...
r12642 $ cat > editor << '__EOF__'
Nicolas Dumazet
tests: unify test-tag
r11788 > #!/bin/sh
> echo "custom tag message" > "$1"
> echo "second line" >> "$1"
> __EOF__
Mads Kiilerich
tests: remove the last traces of $HGTMP...
r12642 $ chmod +x editor
$ HGEDITOR="'`pwd`'"/editor hg tag custom-tag -e
Nicolas Dumazet
tests: unify test-tag
r11788 $ hg log -l1 --template "{desc}\n"
custom tag message
second line
Kevin Bullock
tag: don't check .hgtags status if --local passed...
r13133
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135
Kevin Bullock
tag: don't check .hgtags status if --local passed...
r13133 local tag with .hgtags modified
$ hg tag hgtags-modified
$ hg rollback
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 repository tip rolled back to revision 13 (undo commit)
working directory now based on revision 13
Kevin Bullock
tag: don't check .hgtags status if --local passed...
r13133 $ hg st
M .hgtags
? .hgtags.orig
? editor
$ hg tag --local baz
$ hg revert --no-backup .hgtags
Kevin Bullock
tag: fix uncommitted merge check and error message (issue2542)...
r13134
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135
tagging when at named-branch-head that's not a topo-head
$ hg up default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge -t internal:local
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'merge named branch'
Afuna
tag: add tests for tags with whitespace (issue2174)
r13399 $ hg up 13
Kevin Bullock
tag: abort if not at a branch head (issue2552)...
r13135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tag new-topo-head
tagging on null rev
$ hg up null
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg tag nullrev
abort: not at a branch head (use -f to force)
[255]
$ hg init empty
$ hg tag -R empty nullrev
Kevin Bullock
tag: fix uncommitted merge check and error message (issue2542)...
r13134 $ cd ..
tagging on an uncommitted merge (issue2542)
$ hg init repo-tag-uncommitted-merge
$ cd repo-tag-uncommitted-merge
$ echo c1 > f1
$ hg ci -Am0
adding f1
Matt Mackall
tests: eliminate fast-forward merge in test-tag
r13159 $ echo c2 > f2
$ hg ci -Am1
adding f2
$ hg co -q 0
Kevin Bullock
tag: fix uncommitted merge check and error message (issue2542)...
r13134 $ hg branch b1
marked working directory as branch b1
Matt Mackall
tests: eliminate fast-forward merge in test-tag
r13159 $ hg ci -m2
Kevin Bullock
tag: fix uncommitted merge check and error message (issue2542)...
r13134 $ hg up default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge b1
Matt Mackall
tests: eliminate fast-forward merge in test-tag
r13159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Kevin Bullock
tag: fix uncommitted merge check and error message (issue2542)...
r13134 (branch merge, don't forget to commit)
$ hg tag t1
abort: uncommitted merge
[255]
$ hg status
$ hg tag --rev 1 t2
abort: uncommitted merge
[255]
$ hg tag --rev 1 --local t3
$ hg tags -v
Peter Arrenbrecht
localrepo: reuse parent manifest in commitctx if no files have changed...
r14162 tip 2:2a156e8887cc
Matt Mackall
tests: eliminate fast-forward merge in test-tag
r13159 t3 1:c3adabd1a5f4 local
Kevin Bullock
tag: fix uncommitted merge check and error message (issue2542)...
r13134
$ cd ..