--- a/hgext/churn.py Wed Mar 07 23:21:11 2012 +0000
+++ b/hgext/churn.py Thu Mar 08 13:35:27 2012 -0600
@@ -135,7 +135,7 @@
except ValueError:
l = l.strip()
if l:
- ui.warn(_("skipping malformed alias: %s\n" % l))
+ ui.warn(_("skipping malformed alias: %s\n") % l)
continue
rate = countrate(ui, repo, amap, *pats, **opts).items()
--- a/hgext/convert/monotone.py Wed Mar 07 23:21:11 2012 +0000
+++ b/hgext/convert/monotone.py Thu Mar 08 13:35:27 2012 -0600
@@ -113,7 +113,7 @@
stream = self.mtnreadfp.read(1)
if stream not in 'mewptl':
- raise util.Abort(_('bad mtn packet - bad stream type %s' % stream))
+ raise util.Abort(_('bad mtn packet - bad stream type %s') % stream)
read = self.mtnreadfp.read(1)
if read != ':':
--- a/hgext/largefiles/lfcommands.py Wed Mar 07 23:21:11 2012 +0000
+++ b/hgext/largefiles/lfcommands.py Thu Mar 08 13:35:27 2012 -0600
@@ -309,7 +309,7 @@
newdata.append('%s %s\n' % (node.hex(revmap[newid]),
name))
except KeyError:
- ui.warn(_('no mapping for id %s\n' % id))
+ ui.warn(_('no mapping for id %s\n') % id)
continue
return ''.join(newdata)
--- a/hgext/largefiles/overrides.py Wed Mar 07 23:21:11 2012 +0000
+++ b/hgext/largefiles/overrides.py Thu Mar 08 13:35:27 2012 -0600
@@ -157,7 +157,7 @@
# If this is being called by addremove, notify the user that we
# are removing the file.
if getattr(repo, "_isaddremove", False):
- ui.status(_('removing %s\n' % f))
+ ui.status(_('removing %s\n') % f)
if os.path.exists(repo.wjoin(f)):
util.unlinkpath(repo.wjoin(f))
lfdirstate.remove(f)
@@ -673,7 +673,7 @@
for head in newheads:
(cached, missing) = lfcommands.cachelfiles(ui, repo, head)
numcached += len(cached)
- ui.status(_("%d largefiles cached\n" % numcached))
+ ui.status(_("%d largefiles cached\n") % numcached)
return result
def override_rebase(orig, ui, repo, **opts):
--- a/hgext/mq.py Wed Mar 07 23:21:11 2012 +0000
+++ b/hgext/mq.py Thu Mar 08 13:35:27 2012 -0600
@@ -1192,7 +1192,8 @@
root = self.series[start]
target = patchheader(self.join(root), self.plainmode).parent
if not target:
- raise util.Abort(_("%s does not have a parent recorded" % root))
+ raise util.Abort(
+ _("%s does not have a parent recorded") % root)
if not repo[target] == repo['.']:
hg.update(repo, target)
--- a/mercurial/commands.py Wed Mar 07 23:21:11 2012 +0000
+++ b/mercurial/commands.py Thu Mar 08 13:35:27 2012 -0600
@@ -2904,7 +2904,7 @@
headless = ', '.join(b for b in branches - haveheads)
msg = _('no open branch heads found on branches %s')
if opts.get('rev'):
- msg += _(' (started at %s)' % opts['rev'])
+ msg += _(' (started at %s)') % opts['rev']
ui.warn((msg + '\n') % headless)
if not heads:
@@ -2997,7 +2997,7 @@
msg = _('use "hg help" for the full list of commands '
'or "hg -v" for details')
elif name and not full:
- msg = _('use "hg help %s" to show the full help text' % name)
+ msg = _('use "hg help %s" to show the full help text') % name
elif aliases:
msg = _('use "hg -v help%s" to show builtin aliases and '
'global options') % (name and " " + name or "")
--- a/tests/test-check-code-hg.t Wed Mar 07 23:21:11 2012 +0000
+++ b/tests/test-check-code-hg.t Thu Mar 08 13:35:27 2012 -0600
@@ -209,9 +209,6 @@
> if os.path.exists(self.wjoin(lfutil.standin(lfile))):
warning: line over 80 characters
hgext/mq.py:0:
- > raise util.Abort(_("%s does not have a parent recorded" % root))
- warning: line over 80 characters
- hgext/mq.py:0:
> raise util.Abort(_("cannot push --exact with applied patches"))
warning: line over 80 characters
hgext/mq.py:0: