merge with crew-stable

python-2.6: md5 import in test-archive helper

python-2.6: deprecation of GzipFile.filename

highlight: backward compatibility with pygments 0.5.1

Fix spacing error introduced in 5efd447a9b8d

Merge with crew-stable

convert: check svn branches are directories

Merge from crew-stable.

tests/test-diff-copy-depth: using sh instead of bash test failed on plain FreeBSD 6.2 due to nonexistent bash

gendoc: fix indentation

hg.1: bogus escaping of .hg* not needed anymore Revert ba40e267762b, 1c1ef561d541 workarounds.

doc: escape .hg at bol in manpages with make (issue1072) This works around a bug in old docbook stylesheets. Remove .*.swp example from hgignore.5.txt. Diagnosis and workaround thanks to Alexis S. L. Carvalho.

highlight: Generate pygments style sheet dynamically This patch allows a per-repository (for example, within a hgwebdir) selection of pygments_style web option. No static .css files required. Test edited by pmezard (compatibility fixes)

Merge with macencode branch

win32text: rename forbidcrlforcr() function

test-mactext: simplify test, coverage is ensured by win32text tests

win32text: Add macencode/macdecode

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