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.
test: use generaldelta in 'test-clonebundle.t'
Using generaldelta has effects on the generated bundle.
test: use generaldelta in 'test-ssh.t'
This has effects on the capabilities string.
test: use generaldelta in 'test-ssh-bundle1.t'
This has effect on the capabilities string.
test: use generaldelta in 'test-strip.t'
This has minor effects on test output.
test: use generaldelta in 'test-rebase-newancestors.t'
This has some minor effects on test output.
test: use general delta for 'test-commit-amend.t'
Using general delta introduces harmless changes to some of the test output.
test: wider matching in 'test-clone-r.t'
The test is already somewhat resistant to changes from general delta. We make
it wider to catch expected differences.
test: use generaldelta in 'test-bundle-type.t'
Generaldelta changes some of the default targets for 'hg bundle'. All cases are
already properly tested but some ambiguous specifications are affected.