diff mercurial/subrepo.py @ 20870:6500a2eebee8

merge with stable

--- a/mercurial/subrepo.py	Wed Mar 19 23:04:03 2014 -0700
+++ b/mercurial/subrepo.py	Tue Apr 01 15:11:19 2014 -0500
@@ -321,8 +321,8 @@
         for f in names:
             if f.lower() == 'hgrc':
                 ui.warn(
-                    _("warning: removing potentially hostile .hg/hgrc in '%s'"
-                      % path))
+                    _("warning: removing potentially hostile .hg/hgrc in '%s'")
+                      % path)
                 os.unlink(os.path.join(dirname, f))
     os.walk(path, v, None)
 
@@ -1011,7 +1011,7 @@
     def remove(self):
         if self.dirty():
             self._ui.warn(_('not removing repo %s because '
-                            'it has changes.\n' % self._path))
+                            'it has changes.\n') % self._path)
             return
         self._ui.note(_('removing subrepo %s\n') % self._path)