Sean Farley <sean.michael.farley@gmail.com> [Fri, 20 Sep 2013 22:07:58 -0500] rev 21587
committablectx: add subrev method to return None
This allows a future patch to use object oriented style to remove an if
statement in the status method.
Sean Farley <sean.michael.farley@gmail.com> [Fri, 20 Sep 2013 21:55:42 -0500] rev 21586
basectx: add subrev method to return the rev of a subrepo given a subpath
This will be used in an upcoming patch to simplify the status method by
eliminating an if block.
Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 17:41:20 -0700] rev 21585
merge with stable
Durham Goode <durham@fb.com> [Wed, 07 May 2014 17:24:19 -0700] rev 21584
bundle2: fix bundle2 pulling all revs on empty pulls
When bundle2 was enabled, if hg pull had no commits to pull, it would print
'no changes found' and then download the entire repository from the server. This
was caused by heads and common being set to None, which gets treated as
heads=cl.heads() and common=[nullid], which means download the entire repo.
Pulling bundles without a changegroup is a valid use case (like if we're just
updating bookmarks), so this modifes the bundle code to allow not adding
changegroups.
This is backport of ab5040cd5749.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 07 May 2014 19:26:15 -0700] rev 21583
exchange: fix bad indentation
Those two lines where double indented for no good reasons.
This is backport of 71931b789424.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 07 May 2014 19:28:17 -0700] rev 21582
exchange: propagate arguments to the _getbundleextrapart function
The arguments was wrongly propagated (again).
This a backport of 0055b5b3eb9c
Durham Goode <durham@fb.com> [Wed, 07 May 2014 17:20:38 -0700] rev 21581
bundle2: fix configuration name mismatch
During pulls bundle2 was checking server.bundle2, but during pushes it was
checking experimental.bundle2. This makes them both experimental.bundle2.
This is a backport of 750c7c14a637
Stephen Lee <sphen.lee@gmail.com> [Sat, 08 Mar 2014 19:02:39 +1100] rev 21580
discovery: if a push would create a new head, mention the bookmark name if any
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 10:38:05 -0700] rev 21579
revert: use p2 as parent when reverting against it
revert was always using p1 as parent. This created some minor misbehavior when
reverting against p2. See test change for an example of that.
This is also a useful cleanup for coming refactoring to revert.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 14 May 2014 10:37:25 -0700] rev 21578
revert: explicitly get status against the parent
This makes absolutely no functional changes. The default value for
node1 is already the same as the current value of parent. But to be
able to properly use the second parent in merge context, we have to
start to be a bit more explicit about what we compute the status
against.