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.
--- a/hgext/rebase.py Fri Oct 28 17:44:28 2016 +0200
+++ b/hgext/rebase.py Thu Nov 10 09:21:41 2016 -0800
@@ -482,19 +482,20 @@
ui.note(_("update back to initial working directory parent\n"))
hg.updaterepo(repo, newwd, False)
+ if self.currentbookmarks:
+ with repo.transaction('bookmark') as tr:
+ updatebookmarks(repo, targetnode, nstate,
+ self.currentbookmarks, tr)
+ if self.activebookmark not in repo._bookmarks:
+ # active bookmark was divergent one and has been deleted
+ self.activebookmark = None
+
if not self.keepf:
collapsedas = None
if self.collapsef:
collapsedas = newnode
clearrebased(ui, repo, self.state, self.skipped, collapsedas)
- with repo.transaction('bookmark') as tr:
- if self.currentbookmarks:
- updatebookmarks(repo, targetnode, nstate,
- self.currentbookmarks, tr)
- if self.activebookmark not in repo._bookmarks:
- # active bookmark was divergent one and has been deleted
- self.activebookmark = None
clearstatus(repo)
clearcollapsemsg(repo)