mq: make qselect fail properly on an empty guard
authorPatrick Mezard <pmezard@gmail.com>
Sun, 18 May 2008 17:01:24 +0200
changeset 6607 75b506f0e571
parent 6606 088ba40585b9
child 6608 8d9d09d7c8b7
mq: make qselect fail properly on an empty guard
hgext/mq.py
tests/test-mq-guards
tests/test-mq-guards.out
--- a/hgext/mq.py	Sat May 17 09:11:14 2008 +0200
+++ b/hgext/mq.py	Sun May 18 17:01:24 2008 +0200
@@ -126,6 +126,8 @@
                 self.series_guards.append(self.guard_re.findall(comment))
 
     def check_guard(self, guard):
+        if not guard:
+            return _('guard cannot be an empty string')
         bad_chars = '# \t\r\n\f'
         first = guard[0]
         for c in '-+':
--- a/tests/test-mq-guards	Sat May 17 09:11:14 2008 +0200
+++ b/tests/test-mq-guards	Sun May 18 17:01:24 2008 +0200
@@ -44,6 +44,8 @@
 hg qpush
 
 hg qpop
+echo % test selection of an empty guard
+hg qselect ""
 hg qselect a
 echo % should push a.patch
 hg qpush
--- a/tests/test-mq-guards.out	Sat May 17 09:11:14 2008 +0200
+++ b/tests/test-mq-guards.out	Sun May 18 17:01:24 2008 +0200
@@ -15,6 +15,8 @@
 applying b.patch
 Now at: b.patch
 Patch queue now empty
+% test selection of an empty guard
+abort: guard cannot be an empty string
 number of unguarded, unapplied patches has changed from 2 to 3
 % should push a.patch
 applying a.patch