merge with main

convert: print commit log message with local encoding correctly.

convert: Accept local path on win32.

color extension: change from GPL3 to 2

changelog: fix decoding of extra (spotted by pmezard)

convert: svn_sink: workaround of command line size limitation on win32. On win32, the command line arguments seems to be limited about 2400 bytes. So 'add', 'delete', 'propget' and 'propdel' operations are called several times within this limitation. And also 'commit' operation is changed to be called without passing target files not to exceeds this limitation because it cannot be a separated like other operations above.

convert: svn_sink: specify encoding of message file explicitly on commit.

mq: add --currentdate and --date options to qnew and qrefresh These options make qnew add and qrefresh update a "# Date "-style header line. This allows proper recording of creation / last modification dates of patches in patch queues. Note that `qrefresh -D` only updates existing header lines. It never adds them, and does not warn about this. This is because I expect people to have `[default] qrefresh -D` in their .hgrc so patches with tracked dates get updated, others are left unchanged. The suggested setup in .hgrc is, in fact, [default] qnew = -D -U qrefresh = -D I tried to not mix header styles, so `qnew -D -U` now writes the user in "# User "-style, while `qnew -U` still writes it "From: "-style. Also, if `qrefresh -U` must add the user, it does so in "# User "-style if the header contains a "# HG changeset patch" line. (This is caused by mq not supporting the "Date: "-style header line at all - a reasonable choice given its standard date format.)

Add colored output to status and qseries commands

patchbomb: simplify some line continuations

patchbomb: add linebreaks after colons (coding style)

Fixed XHTML validation errors

Move aliases section in help below synopsis (issue362) This should avoid confusion why e.g. "hg help co" shows help for "hg update" instead.

test-convert-svn-source: test stop revision

Sort commands table again and add some missing 'hg' in synopsises.

Obfuscate (instead of just escape) contact/owner in gitweb summary. This could contain an email address.

Don't let ui.username override web.contact (issue900) 4603eef60237 introduced using ui.username before web.contact, but this was never documented and might cause commit accidents. - Drop web.author (deprecated since 2005) - Try ui.username or $EMAIL as a fallback to display something useful. - Update docs for the fallbacks.

realign commands table

bisect: improve tests - test skipping - test noupdate - test bad->good search - test inconsistent state

bisect: handle search for bad to good transitions Automatically detect whether we're looking for a bad to good transition rather than the usual good to bad transition by detecting when badrev is inside the good set and flipping good/bad.

bisect: make bisect a built-in command

bisect: faster merging

bisect: merge ancestor lists when pushing to children - eliminate some redundant tests and assignments - move ancestor list merging to child update

bisect: skip calculations on candidates with too many ancestors Once an ancestor list has grown past the perfect threshold, all descendants are less optimal. Use a poison dict to avoid pointless operations on their long ancestor lists, thus eliminating most of the work.

bisect: stop early if we find a perfect candidate

bisect: find best node in ancestor collection pass

bisect: calculate candidate set while finding children

bisect: use a dict for children We fill in the children only for ancestors of badrev

bisect: propagate ancestor lists directly to children - calculate the children of all candidates - for each candidate, combine ancestor lists - pass ancestor lists to children - store ancestor count This eliminates the O(n**2) memory usage, while maintaining about the same performance.

bisect: add noupdate option