rebase: improve help text - add a paragraph about default dest/source changesets - option help: say "changeset" not "revision" - option help: explain -b/--base better - clarify that -a/--abort and -c/--continue are different from the other options

serve: fix port config

merge with other head, will show bug in hg serve

test-serve: Show if port config and option are correctly used this will break in d3f27d15c9cb

drop (default: 8000), non-zero default is automatically added to help

make expression shorter, now the line fits into 80 chars

serve: fix options recording, trailing whitespace

serve: allow --port=0 to specify "server chooses the port number"

rebase: improve output of hg pull --rebase (issue2072)

shrink-revlog: factor out postorder algorithm

shrink-revlog: factor out suboptimal computation

shrink-revlog: remove branchsort algorithm (it behaves poorly)

shrink-revlog: add accounting of suboptimal nodes to the new algorithms.

shrink-revlog: add "reverse postorder" and "postorder reverse" toposorts. Based on a patch by Benoit Boissinot, adapted to the pluggable sort algorithm design. toposort_reversepostorder() is a very good performer; it's designed to recreate what the revlog would have looked like if Mercurial had parent deltas now. toposort_postorderreverse() is unstable and very inconsistent, but perhaps with some work it could be made better.

shrink-revlog: add --sort option for user-selectable toposort algorithm.

shrink-revlog: rename some local variables for consistency.

shrink-revlog: instrument sort code to record statistics. Notably, count "suboptimal" nodes (predecessor is not first parent) and (with -v) report them at the end of the run.

Merge with crew-stable

convert: handle svn tree with empty roots (issue2079)

merge with stable

bundle: fix bundle generation for empty changegroup

patch/diff: move diff related code next to each other

remove header handling out of mdiff.bunidiff, rename it

remove contrib/hgdiff, it makes refactoring diff/patch harder it can always be revived if needed

demandimport: blacklist _ssl (issue1964)

patch/diff: move patch.export() to cmdutil.export() This API change will allow us to break a cycle between patch and cmdutil.

wix: pre-check the 'I approve this license' checkbox This is simply a convenience to the user, they can click next until the installer goes away. Optimally, the checkbox would be hidden or removed, but that requires rewriting the UI.

Merge with stable

addremove: avoid fetching data again and again

addremove: add progress support for similarity search

addremove: atomically update the dirstate In case someone hits ^C during the similarity search, properly rollback

inotify: expose the same dirstate.status() interface as dirstate. The real dirstate.status() does not have any keyword args. For consistency, wrappers or subclasses should not have them either.