Thu, 12 Nov 2015 15:26:30 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 12 Nov 2015 15:26:30 -0600] rev 26934
merge with stable
Fri, 13 Nov 2015 02:36:30 +0900 share: wrap bmstore._writerepo for transaction sensitivity (issue4940) stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 13 Nov 2015 02:36:30 +0900] rev 26933
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.
Sat, 07 Nov 2015 13:48:42 -0500 test: use generaldelta in 'test-clonebundle.t'
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 07 Nov 2015 13:48:42 -0500] rev 26932
test: use generaldelta in 'test-clonebundle.t' Using generaldelta has effects on the generated bundle.
Tue, 20 Oct 2015 13:14:04 +0200 test: use generaldelta in 'test-ssh.t'
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 13:14:04 +0200] rev 26931
test: use generaldelta in 'test-ssh.t' This has effects on the capabilities string.
Tue, 20 Oct 2015 13:14:31 +0200 test: use generaldelta in 'test-ssh-bundle1.t'
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 13:14:31 +0200] rev 26930
test: use generaldelta in 'test-ssh-bundle1.t' This has effect on the capabilities string.
Tue, 20 Oct 2015 13:09:43 +0200 test: use generaldelta in 'test-strip.t'
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 13:09:43 +0200] rev 26929
test: use generaldelta in 'test-strip.t' This has minor effects on test output.
Tue, 20 Oct 2015 12:39:49 +0200 test: use generaldelta in 'test-rebase-newancestors.t'
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 12:39:49 +0200] rev 26928
test: use generaldelta in 'test-rebase-newancestors.t' This has some minor effects on test output.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 tip