# HG changeset patch # User Adrian Buehlmann # Date 1307959041 -7200 # Node ID 668ea374f46e29dcd67703279d2e249c8e179f9b # Parent 845c864200d0d6c66fda09b4905086ae0d2bd64e mq: rename check_guard to checkguard diff -r 845c864200d0 -r 668ea374f46e hgext/mq.py --- 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])