Mercurial > public > mercurial-scm > hg
comparison mercurial/hbisect.py @ 36828:80da79b6fbe4
py3: fix integer formatting in bisect error
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Tue, 06 Mar 2018 07:10:50 -0600 |
parents | 8287df8b7be5 |
children | 71f189941791 |
comparison
equal
deleted
inserted
replaced
36827:12492794bf8c | 36828:80da79b6fbe4 |
---|---|
53 bad = changelog.node(badrev) | 53 bad = changelog.node(badrev) |
54 if not ancestors: # now we're confused | 54 if not ancestors: # now we're confused |
55 if (len(state['bad']) == 1 and len(state['good']) == 1 and | 55 if (len(state['bad']) == 1 and len(state['good']) == 1 and |
56 state['bad'] != state['good']): | 56 state['bad'] != state['good']): |
57 raise error.Abort(_("starting revisions are not directly related")) | 57 raise error.Abort(_("starting revisions are not directly related")) |
58 raise error.Abort(_("inconsistent state, %s:%s is good and bad") | 58 raise error.Abort(_("inconsistent state, %d:%s is good and bad") |
59 % (badrev, short(bad))) | 59 % (badrev, short(bad))) |
60 | 60 |
61 # build children dict | 61 # build children dict |
62 children = {} | 62 children = {} |
63 visit = collections.deque([badrev]) | 63 visit = collections.deque([badrev]) |