Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Apr 2008 09:26:40 +0200] rev 6490
Merge from crew-stable.
Adrian Buehlmann <adrian@cadifra.com> [Mon, 07 Apr 2008 09:02:26 +0200] rev 6489
tests/test-diff-copy-depth: using sh instead of bash
test failed on plain FreeBSD 6.2 due to nonexistent bash
Christian Ebert <blacktrash@gmx.net> [Sun, 06 Apr 2008 13:13:31 +0200] rev 6488
gendoc: fix indentation
Christian Ebert <blacktrash@gmx.net> [Sun, 06 Apr 2008 13:13:31 +0200] rev 6487
hg.1: bogus escaping of .hg* not needed anymore
Revert ba40e267762b, 1c1ef561d541 workarounds.
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 09:02:04 +0200] rev 6486
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.
Isaac Jurado <diptongo@gmail.com> [Sat, 05 Apr 2008 21:29:02 +0200] rev 6485
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)
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 19:33:34 +0200] rev 6484
Merge with macencode branch
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 19:06:16 +0200] rev 6483
win32text: rename forbidcrlforcr() function
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 19:03:45 +0200] rev 6482
test-mactext: simplify test, coverage is ensured by win32text tests
OHASHI Hideya <ohachige@gmail.com> [Thu, 03 Apr 2008 20:41:31 +0900] rev 6481
win32text: Add macencode/macdecode
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 18:19:49 +0200] rev 6480
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 18:15:04 +0200] rev 6479
dirstate: do not ignore current directory '.' (issue 1078)
Christian Ebert <blacktrash@gmx.net> [Sat, 05 Apr 2008 17:48:10 +0200] rev 6478
patchbomb: fix cStringIO import (spotted by pychecker)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 05 Apr 2008 00:11:36 +0200] rev 6477
Make tests/test-dumprevlog executable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 05 Apr 2008 00:04:50 +0200] rev 6476
merge with main
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 23:18:03 +0200] rev 6475
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 23:13:32 +0200] rev 6474
Merge backout
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 23:09:54 +0200] rev 6473
Backed out changeset 7f4257b5cbfc
util.binary heuristic cannot be trusted when decoding working directory files.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 04 Apr 2008 17:44:31 +0200] rev 6472
mq: add --force option to strip
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 04 Apr 2008 22:19:24 +0200] rev 6471
coal: fix some glitches in annotate header
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 04 Apr 2008 22:36:40 +0200] rev 6470
python 2.6 compatibility: compatibility wrappers for hash functions
Paul Moore <p.f.moore@gmail.com> [Fri, 04 Apr 2008 22:41:17 +0200] rev 6469
python 2.6 compatibility: add __hash__ to classes that have __eq__
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 22:18:38 +0200] rev 6468
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 22:15:14 +0200] rev 6467
Let --unified default to diff.unified (issue 1076)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 04 Apr 2008 16:39:44 +0200] rev 6466
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
Adrian Buehlmann <adrian@cadifra.com> [Thu, 03 Apr 2008 17:17:39 +0200] rev 6465
add tests for contrib/dumprevlog and undumprevlog
Matt Mackall <mpm@selenic.com> [Fri, 04 Apr 2008 13:54:49 -0500] rev 6464
coal: minor icon improvements
Matt Mackall <mpm@selenic.com> [Fri, 04 Apr 2008 13:43:25 -0500] rev 6463
coal: more tweaks
- move icons inside links
- set icon borders to 0
- make active menu button white on black and remove bar
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Apr 2008 13:47:05 +0200] rev 6462
pager: make config info accessible with "hg help pager"
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 12:46:37 +0200] rev 6461
tests: easier error diagnostics for test-serve