--- a/mercurial/commands.py Mon Aug 21 21:59:29 2006 -0700
+++ b/mercurial/commands.py Tue Aug 22 10:18:40 2006 +0200
@@ -403,17 +403,15 @@
changes = log.read(changenode)
date = util.datestr(changes[2])
- parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p))
- for p in log.parents(changenode)
+ hexfunc = self.ui.debugflag and hex or short
+
+ parents = [(log.rev(p), hexfunc(p)) for p in log.parents(changenode)
if self.ui.debugflag or p != nullid]
if (not self.ui.debugflag and len(parents) == 1 and
parents[0][0] == rev-1):
parents = []
- if self.ui.verbose:
- self.ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))
- else:
- self.ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))
+ self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
for tag in self.repo.nodetags(changenode):
self.ui.status(_("tag: %s\n") % tag)
@@ -1611,7 +1609,7 @@
ui.write(_("unknown\n"))
return
- hexfunc = ui.verbose and hex or short
+ hexfunc = ui.debugflag and hex or short
modified, added, removed, deleted = repo.status()[:4]
output = ["%s%s" %
('+'.join([hexfunc(parent) for parent in parents]),
@@ -2601,17 +2599,20 @@
if opts['rev']:
rev_ = opts['rev']
if rev_:
- r = hex(repo.lookup(rev_))
+ r = repo.lookup(rev_)
else:
p1, p2 = repo.dirstate.parents()
if p1 == nullid:
raise util.Abort(_('no revision to tag'))
if p2 != nullid:
raise util.Abort(_('outstanding uncommitted merges'))
- r = hex(p1)
-
- repo.tag(name, r, opts['local'], opts['message'], opts['user'],
- opts['date'])
+ r = p1
+
+ message = opts['message']
+ if not message:
+ message = _('Added tag %s for changeset %s') % (name, short(r))
+
+ repo.tag(name, r, message, opts['local'], opts['user'], opts['date'])
def tags(ui, repo):
"""list repository tags
@@ -2623,9 +2624,10 @@
l = repo.tagslist()
l.reverse()
+ hexfunc = ui.debugflag and hex or short
for t, n in l:
try:
- r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
+ r = "%5d:%s" % (repo.changelog.rev(n), hexfunc(n))
except KeyError:
r = " ?:?"
if ui.quiet:
--- a/mercurial/localrepo.py Mon Aug 21 21:59:29 2006 -0700
+++ b/mercurial/localrepo.py Tue Aug 22 10:18:40 2006 +0200
@@ -169,7 +169,7 @@
tag_disallowed = ':\r\n'
- def tag(self, name, node, local=False, message=None, user=None, date=None):
+ def tag(self, name, node, message, local, user, date):
'''tag a revision with a symbolic name.
if local is True, the tag is stored in a per-repository file.
@@ -191,11 +191,11 @@
if c in name:
raise util.Abort(_('%r cannot be used in a tag name') % c)
- self.hook('pretag', throw=True, node=node, tag=name, local=local)
+ self.hook('pretag', throw=True, node=hex(node), tag=name, local=local)
if local:
- self.opener('localtags', 'a').write('%s %s\n' % (node, name))
- self.hook('tag', node=node, tag=name, local=local)
+ self.opener('localtags', 'a').write('%s %s\n' % (hex(node), name))
+ self.hook('tag', node=hex(node), tag=name, local=local)
return
for x in self.status()[:5]:
@@ -203,15 +203,12 @@
raise util.Abort(_('working copy of .hgtags is changed '
'(please commit .hgtags manually)'))
- self.wfile('.hgtags', 'ab').write('%s %s\n' % (node, name))
+ self.wfile('.hgtags', 'ab').write('%s %s\n' % (hex(node), name))
if self.dirstate.state('.hgtags') == '?':
self.add(['.hgtags'])
- if not message:
- message = _('Added tag %s for changeset %s') % (name, node)
-
self.commit(['.hgtags'], message, user, date)
- self.hook('tag', node=node, tag=name, local=local)
+ self.hook('tag', node=hex(node), tag=name, local=local)
def tags(self):
'''return a mapping of tag to node'''
@@ -1105,7 +1102,7 @@
else:
raise util.Abort(_("repository is unrelated"))
- self.ui.note(_("found new changesets starting at ") +
+ self.ui.debug(_("found new changesets starting at ") +
" ".join([short(f) for f in fetch]) + "\n")
self.ui.debug(_("%d total queries\n") % reqcnt)
--- a/tests/README Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/README Tue Aug 22 10:18:40 2006 +0200
@@ -32,6 +32,9 @@
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
to strip dates
+- You can append your own hgrc settings to the file that the environment
+ variable HGRCPATH points to. This file is cleared before running a test.
+
You also need to be careful that the tests are portable from one platform
to another. You're probably working on Linux, where the GNU toolchain has
more (or different) functionality than on MacOS, *BSD, Solaris, AIX, etc.
--- a/tests/run-tests.py Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/run-tests.py Tue Aug 22 10:18:40 2006 +0200
@@ -211,6 +211,10 @@
sys.stdout.write('.')
sys.stdout.flush()
+ # create a fresh hgrc
+ hgrc = file(HGRCPATH, 'w+')
+ hgrc.close()
+
err = os.path.join(TESTDIR, test+".err")
ref = os.path.join(TESTDIR, test+".out")
@@ -319,11 +323,11 @@
os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'
os.environ["HGMERGE"] = sys.executable + ' -c "import sys; sys.exit(0)"'
os.environ["HGUSER"] = "test"
-os.environ["HGRCPATH"] = ""
TESTDIR = os.environ["TESTDIR"] = os.getcwd()
HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.")
DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
+HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')
vlog("# Using TESTDIR", TESTDIR)
vlog("# Using HGTMP", HGTMP)
--- a/tests/test-abort-checkin Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-abort-checkin Tue Aug 22 10:18:40 2006 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "mq=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "mq=" >> $HGRCPATH
cat > $HGTMP/false <<EOF
#!/bin/sh
exit 1
--- a/tests/test-bisect Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-bisect Tue Aug 22 10:18:40 2006 +0200
@@ -2,9 +2,8 @@
set -e
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "hbisect=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "hbisect=" >> $HGRCPATH
echo % init
hg init
--- a/tests/test-command-template.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-command-template.out Tue Aug 22 10:18:40 2006 +0200
@@ -1,4 +1,20 @@
# default style is like normal output
+1c1
+< changeset: 3:10e46f2dcbf4
+---
+> changeset: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47
+10c10
+< changeset: 2:97054abb4ab8
+---
+> changeset: 2:97054abb4ab824450e9164180baf491ae0078465
+18c18
+< changeset: 1:b608e9d1a3f0
+---
+> changeset: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965
+29c29
+< changeset: 0:1e4e1b8f71e0
+---
+> changeset: 0:1e4e1b8f71e05681d422154f5421e385fec3454f
18a19
> files:
29a31
--- a/tests/test-copy.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-copy.out Tue Aug 22 10:18:40 2006 +0200
@@ -2,7 +2,7 @@
b
b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
we should see two history entries
-changeset: 1:386a3cc01532710ca78aed9a54fa2f459c04f29c
+changeset: 1:386a3cc01532
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
@@ -11,7 +11,7 @@
2
-changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1
+changeset: 0:33aaa84a386b
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: a
--- a/tests/test-extdiff Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-extdiff Tue Aug 22 10:18:40 2006 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "extdiff=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "extdiff=" >> $HGRCPATH
hg init a
cd a
@@ -14,9 +13,9 @@
fi
hg extdiff -o -Nr $opt
-echo "[extdiff]" >> $HGTMP/.hgrc
-echo "cmd.falabala=echo" >> $HGTMP/.hgrc
-echo "opts.falabala=diffing" >> $HGTMP/.hgrc
+echo "[extdiff]" >> $HGRCPATH
+echo "cmd.falabala=echo" >> $HGRCPATH
+echo "opts.falabala=diffing" >> $HGRCPATH
hg falabala
--- a/tests/test-fetch Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-fetch Tue Aug 22 10:18:40 2006 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "fetch=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "fetch=" >> $HGRCPATH
hg init a
echo a > a/a
--- a/tests/test-filebranch.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-filebranch.out Tue Aug 22 10:18:40 2006 +0200
@@ -31,10 +31,10 @@
2 150 71 2 2 a6aef98656b7 c36078bec30d 000000000000
3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7
log should show foo and quux changed
-changeset: 3:0c2cc6fc80e2d4ee289bb658dbbe9ad932380fe9
+changeset: 3:0c2cc6fc80e2
tag: tip
-parent: 1:182b283965f1069c0112784e30e7755ad1c0dd52
-parent: 2:a6aef98656b71154cae9d87408abe6d0218c8045
+parent: 1:182b283965f1
+parent: 2:a6aef98656b7
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: foo quux
--- a/tests/test-globalopts.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-globalopts.out Tue Aug 22 10:18:40 2006 +0200
@@ -47,7 +47,7 @@
0:8580ff50825a
1:b6c483daf290
%% -v/--verbose
-changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a
+changeset: 1:b6c483daf290
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
@@ -56,7 +56,7 @@
b
-changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab
+changeset: 0:8580ff50825a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: a
@@ -64,7 +64,7 @@
a
-changeset: 0:b6c483daf2907ce5825c0bb50f5716226281cc1a
+changeset: 0:b6c483daf290
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
--- a/tests/test-hook.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-hook.out Tue Aug 22 10:18:40 2006 +0200
@@ -36,43 +36,43 @@
(run 'hg update' to get a working copy)
pretag hook: t=a n=4c52fb2e402287dd5dc052090682536c8406c321 l=0
precommit hook: p1=4c52fb2e402287dd5dc052090682536c8406c321 p2=
-pretxncommit hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p1=4c52fb2e402287dd5dc052090682536c8406c321 p2=
-4:4f92e785b90a
-commit hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p1=4c52fb2e402287dd5dc052090682536c8406c321 p2=
+pretxncommit hook: n=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p1=4c52fb2e402287dd5dc052090682536c8406c321 p2=
+4:8ea2ef7ad3e8
+commit hook: n=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p1=4c52fb2e402287dd5dc052090682536c8406c321 p2=
commit hook b
tag hook: t=a n=4c52fb2e402287dd5dc052090682536c8406c321 l=0
-pretag hook: t=la n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1
-tag hook: t=la n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1
-pretag hook: t=fa n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=0
+pretag hook: t=la n=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 l=1
+tag hook: t=la n=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 l=1
+pretag hook: t=fa n=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 l=0
pretag.forbid hook
abort: pretag.forbid hook exited with status 1
-pretag hook: t=fla n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1
+pretag hook: t=fla n=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 l=1
pretag.forbid hook
abort: pretag.forbid hook exited with status 1
-4:4f92e785b90a
-precommit hook: p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2=
-pretxncommit hook: n=7792358308a2026661cea44f9d47c072813004cb p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2=
-5:7792358308a2
-pretxncommit.forbid hook: tip=5:7792358308a2
+4:8ea2ef7ad3e8
+precommit hook: p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2=
+pretxncommit hook: n=fad284daf8c032148abaffcd745dafeceefceb61 p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2=
+5:fad284daf8c0
+pretxncommit.forbid hook: tip=5:fad284daf8c0
abort: pretxncommit.forbid hook exited with status 1
transaction abort!
rollback completed
-4:4f92e785b90a
-precommit hook: p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2=
+4:8ea2ef7ad3e8
+precommit hook: p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2=
precommit.forbid hook
abort: precommit.forbid hook exited with status 1
-4:4f92e785b90a
+4:8ea2ef7ad3e8
preupdate hook: p1=b702efe9688826e3a91283852b328b84dbf37bc2 p2=
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-preupdate hook: p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2=
-update hook: p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2= err=0
+preupdate hook: p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2=
+update hook: p1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 p2= err=0
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3:4c52fb2e4022
prechangegroup.forbid hook
pulling from ../a
searching for changes
abort: prechangegroup.forbid hook exited with status 1
-pretxnchangegroup.forbid hook: tip=4:4f92e785b90a
+pretxnchangegroup.forbid hook: tip=4:8ea2ef7ad3e8
pulling from ../a
searching for changes
adding changesets
@@ -84,7 +84,7 @@
rollback completed
3:4c52fb2e4022
preoutgoing hook: s=pull
-outgoing hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 s=pull
+outgoing hook: n=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 s=pull
pulling from ../a
searching for changes
adding changesets
--- a/tests/test-log.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-log.out Tue Aug 22 10:18:40 2006 +0200
@@ -34,7 +34,7 @@
summary: a
% one rename
-changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab
+changeset: 0:8580ff50825a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: a
@@ -43,7 +43,7 @@
% many renames
-changeset: 4:8c1c8408f7371319750ea2d4fa7969828effbcf4
+changeset: 4:8c1c8408f737
tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
@@ -52,7 +52,7 @@
e
-changeset: 2:21fba396af4c801f9717de6c415b6cc9620437e8
+changeset: 2:21fba396af4c
user: test
date: Thu Jan 01 00:00:03 1970 +0000
files: b dir/b
@@ -60,7 +60,7 @@
c
-changeset: 1:c0296dabce9bf0cd3fdd608de26693c91cd6bbf4
+changeset: 1:c0296dabce9b
user: test
date: Thu Jan 01 00:00:02 1970 +0000
files: b
@@ -68,7 +68,7 @@
b
-changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab
+changeset: 0:8580ff50825a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: a
--- a/tests/test-mq Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-mq Tue Aug 22 10:18:40 2006 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "mq=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "mq=" >> $HGRCPATH
echo % help
hg help mq
@@ -127,7 +126,7 @@
hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/'
hg unbundle .hg/strip-backup/*
-cat >>$HGTMP/.hgrc <<EOF
+cat >>$HGRCPATH <<EOF
[diff]
git = True
EOF
--- a/tests/test-mq-guards Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-mq-guards Tue Aug 22 10:18:40 2006 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "mq=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "mq=" >> $HGRCPATH
hg init
hg qinit
--- a/tests/test-mq-qdiff Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-mq-qdiff Tue Aug 22 10:18:40 2006 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "mq=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "mq=" >> $HGRCPATH
echo % init
hg init a
--- a/tests/test-mq-qnew-twice Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-mq-qnew-twice Tue Aug 22 10:18:40 2006 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "mq=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "mq=" >> $HGRCPATH
hg init a
cd a
--- a/tests/test-mq-qrefresh-replace-log-message Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-mq-qrefresh-replace-log-message Tue Aug 22 10:18:40 2006 +0200
@@ -1,9 +1,8 @@
#!/bin/sh
# Environement setup for MQ
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "mq=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "mq=" >> $HGRCPATH
#Repo init
hg init
--- a/tests/test-mq-qsave Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-mq-qsave Tue Aug 22 10:18:40 2006 +0200
@@ -1,8 +1,7 @@
#!/bin/sh
-HGRCPATH=$HGTMP/.hgrc; export HGRCPATH
-echo "[extensions]" >> $HGTMP/.hgrc
-echo "mq=" >> $HGTMP/.hgrc
+echo "[extensions]" >> $HGRCPATH
+echo "mq=" >> $HGRCPATH
hg init a
cd a
--- a/tests/test-parse-date.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-parse-date.out Tue Aug 22 10:18:40 2006 +0200
@@ -1,6 +1,6 @@
reverting a
changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8
-merging with changeset 2:99a1acecff55
+merging with changeset 2:e6c3abc120e7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
abort: invalid date: 'should fail'
--- a/tests/test-tag.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-tag.out Tue Aug 22 10:18:40 2006 +0200
@@ -4,11 +4,11 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: test
-changeset: 1:c5c60883086f
+changeset: 1:3ecf002a1c57
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
-summary: Added tag bleah for changeset 0acdaf8983679e0aac16e811534eb49d7ee1f2b4
+summary: Added tag bleah for changeset 0acdaf898367
changeset: 0:0acdaf898367
tag: bleah
@@ -24,9 +24,9 @@
use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0
-c5c60883086f5526bd3e36814b94a73a4e75e172 bleah1
+3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
-c5c60883086f5526bd3e36814b94a73a4e75e172 bleah1
+3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
abort: '\n' cannot be used in a tag name
abort: ':' cannot be used in a tag name
--- a/tests/test-tags Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-tags Tue Aug 22 10:18:40 2006 +0200
@@ -9,7 +9,7 @@
hg commit -m "test" -d "1000000 0"
hg co
hg identify
-T=`hg tip -v | head -n 1 | cut -d : -f 3`
+T=`hg tip --debug | head -n 1 | cut -d : -f 3`
echo "$T first" > .hgtags
cat .hgtags
hg add .hgtags
--- a/tests/test-tags.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-tags.out Tue Aug 22 10:18:40 2006 +0200
@@ -2,35 +2,35 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0acdaf898367 tip
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first
-tip 1:8a3ca90d111dc784e6575d373105be12570e8776
-first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
+tip 1:8a3ca90d111d
+first 0:0acdaf898367
8a3ca90d111d tip
M a
8a3ca90d111d+ tip
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0acdaf898367+ first
-0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first
+0acdaf898367+ first
M a
8216907a933d tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
8216907a933d+8a3ca90d111d+ tip
M .hgtags
-tip 6:c6af9d771a81bb9c7f267ec03491224a9f8ba1cd
-first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
-.hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry
-.hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed
+tip 6:e2174d339386
+first 0:0acdaf898367
+.hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry
+.hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed
localtags, line 1: tag 'invalid' refers to unknown node
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-.hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry
-.hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed
+.hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry
+.hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed
.hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed
localtags, line 1: tag 'invalid' refers to unknown node
-tip 8:4ca6f1b1a68c77be687a03aaeb1614671ba59b20
-first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4
+tip 8:4ca6f1b1a68c
+first 0:0acdaf898367
changeset: 8:4ca6f1b1a68c
-.hgtags (rev 7:39bba1bbbc4c), line 2: cannot parse entry
-.hgtags (rev 7:39bba1bbbc4c), line 4: node 'foo' is not well formed
+.hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry
+.hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed
.hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed
localtags, line 1: tag 'invalid' refers to unknown node
tag: tip
--- a/tests/test-up-local-change.out Mon Aug 21 21:59:29 2006 -0700
+++ b/tests/test-up-local-change.out Tue Aug 22 10:18:40 2006 +0200
@@ -64,7 +64,7 @@
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
-changeset: 1:802f095af299cde27a85b2f056aef3829870956c
+changeset: 1:802f095af299
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
@@ -73,7 +73,7 @@
2
-changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1
+changeset: 0:33aaa84a386b
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: a