merge with fix

[qsync] fix: 'newerversion' expect node id, not hexid

merge back with stable tag

Added tag 0.2.0 for changeset d3f20770b86a

Merge with Patrick improvement

obsolete: do not obsolete rebase --detach nullmerge revs Rebase state contains the changesets to rebase as well as 'nullmerge' entries used drive the merge strategy. These nullmerge were not rebased and should be ignored, and certainly not be marked obsolete.

evolve: fix relocate() with removed revision relocate() was not handling the case where the rebased revision was discarded and was raising when trying to update the phase of None.

test-obsolete-rebase.t: test --abort and --continue

obsolete: handle rebase --collapse Recording obsolete in concludenode() did not work for --collapse because only the first revision was passed to the call. The new strategy is to track the rebase state in defineparents() and concludenode() and to create markers only after a successful non-abort call. In theory, this should also fix --continue/--abort cases. The change in test-stabilize-order.t comes from concludenode() no longer creating obsolete marker. stabilize command was actually duplicating markers, once in concludenode(), once explicitely.

test-stabilize-order.t: trace obsolete markers Will prevent breakage in rebase.concludenode() overriding.

test-obsolete-rebase.t: move --keep test from test-obsolete.t

obsolete: handle rebase removing empty changesets The new revision identifier returned by concludenode() was None and was not correctly translated to nullid.

obsolete: add or fix debug commands help

obsolete: do not duplicate command help

obsolete: use new-style command registration

obsolete: make rebase abort with --keep obsolete modifies rebase to mark rebased changesets obsolete instead of stripping them, which makes --keep irrelevant.

obsolete: fix rebase wrapping ui and repo arguments were swapped which made --keep calls traceback.

obsolete: add debugsuccessors command It dumps obsolete changesets and their successors.

evolve: add alias for kill and stabilize

merge with 0.1.0 tag

Added tag 0.1.0 for changeset 6c6bb7a23bb5

stabilize: improve unstable selection heuristic Without argument, stabilize was picking the first in: "unstable() and ((suspended() or obsancestors(::.))::)" which usually returned the "oldest" unstable revision in parent predecessors descendants. This revision is interesting because it usually gives "soft" merges but rebasing it left the working directory on a remote branch, which was very confusing. The new heuristic picks an unstable changeset which can be rebased on top of the parent revision, or on top of one of its descendants (selected in revision order). This has the advantage of selecting a revision which can be rebased on the current subtree, and leave the working directory in a more convenient location.

amend: remove useless repo.changelog alias

README: some more changes

merge with Arne changes

amend: do not traceback on no-ops If rewrite() generated changeset happened to be an existing one, the call would traceback when trying to obsolete the changeset with itself. Instead, leave gracefully, marking any intermediate changeset extinct.

amend: do not rely on revsingle() default for --change

amend: drop --branches, pick it from working directory The amended changeset branch was picked either from --branch or from the first parent, but the actual working directory branch was ignored. The behaviour is changed so the amended revision branch is picked from the intermediate revision, which branch comes from the usual working directory rules. --branch is thus replaced by "hg branch".