Patchwork D3849: rebase: refactor dryrun implementation

login
register
mail settings
Submitter phabricator
Date June 28, 2018, 12:31 p.m.
Message ID <d2f2387048f676d6cce91dbc65536c62@localhost.localdomain>
Download mbox | patch
Permalink /patch/32479/
State Not Applicable
Headers show

Comments

phabricator - June 28, 2018, 12:31 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG56b2074114b1: rebase: refactor dryrun implementation (authored by khanchi97, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3849?vs=9324&id=9335

REVISION DETAIL
  https://phab.mercurial-scm.org/D3849

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: khanchi97, #hg-reviewers
Cc: yuja, mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -818,19 +818,23 @@ 
         opts[r'dest'] = '_destautoorphanrebase(SRC)'
 
     if dryrun:
+        leaveunfinished = True
+        inmemory = True
+        rbsrt = rebaseruntime(repo, ui, inmemory, opts)
         try:
             overrides = {('rebase', 'singletransaction'): True}
             with ui.configoverride(overrides, 'rebase'):
-                _origrebase(ui, repo, inmemory=True, leaveunfinished=True,
-                            **opts)
+                _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
+                            leaveunfinished=leaveunfinished, **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:
-            _origrebase(ui, repo, abort=True)
+            with repo.wlock(), repo.lock():
+                rbsrt._prepareabortorcontinue(isabort=True)
     elif inmemory:
         try:
             # in-memory merge doesn't support conflicts, so if we hit any, abort
@@ -846,9 +850,11 @@ 
     else:
         return _origrebase(ui, repo, **opts)
 
-def _origrebase(ui, repo, inmemory=False, leaveunfinished=False, **opts):
+def _origrebase(ui, repo, inmemory=False, leaveunfinished=False, rbsrt=None,
+                **opts):
     opts = pycompat.byteskwargs(opts)
-    rbsrt = rebaseruntime(repo, ui, inmemory, opts)
+    if not rbsrt:
+        rbsrt = rebaseruntime(repo, ui, inmemory, opts)
 
     with repo.wlock(), repo.lock():
         # Validate input and define rebasing points