Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 21:08:03 +0200] rev 6519
context: handle untracked files in filectx.fileflags()
Matt Mackall <mpm@selenic.com> [Fri, 11 Apr 2008 12:52:56 -0500] rev 6518
resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 11 Apr 2008 12:04:26 +0200] rev 6517
python-2.6: use sha wrapper from util for new merge code
Adrian Buehlmann <adrian@cadifra.com> [Fri, 11 Apr 2008 09:27:28 +0200] rev 6516
fixed missing sorting in test-dumprevlog
The test failed at random because the order of files was non-deterministic,
which produced diffs in test output.
Patrick Mezard <pmezard@gmail.com> [Fri, 11 Apr 2008 11:21:55 +0200] rev 6515
test-dumprevlog: fix extra path separator under MacOSX
The "find .hg/store/ -name '*.i'" command returned paths with extra separators
like '.hg/store//00changelog.i'.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 11 Apr 2008 08:35:37 +0200] rev 6514
Merge from main.
Paul Moore <p.f.moore@gmail.com> [Thu, 10 Apr 2008 23:07:54 +0200] rev 6513
Add a batch file driver for Windows
Matt Mackall <mpm@selenic.com> [Thu, 10 Apr 2008 15:02:24 -0500] rev 6512
merge: introduce mergestate
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 10 Apr 2008 14:25:50 +0200] rev 6511
Merge with crew-stable.
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.)