From patchwork Sat Mar 10 08:11:12 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2,of,5] py3: fix integer formatting in bisect error
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 29241
Message-Id: <f4f4de07f3d1cd9c9bf3.1520669472@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Sat, 10 Mar 2018 17:11:12 +0900

# 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

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