Mercurial > hg
changeset 2653:8796d9991100
merge with crew.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Mon, 24 Jul 2006 09:12:16 -0700 |
| parents | e6a41cbaa260 (current diff) 56e98084e040 (diff) |
| children | c54ecfc360a9 |
| files | |
| diffstat | 5 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Jul 24 09:11:26 2006 -0700 +++ b/mercurial/commands.py Mon Jul 24 09:12:16 2006 -0700 @@ -2651,7 +2651,7 @@ very useful to compare different revision, to go back to significant earlier versions or to mark branch points as releases, etc. - If no revision is given, the tip is used. + If no revision is given, the parent of the working directory is used. To facilitate version control, distribution, and merging of tags, they are stored as a file named ".hgtags" which is managed @@ -2671,7 +2671,12 @@ if rev_: r = hex(repo.lookup(rev_)) else: - r = hex(repo.changelog.tip()) + 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'])
--- a/mercurial/hgweb/server.py Mon Jul 24 09:11:26 2006 -0700 +++ b/mercurial/hgweb/server.py Mon Jul 24 09:12:16 2006 -0700 @@ -198,6 +198,7 @@ self.webdirmaker = hgwebdir self.repoviewmaker = hgweb self.reqmaker = wsgiapplication(self.make_handler) + self.daemon_threads = True def make_handler(self): if self.webdir_conf:
--- a/mercurial/templater.py Mon Jul 24 09:11:26 2006 -0700 +++ b/mercurial/templater.py Mon Jul 24 09:12:16 2006 -0700 @@ -241,6 +241,7 @@ return text.replace('\n', '<br/>\n') def obfuscate(text): + text = unicode(text, 'utf-8', 'replace') return ''.join(['&#%d;' % ord(c) for c in text]) def domain(author):
--- a/tests/test-tag Mon Jul 24 09:11:26 2006 -0700 +++ b/tests/test-tag Mon Jul 24 09:12:16 2006 -0700 @@ -19,6 +19,11 @@ cat .hgtags cat .hg/localtags +hg update 0 +hg tag -d "1000000 0" "foobar" +cat .hgtags +cat .hg/localtags + hg tag -l 'xx newline' hg tag -l 'xx:xx'
--- a/tests/test-tag.out Mon Jul 24 09:11:26 2006 -0700 +++ b/tests/test-tag.out Mon Jul 24 09:12:16 2006 -0700 @@ -25,5 +25,8 @@ 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0 c5c60883086f5526bd3e36814b94a73a4e75e172 bleah1 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar +c5c60883086f5526bd3e36814b94a73a4e75e172 bleah1 abort: '\n' cannot be used in a tag name abort: ':' cannot be used in a tag name