Mercurial > hg

changeset 15953:52dc2b33d0be stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phase: fix warning text from invalid remote phase add missing end of line and substitution.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Fri, 20 Jan 2012 19:18:09 +0100
parents ec8a9e06cf05
children b345f851d056
files mercurial/phases.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/phases.py	Fri Jan 20 18:45:29 2012 +0100
+++ b/mercurial/phases.py	Fri Jan 20 19:18:09 2012 +0100
@@ -276,14 +276,14 @@
         phase = int(phase)
         if phase == 0:
             if node != nullid:
-                msg = _('ignoring inconsistent public root from remote: %s')
-                repo.ui.warn(msg, nhex)
+                repo.ui.warn(_('ignoring inconsistent public root'
+                               ' from remote: %s\n') % nhex)
         elif phase == 1:
             if node in nodemap:
                 draftroots.append(node)
         else:
-            msg = _('ignoring unexpected root from remote: %i %s')
-            repo.ui.warn(msg, phase, nhex)
+            repo.ui.warn(_('ignoring unexpected root from remote: %i %s\n')
+                         % (phase, nhex))
     # compute heads
     revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
                       subset, draftroots, draftroots, subset)