Mercurial > public > mercurial-scm > hg
diff mercurial/changelog.py @ 10417:58e040c51231 stable
branch: avoid using reserved tag names
Reported as Debian bug #552423.
| author | Wagner Bruna <wbruna@softwareexpress.com.br> |
|---|---|
| date | Thu, 11 Feb 2010 12:02:48 -0200 |
| parents | 25e572394f5c |
| children | 41d0ed2c79df |
line wrap: on
line diff
--- a/mercurial/changelog.py Sun Feb 07 11:38:36 2010 +0100 +++ b/mercurial/changelog.py Thu Feb 11 12:02:48 2010 -0200 @@ -218,8 +218,13 @@ parseddate = "%d %d" % util.parsedate(date) else: parseddate = "%d %d" % util.makedate() - if extra and extra.get("branch") in ("default", ""): - del extra["branch"] + if extra: + branch = extra.get("branch") + if branch in ("default", ""): + del extra["branch"] + elif branch in (".", "null", "tip"): + raise error.RevlogError(_('the name \'%s\' is reserved') + % branch) if extra: extra = encodeextra(extra) parseddate = "%s %s" % (parseddate, extra)