##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

bookmarks: use recordchange instead of writing if transaction is active...
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.
Augie Fackler - - Load All Authors

File last commit:

r26073:5ef327e9 default
r26520:46dec89f default
Show More
progress.py
17 lines | 705 B | text/x-python | PythonLexer
/ hgext / progress.py
History | Source | Raw |Copy content |Copy permalink
Augie Fackler
Progress bar extension
 r10434 # progress.py show progress bars for some actions
#
# Copyright (C) 2010 Augie Fackler <durin42@gmail.com>
#
Augie Fackler
progress: Use the same GPL boilerplate as most hg files
 r15772 # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Augie Fackler
Progress bar extension
 r10434
Pierre-Yves David
progress: deprecate the progress extension...
 r25522 """show progress bars for some actions (DEPRECATED)
Augie Fackler
Progress bar extension
 r10434
Pierre-Yves David
progress: deprecate the progress extension...
 r25522 This extension has been merged into core, you can remove it from your config.
See hg help config.progress for configuration options.
Augie Fackler
Progress bar extension
 r10434 """
Augie Fackler
progress: restore testedwith to the stub...
 r26073 # Note for extension authors: ONLY specify testedwith = 'internal' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = 'internal'