[PATCH 3 of 6] phase: Fix warning text from invalide remote phase

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Jan 20 14:30:55 CST 2012


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1327083489 -3600
# Branch stable
# Node ID c70421e2c2cf21eac8e37fd46bf3cc35b9bde856
# Parent  ad5fac0e43e4167a302b9d687a3ac3e1c5811f51
phase: Fix warning text from invalide remote phase

add missing end of line and substitution.

diff --git a/mercurial/phases.py b/mercurial/phases.py
--- a/mercurial/phases.py
+++ b/mercurial/phases.py
@@ -276,14 +276,14 @@
         phase = int(phase)
         if phase == 0:
             if node != nullid:
-                msg = _('ignoring inconsistense public root from remote: %s')
-                repo.ui.warn(msg, nhex)
+                msg = _('ignoring inconsistense public root from remote: %s\n')
+                repo.ui.warn(msg % 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)
+            msg = _('ignoring unexpected root from remote: %i %s\n')
+            repo.ui.warn(msg % (phase, nhex))
     # compute heads
     revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
                       subset, draftroots, draftroots, subset)


More information about the Mercurial-devel mailing list