Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 10 Apr 2008 14:08:38 +0200] rev 6510
win32text: actually import util so util.binary() can be used
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 16:02:37 -0700] rev 6509
issue 1053: heavily qualify the "cp -al" advice for cloning
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 15:49:20 -0700] rev 6508
Get rid of reimplementations of util.binary
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Apr 2008 13:19:36 +0200] rev 6507
Let util.binary check entire data for \0 (issue1066, issue1079)
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:12:32 +0200] rev 6506
keyword: check for '\0' in entire data before acting
util.binary might not be safe enough, as it fails eg. on certain
pdf files (issue1066).
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:57 +0200] rev 6505
keyword: make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:57 +0200] rev 6504
keyword: compact setting of optional arguments
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:57 +0200] rev 6503
keyword: privatize remaining monkeypatches by moving them into reposetup
Make it more transparent if and when monkeypatches are needed.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:56 +0200] rev 6502
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Store [keyword] config in kwtools.
hgcmd defaults to empty string.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 15:28:30 -0700] rev 6501
Merge
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 15:27:57 -0700] rev 6500
Tidy code, fix typo
"Paul Moore <p.f.moore@gmail.com>" [Thu, 20 Dec 2007 20:02:51 +0000] rev 6499
Added hgexecutable support for py2exe/frozen scripts
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 08 Apr 2008 18:40:11 +0200] rev 6498
Remove trailing space
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 08 Apr 2008 18:39:41 +0200] rev 6497
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 08 Apr 2008 15:41:21 +0200] rev 6496
python-2.6: md5 import in test-archive helper
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 08 Apr 2008 15:42:43 +0200] rev 6495
python-2.6: deprecation of GzipFile.filename
Benoit Allard <benoit@aeteurope.nl> [Thu, 10 Apr 2008 14:24:27 +0200] rev 6494
highlight: backward compatibility with pygments 0.5.1
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 08 Apr 2008 18:39:02 +0200] rev 6493
Fix spacing error introduced in 5efd447a9b8d
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Apr 2008 13:16:11 +0200] rev 6492
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Apr 2008 11:59:20 +0200] rev 6491
convert: check svn branches are directories
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
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 13:21:42 +0200] rev 6460
Merge from crew-stable.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 13:14:43 +0200] rev 6459
hgweb: make hgwebdir work in the absence of PATH_INFO
Thanks to Andrea Arcangeli for reporting and an initial patch.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 11:18:43 +0200] rev 6458
Merge from main.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 11:16:07 +0200] rev 6457
Merge from crew-stable.
Gilles Moris <gilles.moris@free.fr> [Thu, 03 Apr 2008 11:11:31 +0200] rev 6456
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.)
David Soria Parra <dsp <at> php.net> [Thu, 03 Apr 2008 10:49:42 +0200] rev 6455
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).
Matt Mackall <mpm@selenic.com> [Wed, 02 Apr 2008 18:51:06 -0500] rev 6454
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
Matt Mackall <mpm@selenic.com> [Wed, 02 Apr 2008 18:47:19 -0500] rev 6453
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
Matt Mackall <mpm@selenic.com> [Wed, 02 Apr 2008 18:47:17 -0500] rev 6452
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
Matt Mackall <mpm@selenic.com> [Wed, 02 Apr 2008 18:47:15 -0500] rev 6451
coal: minor fixes
sans -> sans-serif
tweak column widths
get rid of full changelog
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 02 Apr 2008 21:46:30 +0200] rev 6450
merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Wed, 02 Apr 2008 08:56:38 -0700] rev 6449
test-churn: force COLUMNS to be set
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Apr 2008 14:03:16 +0200] rev 6448
Consistently 1 space after full stops in command doc strings
Update test output accordingly.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Apr 2008 01:49:29 +0200] rev 6447
patchbomb: Fix mangling of lines beginning with From
we should mangle the lines beginning with From only when writing
to mbox format.
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Apr 2008 14:35:35 +0200] rev 6446
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.
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Apr 2008 14:35:11 +0200] rev 6445
hgrc.5: fix subsection formatting
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 01 Apr 2008 16:36:25 +0200] rev 6444
imported patch templ.diff
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Apr 2008 10:19:49 +0200] rev 6443
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 01 Apr 2008 08:34:23 +0200] rev 6442
merge with crew-stable
Brendan Cully <brendan@kublai.com> [Mon, 31 Mar 2008 23:02:25 -0700] rev 6441
rollback: unlink files truncated to length 0
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 02 Apr 2008 21:45:35 +0200] rev 6440
make test-diff-copy-depth executable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 01 Apr 2008 09:17:11 +0200] rev 6439
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.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 01 Apr 2008 08:33:17 +0200] rev 6438
merge with hg-stable
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 23:14:25 -0500] rev 6437
hgweb: fix merge breakage
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:36 -0500] rev 6436
templates: add coal web theme
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:34 -0500] rev 6435
optimize PNGs
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:33 -0500] rev 6434
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
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:32 -0500] rev 6433
add simple dump and undump scripts to contrib/
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:26 -0500] rev 6432
Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6431
copies: refactor symmetricdifference as _findlimit
We only need to track the lowest revision seen, which makes things simpler.
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6430
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
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6429
symmetricdifference: move back to copies
It's too tightly dependent on known revlog ordering to fit well in ancestors
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6428
symmetricdifference: change colors to sides
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6427
ancestors: simplify symmetric difference
- n_wanted/wanted -> interesting
- scan colors rather than managing ret
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6426
copies: don't double-detect items in the directory copy check
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6425
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.
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6424
copies: sort old names by depth
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6423
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.
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6422
copies: fix silly precedence bug
Kirill Smelkov <kirr@mns.spb.ru> [Fri, 28 Mar 2008 11:17:10 +0300] rev 6421
churn: allow whitespaces as delimiter in aliases
it was exactly on space character before.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 31 Mar 2008 18:49:15 +0200] rev 6420
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 31 Mar 2008 18:44:12 +0200] rev 6419
hg serve: add clearer message when starting the server with --verbose
Explicitly tell the address is the one the process is bound to.
Fix the printing of IPv6 addresses.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 31 Mar 2008 13:10:47 +0200] rev 6418
convert: fix trailing space introduced in 5efd447a9b8d
David Soria Parra <dsp <at> php.net> [Sat, 29 Mar 2008 19:41:50 +0100] rev 6417
pager: Add a configuration to enable/disable the pager for certain commands
Add the configuration options pager.ignore and pager.attend.
You can disable the pager on certain commands by adding them to the
pager.ignore setting. To whitelist commands, you can add them to pager.attend.
To disable or enable global commands like 'hg version' or 'hg help'
you have to use your global .hgrc. (thanks, Matt Mackall)
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 11:08:52 +0200] rev 6416
keyword: regroup monkey patch code, underscore prefix private vars
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 31 Mar 2008 00:01:27 +0200] rev 6415
merge with crew-stable