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

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

share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...
share: wrap bmstore._writerepo for transaction sensitivity (issue4940) 46dec89fe888 made 'bmstore.write()' transaction sensitive, to restore original bookmarks correctly at failure of a transaction. For example, shelve and unshelve imply steps below: before 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' writes updated ones into .hg/bookmarks 3. rollback transaction to remove internal commits 4. restore updated bookmarks manually after 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' doesn't write updated ones into .hg/bookmarks (these are written into .hg/bookmarks.pending, if external hook is spawn) 3. rollback transaction to remove internal commits 4. .hg/bookmarks should be clean, because it isn't changed while transaction running: see (2) above But if shelve or unshelve is executed in the repository created with "shared bookmarks" ("hg share -B"), this doesn't work as expected, because: - share extension makes 'bmstore.write()' write updated bookmarks into .hg/bookmarks of shared source repository regardless of transaction activity, and - intentional transaction failure at the end of shelve/unshelve doesn't restore already updated .hg/bookmarks of shared source This patch makes share extension wrap 'bmstore._writerepo()' instead of 'bmstore.write()', because the former is used to actually write bookmark changes out.
Gregory Szorc - - Load All Authors

File last commit:

r26066:89872688 default
r26933:a7eecd02 stable
Show More
bzr-definitions
16 lines | 327 B | text/plain | TextLexer
/ tests / bzr-definitions
History | Source | Raw |Copy content |Copy permalink
Marek Kubica
convert: add bzr source
 r7053 # this file holds the definitions that are used in various bzr tests
Brodie Rao
tests: remove more instances of export FOO=bar bashism
 r9042 TERM=dumb; export TERM
Marek Kubica
convert: add bzr source
 r7053 echo '[extensions]' >> $HGRCPATH
echo 'convert = ' >> $HGRCPATH
glog()
{
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
Marek Kubica
convert: add bzr source
 r7053 }
manifest()
{
echo "% manifest of $2"
hg -R $1 manifest -v -r $2
}