Show More
@@ -325,7 +325,7 b' class rebaseruntime(object):' | |||||
325 | skippedset.update(obsoleteextinctsuccessors) |
|
325 | skippedset.update(obsoleteextinctsuccessors) | |
326 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) |
|
326 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | |
327 |
|
327 | |||
328 | def _prepareabortorcontinue(self, isabort, backup=True): |
|
328 | def _prepareabortorcontinue(self, isabort, backup=True, suppwarns=False): | |
329 | try: |
|
329 | try: | |
330 | self.restorestatus() |
|
330 | self.restorestatus() | |
331 | self.collapsemsg = restorecollapsemsg(self.repo, isabort) |
|
331 | self.collapsemsg = restorecollapsemsg(self.repo, isabort) | |
@@ -342,7 +342,8 b' class rebaseruntime(object):' | |||||
342 | raise error.Abort(msg, hint=hint) |
|
342 | raise error.Abort(msg, hint=hint) | |
343 | if isabort: |
|
343 | if isabort: | |
344 | return abort(self.repo, self.originalwd, self.destmap, self.state, |
|
344 | return abort(self.repo, self.originalwd, self.destmap, self.state, | |
345 |
activebookmark=self.activebookmark, backup=backup |
|
345 | activebookmark=self.activebookmark, backup=backup, | |
|
346 | suppwarns=suppwarns) | |||
346 |
|
347 | |||
347 | def _preparenewrebase(self, destmap): |
|
348 | def _preparenewrebase(self, destmap): | |
348 | if not destmap: |
|
349 | if not destmap: | |
@@ -851,7 +852,8 b' def _dryrunrebase(ui, repo, **opts):' | |||||
851 | return 0 |
|
852 | return 0 | |
852 | finally: |
|
853 | finally: | |
853 | # no need to store backup in case of dryrun |
|
854 | # no need to store backup in case of dryrun | |
854 |
rbsrt._prepareabortorcontinue(isabort=True, backup=False |
|
855 | rbsrt._prepareabortorcontinue(isabort=True, backup=False, | |
|
856 | suppwarns=True) | |||
855 |
|
857 | |||
856 | def _dorebase(ui, repo, inmemory=False, **opts): |
|
858 | def _dorebase(ui, repo, inmemory=False, **opts): | |
857 | rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts)) |
|
859 | rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts)) | |
@@ -1554,7 +1556,8 b' def needupdate(repo, state):' | |||||
1554 |
|
1556 | |||
1555 | return False |
|
1557 | return False | |
1556 |
|
1558 | |||
1557 |
def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True |
|
1559 | def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True, | |
|
1560 | suppwarns=False): | |||
1558 | '''Restore the repository to its original state. Additional args: |
|
1561 | '''Restore the repository to its original state. Additional args: | |
1559 |
|
1562 | |||
1560 | activebookmark: the name of the bookmark that should be active after the |
|
1563 | activebookmark: the name of the bookmark that should be active after the | |
@@ -1607,7 +1610,8 b' def abort(repo, originalwd, destmap, sta' | |||||
1607 | finally: |
|
1610 | finally: | |
1608 | clearstatus(repo) |
|
1611 | clearstatus(repo) | |
1609 | clearcollapsemsg(repo) |
|
1612 | clearcollapsemsg(repo) | |
1610 | repo.ui.warn(_('rebase aborted\n')) |
|
1613 | if not suppwarns: | |
|
1614 | repo.ui.warn(_('rebase aborted\n')) | |||
1611 | return 0 |
|
1615 | return 0 | |
1612 |
|
1616 | |||
1613 | def sortsource(destmap): |
|
1617 | def sortsource(destmap): |
@@ -212,7 +212,6 b' Check dryrun gives correct results when ' | |||||
212 | rebasing 3:055a42cdd887 "d" |
|
212 | rebasing 3:055a42cdd887 "d" | |
213 | rebasing 4:e860deea161a "e" |
|
213 | rebasing 4:e860deea161a "e" | |
214 | there will be no conflict, you can rebase |
|
214 | there will be no conflict, you can rebase | |
215 | rebase aborted |
|
|||
216 |
|
215 | |||
217 | $ hg diff |
|
216 | $ hg diff | |
218 | $ hg status |
|
217 | $ hg status | |
@@ -245,7 +244,6 b' Check dryrun working with --collapse whe' | |||||
245 | rebasing 3:055a42cdd887 "d" |
|
244 | rebasing 3:055a42cdd887 "d" | |
246 | rebasing 4:e860deea161a "e" |
|
245 | rebasing 4:e860deea161a "e" | |
247 | there will be no conflict, you can rebase |
|
246 | there will be no conflict, you can rebase | |
248 | rebase aborted |
|
|||
249 |
|
247 | |||
250 | Check dryrun gives correct results when there is conflict in rebasing |
|
248 | Check dryrun gives correct results when there is conflict in rebasing | |
251 | Make a conflict: |
|
249 | Make a conflict: | |
@@ -285,7 +283,6 b' Make a conflict:' | |||||
285 | transaction abort! |
|
283 | transaction abort! | |
286 | rollback completed |
|
284 | rollback completed | |
287 | hit a merge conflict |
|
285 | hit a merge conflict | |
288 | rebase aborted |
|
|||
289 | [1] |
|
286 | [1] | |
290 | $ hg diff |
|
287 | $ hg diff | |
291 | $ hg status |
|
288 | $ hg status | |
@@ -321,5 +318,4 b' Check dryrun working with --collapse whe' | |||||
321 | rebasing 4:e860deea161a "e" |
|
318 | rebasing 4:e860deea161a "e" | |
322 | merging e |
|
319 | merging e | |
323 | hit a merge conflict |
|
320 | hit a merge conflict | |
324 | rebase aborted |
|
|||
325 | [1] |
|
321 | [1] |
General Comments 0
You need to be logged in to leave comments.
Login now