# HG changeset patch
# User Marcos Chaves <marcos.nospam@gmail.com>
# Date 1163877638 7200
# Node ID 2956948b81f317cb2e39ee2645e9232fe46b6799
# Parent  7e622c9a9707b48acb95b6b95aaeb8d327ad1410
fix warnings generated by pygettext.py.

diff --git a/hgext/notify.py b/hgext/notify.py
--- a/hgext/notify.py
+++ b/hgext/notify.py
@@ -259,7 +259,7 @@ def hook(ui, repo, hooktype, node=None, 
     changegroup. else send one email per changeset.'''
     n = notifier(ui, repo, hooktype)
     if not n.subs:
-        ui.debug(_('notify: no subscribers to repo %s\n' % n.root))
+        ui.debug(_('notify: no subscribers to repo %s\n') % n.root)
         return
     if n.skipsource(source):
         ui.debug(_('notify: changes have source "%s" - skipping\n') %
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -213,8 +213,8 @@ def backout(ui, repo, rev, **opts):
                                '--parent'))
         p = repo.lookup(opts['parent'])
         if p not in (p1, p2):
-            raise util.Abort(_('%s is not a parent of %s' %
-                               (short(p), short(node))))
+            raise util.Abort(_('%s is not a parent of %s') %
+                               (short(p), short(node)))
         parent = p
     else:
         if opts['parent']:
@@ -1969,12 +1969,12 @@ def revert(ui, repo, *pats, **opts):
             elif misslist is not None:
                 handle(misslist, backupmiss)
             else:
-                if exact: ui.warn(_('file not managed: %s\n' % rel))
+                if exact: ui.warn(_('file not managed: %s\n') % rel)
             break
         else:
             # file has not changed in dirstate
             if node == parent:
-                if exact: ui.warn(_('no changes needed to %s\n' % rel))
+                if exact: ui.warn(_('no changes needed to %s\n') % rel)
                 continue
             if pmf is None:
                 # only need parent manifest in this unlikely case,
diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -242,8 +242,8 @@ def merge(repo, node, force=None, remind
         repo.ui.status(_("There are unresolved merges,"
                          " you can redo the full merge using:\n"
                          "  hg update -C %s\n"
-                         "  hg merge %s\n"
-                         % (pl[0].rev(), pl[1].rev())))
+                         "  hg merge %s\n")
+                         % (pl[0].rev(), pl[1].rev()))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3]
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -30,7 +30,7 @@ REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_
 def flagstr(flag):
     if flag == "inline":
         return REVLOGNGINLINEDATA
-    raise RevlogError(_("unknown revlog flag %s" % flag))
+    raise RevlogError(_("unknown revlog flag %s") % flag)
 
 def hash(text, p1, p2):
     """generate a hash from the given text and its parent hashes
@@ -355,15 +355,15 @@ class revlog(object):
         fmt = v & 0xFFFF
         if fmt == REVLOGV0:
             if flags:
-                raise RevlogError(_("index %s invalid flags %x for format v0" %
-                                   (self.indexfile, flags)))
+                raise RevlogError(_("index %s invalid flags %x for format v0") %
+                                   (self.indexfile, flags))
         elif fmt == REVLOGNG:
             if flags & ~REVLOGNGINLINEDATA:
-                raise RevlogError(_("index %s invalid flags %x for revlogng" %
-                                   (self.indexfile, flags)))
+                raise RevlogError(_("index %s invalid flags %x for revlogng") %
+                                   (self.indexfile, flags))
         else:
-            raise RevlogError(_("index %s invalid format %d" %
-                               (self.indexfile, fmt)))
+            raise RevlogError(_("index %s invalid format %d") %
+                               (self.indexfile, fmt))
         self.version = v
         if v == REVLOGV0:
             self.indexformat = indexformatv0
@@ -931,8 +931,8 @@ class revlog(object):
             return
         trinfo = tr.find(self.indexfile)
         if trinfo == None:
-            raise RevlogError(_("%s not found in the transaction"  %
-                              self.indexfile))
+            raise RevlogError(_("%s not found in the transaction")  %
+                              self.indexfile)
 
         trindex = trinfo[2]
         dataoff = self.start(trindex)