Show More
@@ -325,7 +325,7 b' class rebaseruntime(object):' | |||
|
325 | 325 | skippedset.update(obsoleteextinctsuccessors) |
|
326 | 326 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) |
|
327 | 327 | |
|
328 | def _prepareabortorcontinue(self, isabort): | |
|
328 | def _prepareabortorcontinue(self, isabort, backup=True): | |
|
329 | 329 | try: |
|
330 | 330 | self.restorestatus() |
|
331 | 331 | self.collapsemsg = restorecollapsemsg(self.repo, isabort) |
@@ -341,8 +341,8 b' class rebaseruntime(object):' | |||
|
341 | 341 | hint = _('use "hg rebase --abort" to clear broken state') |
|
342 | 342 | raise error.Abort(msg, hint=hint) |
|
343 | 343 | if isabort: |
|
344 | return abort(self.repo, self.originalwd, self.destmap, | |
|
345 |
|
|
|
344 | return abort(self.repo, self.originalwd, self.destmap, self.state, | |
|
345 | activebookmark=self.activebookmark, backup=backup) | |
|
346 | 346 | |
|
347 | 347 | def _preparenewrebase(self, destmap): |
|
348 | 348 | if not destmap: |
@@ -850,7 +850,8 b' def _dryrunrebase(ui, repo, **opts):' | |||
|
850 | 850 | ui.status(_('there will be no conflict, you can rebase\n')) |
|
851 | 851 | return 0 |
|
852 | 852 | finally: |
|
853 | rbsrt._prepareabortorcontinue(isabort=True) | |
|
853 | # no need to store backup in case of dryrun | |
|
854 | rbsrt._prepareabortorcontinue(isabort=True, backup=False) | |
|
854 | 855 | |
|
855 | 856 | def _dorebase(ui, repo, inmemory=False, **opts): |
|
856 | 857 | rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts)) |
@@ -1553,7 +1554,7 b' def needupdate(repo, state):' | |||
|
1553 | 1554 | |
|
1554 | 1555 | return False |
|
1555 | 1556 | |
|
1556 | def abort(repo, originalwd, destmap, state, activebookmark=None): | |
|
1557 | def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True): | |
|
1557 | 1558 | '''Restore the repository to its original state. Additional args: |
|
1558 | 1559 | |
|
1559 | 1560 | activebookmark: the name of the bookmark that should be active after the |
@@ -1598,7 +1599,7 b' def abort(repo, originalwd, destmap, sta' | |||
|
1598 | 1599 | |
|
1599 | 1600 | # Strip from the first rebased revision |
|
1600 | 1601 | if rebased: |
|
1601 | repair.strip(repo.ui, repo, strippoints) | |
|
1602 | repair.strip(repo.ui, repo, strippoints, backup=backup) | |
|
1602 | 1603 | |
|
1603 | 1604 | if activebookmark and activebookmark in repo._bookmarks: |
|
1604 | 1605 | bookmarks.activate(repo, activebookmark) |
@@ -212,7 +212,6 b' Check dryrun gives correct results when ' | |||
|
212 | 212 | rebasing 3:055a42cdd887 "d" |
|
213 | 213 | rebasing 4:e860deea161a "e" |
|
214 | 214 | there will be no conflict, you can rebase |
|
215 | saved backup bundle to $TESTTMP/repo1/repo2/skrepo/.hg/strip-backup/c83b1da5b1ae-f1e0beb9-backup.hg | |
|
216 | 215 | rebase aborted |
|
217 | 216 | |
|
218 | 217 | $ hg diff |
General Comments 0
You need to be logged in to leave comments.
Login now