D3827: rebase: no need to store backup in case of dryrun
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Fri Jun 29 14:09:18 EDT 2018
khanchi97 updated this revision to Diff 9357.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3827?vs=9345&id=9357
REVISION DETAIL
https://phab.mercurial-scm.org/D3827
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-inmemory.t
CHANGE DETAILS
diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -212,7 +212,6 @@
rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e"
there will be no conflict, you can rebase
- saved backup bundle to $TESTTMP/repo1/repo2/skrepo/.hg/strip-backup/c83b1da5b1ae-f1e0beb9-backup.hg
rebase aborted
$ hg diff
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -325,7 +325,7 @@
skippedset.update(obsoleteextinctsuccessors)
_checkobsrebase(self.repo, self.ui, obsoleteset, skippedset)
- def _prepareabortorcontinue(self, isabort):
+ def _prepareabortorcontinue(self, isabort, backup=True):
try:
self.restorestatus()
self.collapsemsg = restorecollapsemsg(self.repo, isabort)
@@ -341,8 +341,8 @@
hint = _('use "hg rebase --abort" to clear broken state')
raise error.Abort(msg, hint=hint)
if isabort:
- return abort(self.repo, self.originalwd, self.destmap,
- self.state, activebookmark=self.activebookmark)
+ return abort(self.repo, self.originalwd, self.destmap, self.state,
+ activebookmark=self.activebookmark, backup=backup)
def _preparenewrebase(self, destmap):
if not destmap:
@@ -849,7 +849,8 @@
ui.status(_('there will be no conflict, you can rebase\n'))
return 0
finally:
- rbsrt._prepareabortorcontinue(isabort=True)
+ # no need to store backup in case of dryrun
+ rbsrt._prepareabortorcontinue(isabort=True, backup=False)
def _dorebase(ui, repo, inmemory=False, **opts):
opts = pycompat.byteskwargs(opts)
@@ -1552,7 +1553,7 @@
return False
-def abort(repo, originalwd, destmap, state, activebookmark=None):
+def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True):
'''Restore the repository to its original state. Additional args:
activebookmark: the name of the bookmark that should be active after the
@@ -1597,7 +1598,7 @@
# Strip from the first rebased revision
if rebased:
- repair.strip(repo.ui, repo, strippoints)
+ repair.strip(repo.ui, repo, strippoints, backup=backup)
if activebookmark and activebookmark in repo._bookmarks:
bookmarks.activate(repo, activebookmark)
To: khanchi97, #hg-reviewers
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list