Christian Delahousse <cdelahousse@fb.com> [Thu, 12 Nov 2015 16:56:06 -0600] rev 26937
cmdutil: add origbackuppath helper
Ryan McElroy <rmcelroy@fb.com> [Tue, 10 Nov 2015 11:16:25 -0800] rev 26936
discovery: pass pushop to _nowarnheads
Previously, we passed only enough information to _nowarnheads to perform the old
calculation. However, extensions may want to use more information in this
calculation. Now that pushop is extensible, extensions will often want access
to the additional fields they have added to the pushop, so pass that through.
Specifically, the remotenames extension will use this information to allow
pushing new heads that are bookmarked without requiring --force.
Ryan McElroy <rmcelroy@fb.com> [Tue, 10 Nov 2015 11:13:21 -0800] rev 26935
exchange: pass pushop to discovery.checkheads
Previously, we passed a bunch of parameters to discovery.checkheads, but all
of the arguments can be fetched out of pushop, which may contain a lot more
useful information for extensions now that pushop is extensible.
Matt Mackall <mpm@selenic.com> [Thu, 12 Nov 2015 15:26:30 -0600] rev 26934
merge with 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.
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.
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.
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.
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.
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 12:09:18 +0200] rev 26927
test: use general delta for 'test-commit-amend.t'
Using general delta introduces harmless changes to some of the test output.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 11:50:55 +0200] rev 26926
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 11:48:49 +0200] rev 26925
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.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 10:46:59 +0200] rev 26924
test: use generaldelta in 'test-patchbomb.t'
Using generaldelta changes the default type of bombed bundle.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 10:37:07 +0200] rev 26923
test: use generaldelta for test-bundle.t
This impacts tests of the 'packed' feature. We can safely accept the new output
because the 'v1' format is not restricted to old revlog format, the requirements
are properly advertised to the client.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 20 Oct 2015 03:14:36 +0200] rev 26922
test: use generaldelta in 'test-rebase-conflict.t'
Doing this has some minor impacts on test output since the rebase
backup bundle moves to bundle2.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 Oct 2015 15:25:58 +0200] rev 26921
tests: test generaldelta configuration in test-init.t
We turn the feature on for the whole test and test that it can properly be
disabled through the config.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 Oct 2015 11:28:31 +0200] rev 26920
test: enable generaldelta early in 'test-treemanifest.t'
Having generaldelta on results in minor test output changes (as we are staring
at the revlog).
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 19 Oct 2015 10:48:02 +0200] rev 26919
test: enable generaldelta in 'test-copy.t'
Doing so has a minimal impact on the test.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 18 Oct 2015 19:04:29 +0200] rev 26918
test: enable generaldelta in 'test-debugcommand.t'
The test logic is not affected by generaldelta, so we move it to
generaldelta early. Some of the fuzzy matching had to be extended to
cover "delta".
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 18 Oct 2015 18:55:32 +0200] rev 26917
test: use generaldelta in test-manifestv2.t
Generaldelta and bundle2 have no real influence on this test. So we can safely
switch it early.
Pierre-Yves David <pierre-yves.david@fb.com> [Sun, 18 Oct 2015 18:36:39 +0200] rev 26916
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
This induces some trivial changes in the tests. This happen in its own changeset
for clarity purposes.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 16 Oct 2015 02:54:52 +0100] rev 26915
test: using generaldelta in 'test-lfconvert.t'
This leads to a harmless test change.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 12 Nov 2015 02:52:19 -0800] rev 26914
test: enforce generaldelta format with the right option
The option that will become true by default is now 'usegeneraldelta' We have to
adjust the change made in
b75fed55f6dc to actually achieve its goal.