Mercurial > hg
comparison hgext/rebase.py @ 30459:bccd89b46cbf
rebase: move bookmark update to before rebase clearing
Bookmark fixing should probably happen before the rebase starts to clean up, so
let's move it before clearrebased. This will also help a future patch where we
want to add more clear logic to the existing clear section.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Thu, 10 Nov 2016 09:21:41 -0800 |
| parents | 318a24b52eeb |
| children | ee2097c560c1 |
comparison
equal
deleted
inserted
replaced
| 30458:0df215fba6cf | 30459:bccd89b46cbf |
|---|---|
| 480 newwd = self.originalwd | 480 newwd = self.originalwd |
| 481 if newwd not in [c.rev() for c in repo[None].parents()]: | 481 if newwd not in [c.rev() for c in repo[None].parents()]: |
| 482 ui.note(_("update back to initial working directory parent\n")) | 482 ui.note(_("update back to initial working directory parent\n")) |
| 483 hg.updaterepo(repo, newwd, False) | 483 hg.updaterepo(repo, newwd, False) |
| 484 | 484 |
| 485 if self.currentbookmarks: | |
| 486 with repo.transaction('bookmark') as tr: | |
| 487 updatebookmarks(repo, targetnode, nstate, | |
| 488 self.currentbookmarks, tr) | |
| 489 if self.activebookmark not in repo._bookmarks: | |
| 490 # active bookmark was divergent one and has been deleted | |
| 491 self.activebookmark = None | |
| 492 | |
| 485 if not self.keepf: | 493 if not self.keepf: |
| 486 collapsedas = None | 494 collapsedas = None |
| 487 if self.collapsef: | 495 if self.collapsef: |
| 488 collapsedas = newnode | 496 collapsedas = newnode |
| 489 clearrebased(ui, repo, self.state, self.skipped, collapsedas) | 497 clearrebased(ui, repo, self.state, self.skipped, collapsedas) |
| 490 | 498 |
| 491 with repo.transaction('bookmark') as tr: | |
| 492 if self.currentbookmarks: | |
| 493 updatebookmarks(repo, targetnode, nstate, | |
| 494 self.currentbookmarks, tr) | |
| 495 if self.activebookmark not in repo._bookmarks: | |
| 496 # active bookmark was divergent one and has been deleted | |
| 497 self.activebookmark = None | |
| 498 clearstatus(repo) | 499 clearstatus(repo) |
| 499 clearcollapsemsg(repo) | 500 clearcollapsemsg(repo) |
| 500 | 501 |
| 501 ui.note(_("rebase completed\n")) | 502 ui.note(_("rebase completed\n")) |
| 502 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) | 503 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) |