Mercurial > hg
diff mercurial/bookmarks.py @ 26520:46dec89fe888
bookmarks: use recordchange instead of writing if transaction is active
Before this patch, 'bmstore.write()' always write in-memory bookmark
changes into '.hg/bookmarks' regardless of transaction activity.
If 'bmstore.write()' is invoked inside a transaction and it writes
changes into '.hg/bookmarks', then:
- original bookmarks aren't restored at failure of that transaction
This breaks "all or nothing" policy of the transaction.
BTW, "hg rollback" can restore bookmarks successfully even before
this patch, because original bookmarks are saved into
'.hg/journal.bookmarks' at the beginning of the transaction, and
it (actually renamed as '.hg/undo.bookmarks') is used by "hg
rollback".
- uncommitted bookmark changes are visible to other processes
This is a kind of "dirty read"
For example, 'rebase.rebase()' implies 'bmstore.write()', and it may
be executed inside the transaction of "hg unshelve". Then, intentional
aborting at the end of "hg unshelve" transaction doesn't restore
original bookmarks (this is obviously a bug).
This patch uses 'bmstore.recordchange()' instead of actual writing by
'bmstore._writerepo()', if any transaction is active
This patch also removes meaningless restoring bmstore explicitly at
the end of "hg shelve".
This patch doesn't choose fixing each 'bmstore.write()' callers as
like below, because writing similar code here and there is very
redundant.
before:
bmstore.write()
after:
tr = repo.currenttransaction()
if tr:
bmstore.recordchange(tr)
else:
bmstore.write()
Even though 'bmstore.write()' itself may have to be discarded by
putting bookmark operations into transaction scope, this patch chose
fixing it to implement "transactional dirstate" at first.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 08 Oct 2015 01:41:30 +0900 |
parents | 0b57b77f9b3e |
children | 1aee2ab0f902 |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Wed Oct 07 00:27:23 2015 -0700 +++ b/mercurial/bookmarks.py Thu Oct 08 01:41:30 2015 +0900 @@ -95,6 +95,14 @@ l = repo._wlockref and repo._wlockref() if l is None or not l.held: repo.ui.develwarn('bookmarks write with no wlock') + + tr = repo.currenttransaction() + if tr: + self.recordchange(tr) + # invalidatevolatilesets() is omitted because this doesn't + # write changes out actually + return + self._writerepo(repo) repo.invalidatevolatilesets()