D3855: rebase: extract dryrun as a function
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Fri Jun 29 21:47:24 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc92fdc27cbdd: rebase: extract dryrun as a function (authored by khanchi97, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D3855?vs=9355&id=9370#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3855?vs=9355&id=9370
REVISION DETAIL
https://phab.mercurial-scm.org/D3855
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -818,22 +818,7 @@
opts[r'dest'] = '_destautoorphanrebase(SRC)'
if dryrun:
- rbsrt = rebaseruntime(repo, ui, inmemory=True,
- opts=pycompat.byteskwargs(opts))
- with repo.wlock(), repo.lock():
- try:
- overrides = {('rebase', 'singletransaction'): True}
- with ui.configoverride(overrides, 'rebase'):
- _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
- leaveunfinished=True, **opts)
- except error.InMemoryMergeConflictsError:
- ui.status(_('hit a merge conflict\n'))
- return 1
- else:
- ui.status(_('there will be no conflict, you can rebase\n'))
- return 0
- finally:
- rbsrt._prepareabortorcontinue(isabort=True)
+ return _dryrunrebase(ui, repo, **opts)
elif inmemory:
try:
# in-memory merge doesn't support conflicts, so if we hit any, abort
@@ -849,6 +834,24 @@
else:
return _origrebase(ui, repo, **opts)
+def _dryrunrebase(ui, repo, **opts):
+ rbsrt = rebaseruntime(repo, ui, inmemory=True,
+ opts=pycompat.byteskwargs(opts))
+ with repo.wlock(), repo.lock():
+ try:
+ overrides = {('rebase', 'singletransaction'): True}
+ with ui.configoverride(overrides, 'rebase'):
+ _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
+ leaveunfinished=True, **opts)
+ except error.InMemoryMergeConflictsError:
+ ui.status(_('hit a merge conflict\n'))
+ return 1
+ else:
+ ui.status(_('there will be no conflict, you can rebase\n'))
+ return 0
+ finally:
+ rbsrt._prepareabortorcontinue(isabort=True)
+
def _origrebase(ui, repo, inmemory=False, leaveunfinished=False, rbsrt=None,
**opts):
opts = pycompat.byteskwargs(opts)
To: khanchi97, #hg-reviewers
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list