changeset 14576:668ea374f46e

mq: rename check_guard to checkguard
author Adrian Buehlmann <adrian@cadifra.com>
date Mon, 13 Jun 2011 11:57:21 +0200
parents 845c864200d0
children 76357276662e
files hgext/mq.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/mq.py	Mon Jun 13 11:55:46 2011 +0200
+++ b/hgext/mq.py	Mon Jun 13 11:57:21 2011 +0200
@@ -392,7 +392,7 @@
                 self.series.append(patch)
                 self.seriesguards.append(self.guard_re.findall(comment))
 
-    def check_guard(self, guard):
+    def checkguard(self, guard):
         if not guard:
             return _('guard cannot be an empty string')
         bad_chars = '# \t\r\n\f'
@@ -406,7 +406,7 @@
 
     def set_active(self, guards):
         for guard in guards:
-            bad = self.check_guard(guard)
+            bad = self.checkguard(guard)
             if bad:
                 raise util.Abort(bad)
         guards = sorted(set(guards))
@@ -424,7 +424,7 @@
                     raise
                 guards = []
             for i, guard in enumerate(guards):
-                bad = self.check_guard(guard)
+                bad = self.checkguard(guard)
                 if bad:
                     self.ui.warn('%s:%d: %s\n' %
                                  (self.join(self.guards_path), i + 1, bad))
@@ -438,7 +438,7 @@
                 raise util.Abort(_('guard %r too short') % g)
             if g[0] not in '-+':
                 raise util.Abort(_('guard %r starts with invalid char') % g)
-            bad = self.check_guard(g[1:])
+            bad = self.checkguard(g[1:])
             if bad:
                 raise util.Abort(bad)
         drop = self.guard_re.sub('', self.fullseries[idx])