test-mq-header: don't fail with different patch(1) At least under FreeBSD patch(1) won't fail on empty patch and will print 'Hmm...' warning instead. Sanitize output so tests won't fail unexpectedly.

Fix up tests for XHTML validation bits

Fixed numerous XHTML problems that caused validation errors and warnings. Link elements for Atom and RSS feeds had no end tag. <div> block element inside <a> in-line element isn't right and caused rendering problems on Safari. Spurious </div> tag in search forms. Branch entry missing closing </a> tag.

patchbomb: attachment options changed '-a/--attach' send patches as attachment '-i/--inline' sends patches as inline attachment (old behavior of -a/--attach)

patchbomb: consistently use opts.get

patchbomb: fix more line continuations (coding style)

keyword: add test

Add extension for filewise RCS-keyword expansion in working dir - keywords are only expanded working dir, not in change history - completely customizable keywords/expansions based on hg templates - intrusiveness/slowdown can be reduced by specifying precise [keyword] file patterns - can be turned off/on anytime - changesets can be exchanged regardless of remote/local keyword settings

restore branch after rollback (issue 902)

context: fix filectx.parents() bug introduced when editing 180a3eee4b75

merge with crew-stable

Fix copies reporting in log and convert. If copy logged in file revision, we report copy for changeset only if file revisions linkrev points back to the changeset in question or both changeset parents contain different file revisions. This fixes extra copies reported when executable bit was changed for previously copied file.

context: preserve changeset in filectx if we have one If we know original changeset we are working with - try hard to preserve it. Fallback to filelog.linkrev() only if we have no way to get original changeset, since linkrev() may point to other changeset.

test-convert-hg-svn: make it more windows friendly

test-convert-svn-sink: wrap repetitive svn checks in a function

Merge with crew-stable

convert: Fix bug of limit_arglist() loosing file on limit boundary.

test-convert: test before() and after() conversion actions

test-convert-svn-source: test convert/multiple extra fields

Merge with crew-stable

util: drop params added during experimentation

hg tag: run tag hook just once

Make run-tests.py --interactive work on Windows

convert: filemap must call base converter before()/after() actions

fetch: hide authentication details

serve: Don't change directory in the child if invoked with -d and --cwd

Fix status char in color extension for deleted (missing) files.

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