Merge with crew-stable

dirstate: do not ignore current directory '.' (issue 1078)

patchbomb: fix cStringIO import (spotted by pychecker)

Make tests/test-dumprevlog executable

merge with main

Merge with crew-stable

Merge backout

Backed out changeset 7f4257b5cbfc util.binary heuristic cannot be trusted when decoding working directory files.

mq: add --force option to strip

coal: fix some glitches in annotate header

python 2.6 compatibility: compatibility wrappers for hash functions

python 2.6 compatibility: add __hash__ to classes that have __eq__

Merge with crew-stable

Let --unified default to diff.unified (issue 1076)

contrib: fix binary file issues with dumprevlog on Windows * Fix traceback on dumprevlog: open revlog in mode 'rb' (binary) * Set stdio to binary mode so that redirected data is not modified References: http://selenic.com/pipermail/mercurial/2008-March/018330.html http://selenic.com/repo/index.cgi/hg/rev/a3fe91b4f6eb

add tests for contrib/dumprevlog and undumprevlog

coal: minor icon improvements

coal: more tweaks - move icons inside links - set icon borders to 0 - make active menu button white on black and remove bar

pager: make config info accessible with "hg help pager"

tests: easier error diagnostics for test-serve

Merge from crew-stable.

hgweb: make hgwebdir work in the absence of PATH_INFO Thanks to Andrea Arcangeli for reporting and an initial patch.

Merge from main.

Merge from crew-stable.

Pager extension: switch it off if --debugger is set The pager is preventing the debugger prompt and much of the debugger output to be refreshed. Moreover the pager does not make sense when debugging line by line. (This supersedes the similar ui.debugflag patch. Disabling the pager for debug output doesn't make that much sense, as this is actually when the pager might be useful.)

Pager extension: switch it off if --debugger is set The pager is preventing the debugger prompt and much of the debugger output to be refreshed. Moreover the pager does not make sense when debugging line by line (Thanks to Gilles Moris).

coal: even more tweaks - rearrange file browser columns - add folder and file icons - make browse table uniformly monospaced - use lowercase consistently for column heads - fix search container div

coal: more tweaking - add quirksmode hack in attempt to make MSIE happy - add container divs for more browsers compatibility - fix file log button on file page - link to first line of file source from browser - change revision navigator style

coal: more tweaks - add revision numbers to changeset, browse, and file pages - add revision number to revision number navigator in log - remove node from log and filelog pages - add changeset, browse, and archive buttons back to log page - make buttons more clickable with display: block - fix alignment of some table heads

coal: minor fixes sans -> sans-serif tweak column widths get rid of full changelog

merge with crew-stable

test-churn: force COLUMNS to be set

Consistently 1 space after full stops in command doc strings Update test output accordingly.

patchbomb: Fix mangling of lines beginning with From we should mangle the lines beginning with From only when writing to mbox format.

asciidoc: consistently use 1 space after full stop Note: the command doc strings included in hg (1) are still inconsistent wrt to spaces after full stops.

hgrc.5: fix subsection formatting

imported patch templ.diff

Merge with crew-stable

merge with crew-stable

rollback: unlink files truncated to length 0

make test-diff-copy-depth executable

convert: fix test-convert-svn-* problems with mtime not changing The `svn commit` command does not detect changed files unless their mtime has changed. A quick succession of, for instance, `svn co ...; echo x >> y; svn ci` can thus lead to the change to y being ignored. Edited by pmezard to write in binary mode.

merge with hg-stable

hgweb: fix merge breakage

templates: add coal web theme

optimize PNGs

hgweb: minor improvements for new web style - make renamelink take a context - pass current node to shortlog page rather than tip - pass user/desc/date/rename to filediff - improve template error reporting for foo%bar

add simple dump and undump scripts to contrib/

Merge with stable

copies: refactor symmetricdifference as _findlimit We only need to track the lowest revision seen, which makes things simpler.

copies: teach symmetric difference about working revisions - use changelog.count() as a pseudo revision number - abort early in copies if revs are the same - eliminate working dir hacks in copies - yield results as they're found

symmetricdifference: move back to copies It's too tightly dependent on known revlog ordering to fit well in ancestors

symmetricdifference: change colors to sides

ancestors: simplify symmetric difference - n_wanted/wanted -> interesting - scan colors rather than managing ret

copies: don't double-detect items in the directory copy check

copies: skip directory rename checks when not merging The directory rename checks are not meaningful unless we're moving or copying files across a branch during a merge.

copies: sort old names by depth

backout: reverse changeset belongs on current branch Backing out a changeset that is before a named branch branchpoint was making the reverse changeset the tip of the old branch, which is wrong and very confusing. So instead, we put it on the current named branch.

copies: fix silly precedence bug

churn: allow whitespaces as delimiter in aliases it was exactly on space character before.