facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

bisect: move 'printresult' in the 'hbisect' module

Browse Source 
The logic is already extracted into a closure. We move it into the module
dedicated to bisect.

A minor change is applied: the creation of the 'displayer' is kept in the main
command function, it remove the needs to import 'cmdutil' in 'hbisect'. This
would create an import circle otherwise.
This commit is contained in:
Pierre-Yves David 2016-08-24 04:19:11 +02:00
parent 88806a61a8
commit 452cc705b7
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mercurial/commands.py
View File

@ -835,33 +835,6 @@ def bisect(ui, repo, rev=None, extra=None, command=None,
Returns 0 on success.
"""
def print_result(nodes, good):
displayer = cmdutil.show_changeset(ui, repo, {})
if len(nodes) == 1:
# narrowed it down to a single revision
if good:
ui.write(_("The first good revision is:\n"))
else:
ui.write(_("The first bad revision is:\n"))
displayer.show(repo[nodes[0]])
extendnode = hbisect.extendrange(repo, state, nodes, good)
if extendnode is not None:
ui.write(_('Not all ancestors of this changeset have been'
' checked.\nUse bisect --extend to continue the '
'bisection from\nthe common ancestor, %s.\n')
% extendnode)
else:
# multiple possible revisions
if good:
ui.write(_("Due to skipped revisions, the first "
"good revision could be any of:\n"))
else:
ui.write(_("Due to skipped revisions, the first "
"bad revision could be any of:\n"))
for n in nodes:
displayer.show(repo[n])
displayer.close()
def check_state(state, interactive=True):
if not state['good'] or not state['bad']:
if (good or bad or skip or reset) and interactive:
@ -937,7 +910,8 @@ def bisect(ui, repo, rev=None, extra=None, command=None,
finally:
state['current'] = [node]
hbisect.save_state(repo, state)
print_result(nodes, bgood)
displayer = cmdutil.show_changeset(ui, repo, {})
hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
return
# update state
@ -976,7 +950,8 @@ def bisect(ui, repo, rev=None, extra=None, command=None,
raise error.Abort(_("nothing to extend"))
if changesets == 0:
print_result(nodes, good)
displayer = cmdutil.show_changeset(ui, repo, {})
hbisect.printresult(ui, repo, state, displayer, nodes, good)
else:
assert len(nodes) == 1 # only a single node can be tested next
node = nodes[0]

26
mercurial/hbisect.py
View File

@ -279,3 +279,29 @@ def shortlabel(label):
return label[0].upper()
return None
def printresult(ui, repo, state, displayer, nodes, good):
if len(nodes) == 1:
# narrowed it down to a single revision
if good:
ui.write(_("The first good revision is:\n"))
else:
ui.write(_("The first bad revision is:\n"))
displayer.show(repo[nodes[0]])
extendnode = extendrange(repo, state, nodes, good)
if extendnode is not None:
ui.write(_('Not all ancestors of this changeset have been'
' checked.\nUse bisect --extend to continue the '
'bisection from\nthe common ancestor, %s.\n')
% extendnode)
else:
# multiple possible revisions
if good:
ui.write(_("Due to skipped revisions, the first "
"good revision could be any of:\n"))
else:
ui.write(_("Due to skipped revisions, the first "
"bad revision could be any of:\n"))
for n in nodes:
displayer.show(repo[n])
displayer.close()