[PATCH 1 of 2 V2] rebase: move bookmark update to before rebase clearing
Durham Goode
durham at fb.com
Thu Nov 10 17:27:54 UTC 2016
# HG changeset patch
# User Durham Goode <durham at fb.com>
# Date 1478798501 28800
# Thu Nov 10 09:21:41 2016 -0800
# Node ID 03bc2afdfa26ad5ab057a28ac037524407ca5a92
# Parent 3fd53cc1aad882ac9191d7388885acdbbc2d7103
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.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -482,19 +482,20 @@ class rebaseruntime(object):
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)
More information about the Mercurial-devel
mailing list