[PATCH] Fix warning: Seen unexpected token "%"

[Dongsheng Song]

# HG changeset patch
# User Dongsheng Song <dongsheng.song at gmail.com>
# Date 1245392909 -28800
# Node ID 21f623e258eb136712e09513d447a7136ac4e0b3
# Parent  ce4b92f5cea7871ee2135c19843a6fc7af3d6136
Fix warning: Seen unexpected token "%"

*** mercurial/subrepo.py:67: Seen unexpected token "%"
*** mercurial/subrepo.py:83: Seen unexpected token "%"
*** mercurial/subrepo.py:96: Seen unexpected token "%"
*** mercurial/localrepo.py:80: Seen unexpected token "%"
*** mercurial/localrepo.py:1517: Seen unexpected token "%"

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -77,7 +77,7 @@
             s = os.path.realpath(self.opener("sharedpath").read())
             if not os.path.exists(s):
                 raise error.RepoError(
-                    _('.hg/sharedpath points to nonexistent directory %s' % s))
+                    _('.hg/sharedpath points to nonexistent directory %s') % s)
             self.sharedpath = s
         except IOError, inst:
             if inst.errno != errno.ENOENT:
@@ -1515,8 +1515,8 @@
             if warn:
                 if not rheads: # new branch requires --force
                     self.ui.warn(_("abort: push creates new"
-                                   " remote branch '%s'!\n" %
-                                   self[updatelh[0]].branch()))
+                                   " remote branch '%s'!\n") %
+                                   self[updatelh[0]].branch())
                 else:
                     self.ui.warn(_("abort: push creates new remote heads!\n"))
 
diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -65,9 +65,9 @@
             elif l[0] != r[0]: # sources differ
                 if repo.ui.prompt(
                     _(' subrepository sources for %s differ\n'
-                      'use (l)ocal source (%s) or (r)emote source (%s)?'
+                      'use (l)ocal source (%s) or (r)emote source (%s)?')
                       % (s, l[0], r[0]),
-                      (_('&Local'), _('&Remote')), _('l'))) == _('r'):
+                      (_('&Local'), _('&Remote')), _('l')) == _('r'):
                     wctx.sub(s).get(r)
                     sm[s] = r
             elif l[1] == a[1]: # local side is unchanged
@@ -81,8 +81,8 @@
         else:
             if repo.ui.prompt(
                 _(' local changed subrepository %s which remote removed\n'
-                  'use (c)hanged version or (d)elete?' % s,
-                  (_('&Changed'), _('&Delete')), _('c'))) == _('d'):
+                  'use (c)hanged version or (d)elete?') % s,
+                  (_('&Changed'), _('&Delete')), _('c')) == _('d'):
                 wctx.sub(s).remove()
 
     for s, r in s2.items():
@@ -94,8 +94,8 @@
         elif r != sa[s]:
             if repo.ui.prompt(
                 _(' remote changed subrepository %s which local removed\n'
-                  'use (c)hanged version or (d)elete?' % s,
-                  (_('&Changed'), _('&Delete')), _('c'))) == _('c'):
+                  'use (c)hanged version or (d)elete?') % s,
+                  (_('&Changed'), _('&Delete')), _('c')) == _('c'):
                 wctx.sub(s).get(r)
                 sm[s] = r
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 489 bytes
Desc: Digital signature
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20090619/1b5afb67/attachment.asc>