exchange: fix bad indentation Those two lines where double indented for no good reasons. This is backport of 71931b789424.

exchange: propagate arguments to the _getbundleextrapart function The arguments was wrongly propagated (again). This a backport of 0055b5b3eb9c

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

discovery: if a push would create a new head, mention the bookmark name if any

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.

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.

revert: group related data in tuple in the dispatch table The dispatch table used to be: - action if in target manifest - action if not in target manifest - make backup if in target manifest - make backup if not in target manifest We turn this into two (action, make backup) tuples. This helps both readability of the dispatch table and handling of each case. This also prepares a refactoring where the different actions we performs, whether "file is in target manifest" or not, are determined before reaching this loop.

revert: group action into a single dictionary We had 4 different variables to hold the list of the 4 possibles actions. I'm grouping them in a single dictionary for a few reasons. First, it makes it clearer they are all related and meant to be the final actions performed by revert. Second this simplifies the parameter of the _performrevert function. Finally the two elements in each entry (list and message) have a different consumers in different functions, this change will make it easier to split them in a later commit.

revert: add some inline comments I spend some time understanding how this part of the revert code is working. I'm adding some comments to help the code readability. I expect most of them to disappear in a coming refactoring. But the refactoring should be easier to follow with the comment.

revert: cosmetic align of the dispatch table This changeset make a minimal cosmetic change to help readability of the value in this table.