D1233: rebase: do not bail on uncomitted changes if rebasing in-memory
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Thu Dec 7 21:44:39 UTC 2017
phillco updated this revision to Diff 4198.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1233?vs=4179&id=4198
REVISION DETAIL
https://phab.mercurial-scm.org/D1233
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
@@ -784,7 +784,8 @@
return retcode
else:
destmap = _definedestmap(ui, repo, destf, srcf, basef, revf,
- destspace=destspace)
+ destspace=destspace,
+ inmemory=opts['inmemory'])
retcode = rbsrt._preparenewrebase(destmap)
if retcode is not None:
return retcode
@@ -804,7 +805,7 @@
rbsrt._finishrebase()
def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None,
- destspace=None):
+ destspace=None, inmemory=False):
"""use revisions argument to define destmap {srcrev: destrev}"""
if revf is None:
revf = []
@@ -818,8 +819,9 @@
if revf and srcf:
raise error.Abort(_('cannot specify both a revision and a source'))
- cmdutil.checkunfinished(repo)
- cmdutil.bailifchanged(repo)
+ if not inmemory:
+ cmdutil.checkunfinished(repo)
+ cmdutil.bailifchanged(repo)
if ui.configbool('commands', 'rebase.requiredest') and not destf:
raise error.Abort(_('you must specify a destination'),
To: phillco, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list