Mercurial > hg
changeset 10589:92b8c79b34c2 stable
mq: disallow : in patch names (issue2065)
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Fri, 05 Mar 2010 10:49:56 +0100 |
| parents | b0b19d61d79a |
| children | 5faf3566c96d |
| files | hgext/mq.py tests/test-mq-qnew tests/test-mq-qnew.out |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Thu Mar 04 14:23:54 2010 +0100 +++ b/hgext/mq.py Fri Mar 05 10:49:56 2010 +0100 @@ -813,8 +813,7 @@ _reserved = ('series', 'status', 'guards') def check_reserved_name(self, name): if (name in self._reserved or name.startswith('.hg') - or name.startswith('.mq') or '#' in name - or (os.name == 'nt' and ':' in name)): + or name.startswith('.mq') or '#' in name or ':' in name): raise util.Abort(_('"%s" cannot be used as the name of a patch') % name)
--- a/tests/test-mq-qnew Thu Mar 04 14:23:54 2010 +0100 +++ b/tests/test-mq-qnew Fri Mar 05 10:49:56 2010 +0100 @@ -21,6 +21,7 @@ hg qnew .hgignore hg qnew .mqfoo hg qnew 'foo#bar' + hg qnew 'foo:bar' hg qinit -c
--- a/tests/test-mq-qnew.out Thu Mar 04 14:23:54 2010 +0100 +++ b/tests/test-mq-qnew.out Fri Mar 05 10:49:56 2010 +0100 @@ -7,6 +7,7 @@ abort: ".hgignore" cannot be used as the name of a patch abort: ".mqfoo" cannot be used as the name of a patch abort: "foo#bar" cannot be used as the name of a patch +abort: "foo:bar" cannot be used as the name of a patch % qnew with uncommitted changes uncommitted.patch % qnew implies add