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

commands: get rid of empty try/finally block from _dobackout

Browse Source 
This diff is purely an indentation change to clean up a block that
was kept in place to make 4645e52058b4 easier to read.
This commit is contained in:
Bryan O'Sullivan 2016-01-11 09:49:47 -08:00
parent 459e92e905
commit eff9c7d54a
1 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/commands.py
View File

@ -632,7 +632,6 @@ def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
parent = p1
# the backout should appear on the same branch
try:
branch = repo.dirstate.branch()
bheads = repo.branchheads(branch)
rctx = scmutil.revsingle(repo, hex(parent))
@ -692,10 +691,6 @@ def _dobackout(ui, repo, node=None, rev=None, commit=False, **opts):
return hg.merge(repo, hex(repo.changelog.tip()))
finally:
ui.setconfig('ui', 'forcemerge', '', '')
finally:
# TODO: get rid of this meaningless try/finally enclosing.
# this is kept only to reduce changes in a patch.
pass
return 0
@command('bisect',