Patchwork [2,of,5] py3: fix integer formatting in bisect error

login
register
mail settings
Submitter Yuya Nishihara
Date March 10, 2018, 8:11 a.m.
Message ID <f4f4de07f3d1cd9c9bf3.1520669472@mimosa>
Download mbox | patch
Permalink /patch/29241/
State Accepted
Headers show

Comments

Yuya Nishihara - March 10, 2018, 8:11 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520341850 21600
#      Tue Mar 06 07:10:50 2018 -0600
# Node ID f4f4de07f3d1cd9c9bf3ca94adce78e8b4ae446e
# Parent  7742cc1155b78a819ee1ecce7783c36bec42548e
py3: fix integer formatting in bisect error

Patch

diff --git a/mercurial/hbisect.py b/mercurial/hbisect.py
--- a/mercurial/hbisect.py
+++ b/mercurial/hbisect.py
@@ -55,7 +55,7 @@  def bisect(repo, state):
         if (len(state['bad']) == 1 and len(state['good']) == 1 and
             state['bad'] != state['good']):
             raise error.Abort(_("starting revisions are not directly related"))
-        raise error.Abort(_("inconsistent state, %s:%s is good and bad")
+        raise error.Abort(_("inconsistent state, %d:%s is good and bad")
                          % (badrev, short(bad)))
 
     # build children dict