facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

mq: add '.' and '..' to list of forbidden patch names

Browse Source 
When an empty string is being passed to normname
it would return '.' causing checkfile() to always
return that a patch with that name exists.
This commit is contained in:
Idan Kamara 2011-04-29 22:21:13 +03:00
parent 3616aca56a
commit 856702f469
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgext/mq.py
View File

@ -834,7 +834,7 @@ class queue(object):
raise util.Abort(_("local changes found"))
return m, a, r, d
_reserved = ('series', 'status', 'guards')
_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 ':' in name):

6
tests/test-mq-qnew.t
View File

@ -15,6 +15,8 @@
> hg qnew series
> hg qnew status
> hg qnew guards
> hg qnew .
> hg qnew ..
> hg qnew .hgignore
> hg qnew .mqfoo
> hg qnew 'foo#bar'
@ -102,6 +104,8 @@ plain headers
abort: "series" cannot be used as the name of a patch
abort: "status" cannot be used as the name of a patch
abort: "guards" cannot be used as the name of a patch
abort: "." cannot be used as the name of a patch
abort: ".." cannot be used as the name of a patch
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
@ -167,6 +171,8 @@ hg headers
abort: "series" cannot be used as the name of a patch
abort: "status" cannot be used as the name of a patch
abort: "guards" cannot be used as the name of a patch
abort: "." cannot be used as the name of a patch
abort: ".." cannot be used as the name of a patch
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