Mercurial > hg
comparison hgext/mq.py @ 14052:ecaa78594983
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 30 Apr 2011 03:44:31 -0500 |
| parents | 4f19242dac6c 2b1226693c70 |
| children | 3c616f512a5b |
comparison
equal
deleted
inserted
replaced
| 14049:92db9667d15a | 14052:ecaa78594983 |
|---|---|
| 850 raise util.Abort(_("local changes found, refresh first")) | 850 raise util.Abort(_("local changes found, refresh first")) |
| 851 else: | 851 else: |
| 852 raise util.Abort(_("local changes found")) | 852 raise util.Abort(_("local changes found")) |
| 853 return m, a, r, d | 853 return m, a, r, d |
| 854 | 854 |
| 855 _reserved = ('series', 'status', 'guards') | 855 _reserved = ('series', 'status', 'guards', '.', '..') |
| 856 def check_reserved_name(self, name): | 856 def check_reserved_name(self, name): |
| 857 if (name in self._reserved or name.startswith('.hg') | 857 if (name in self._reserved or name.startswith('.hg') |
| 858 or name.startswith('.mq') or '#' in name or ':' in name): | 858 or name.startswith('.mq') or '#' in name or ':' in name): |
| 859 raise util.Abort(_('"%s" cannot be used as the name of a patch') | 859 raise util.Abort(_('"%s" cannot be used as the name of a patch') |
| 860 % name) | 860 % name) |