Christian Ebert
af73383537
Let util.binary check entire data for \0 (issue1066, issue1079)
2008-04-08 13:19:36 +02:00
Christian Ebert
0051fba0c0
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).
2008-04-09 14:12:32 +02:00
Christian Ebert
65d5e4ac26
keyword: make overwrite() arguments mandatory
2008-04-09 14:05:57 +02:00
Christian Ebert
7567765ad1
keyword: compact setting of optional arguments
2008-04-09 14:05:57 +02:00
Christian Ebert
4f367170f4
keyword: privatize remaining monkeypatches by moving them into reposetup
...
Make it more transparent if and when monkeypatches are needed.
2008-04-09 14:05:57 +02:00
Christian Ebert
3064a91343
keyword: collect filename patterns, wrap dispatch._parse in uisetup
...
Store [keyword] config in kwtools.
hgcmd defaults to empty string.
2008-04-09 14:05:56 +02:00
Bryan O'Sullivan
8250520fe1
Merge
2008-04-09 15:28:30 -07:00
Bryan O'Sullivan
6ab8739d08
Tidy code, fix typo
2008-04-09 15:27:57 -07:00
Thomas Arendsen Hein
75583cedf3
Remove trailing space
2008-04-08 18:40:11 +02:00
Thomas Arendsen Hein
da2e375209
merge with crew-stable
2008-04-08 18:39:41 +02:00
Thomas Arendsen Hein
657d20646f
Fix spacing error introduced in d44685e2377e
2008-04-08 18:39:02 +02:00
Dirkjan Ochtman
8e0e741a7c
python-2.6: md5 import in test-archive helper
2008-04-08 15:41:21 +02:00
Dirkjan Ochtman
23bb4b3d3f
python-2.6: deprecation of GzipFile.filename
2008-04-08 15:42:43 +02:00
Patrick Mezard
4f5e5e015a
Merge with crew-stable
2008-04-07 13:16:11 +02:00
Patrick Mezard
7d3027f767
convert: check svn branches are directories
2008-04-07 11:59:20 +02:00
Dirkjan Ochtman
e31d0e46c9
Merge from crew-stable.
2008-04-07 09:26:40 +02:00
Adrian Buehlmann
94cd97b240
tests/test-diff-copy-depth: using sh instead of bash
...
test failed on plain FreeBSD 6.2 due to nonexistent bash
2008-04-07 09:02:26 +02:00
Christian Ebert
3247bd3127
gendoc: fix indentation
2008-04-06 13:13:31 +02:00
Christian Ebert
e208fbcb2d
hg.1: bogus escaping of .hg* not needed anymore
...
Revert a1f27fda31ea, bbc0eeefe0b3 workarounds.
2008-04-06 13:13:31 +02:00
Christian Ebert
d68174388b
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.
2008-04-07 09:02:04 +02:00
Isaac Jurado
ec51524d45
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)
2008-04-05 21:29:02 +02:00
Patrick Mezard
6cb37d1b54
Merge with macencode branch
2008-04-05 19:33:34 +02:00
Patrick Mezard
5cbeea721c
win32text: rename forbidcrlforcr() function
2008-04-05 19:06:16 +02:00
Patrick Mezard
5f02ff8613
test-mactext: simplify test, coverage is ensured by win32text tests
2008-04-05 19:03:45 +02:00
Patrick Mezard
ad00fc6726
Merge with crew-stable
2008-04-05 18:19:49 +02:00
Patrick Mezard
f572ee0b5f
dirstate: do not ignore current directory '.' (issue 1078)
2008-04-05 18:15:04 +02:00
Christian Ebert
76fba4c66a
patchbomb: fix cStringIO import (spotted by pychecker)
2008-04-05 17:48:10 +02:00
Thomas Arendsen Hein
82ad00cdba
Make tests/test-dumprevlog executable
2008-04-05 00:11:36 +02:00
Thomas Arendsen Hein
7528210be5
merge with main
2008-04-05 00:04:50 +02:00
Patrick Mezard
08903ce085
Merge with crew-stable
2008-04-04 23:18:03 +02:00
Patrick Mezard
8fd2c54773
Merge backout
2008-04-04 23:13:32 +02:00
Patrick Mezard
db062e7060
Backed out changeset 86e4750e16d8
...
util.binary heuristic cannot be trusted when decoding working directory files.
2008-04-04 23:09:54 +02:00
Patrick Mezard
8e0cbccd26
Let --unified default to diff.unified (issue 1076)
2008-04-04 22:15:14 +02:00
Dirkjan Ochtman
ea3191d104
mq: add --force option to strip
2008-04-04 17:44:31 +02:00
Dirkjan Ochtman
2c00c87b23
coal: fix some glitches in annotate header
2008-04-04 22:19:24 +02:00
Dirkjan Ochtman
34d6bea8db
python 2.6 compatibility: compatibility wrappers for hash functions
2008-04-04 22:36:40 +02:00
Paul Moore
0046a32c4b
python 2.6 compatibility: add __hash__ to classes that have __eq__
2008-04-04 22:41:17 +02:00
Patrick Mezard
2a9d095734
Merge with crew-stable
2008-04-04 22:18:38 +02:00
Adrian Buehlmann
c7aabb085a
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/0f20f68c768c
2008-04-04 16:39:44 +02:00
Adrian Buehlmann
5c85e0dcee
add tests for contrib/dumprevlog and undumprevlog
2008-04-03 17:17:39 +02:00
Matt Mackall
80f473ccc9
coal: minor icon improvements
2008-04-04 13:54:49 -05:00
Matt Mackall
8049b8b9fa
coal: more tweaks
...
- move icons inside links
- set icon borders to 0
- make active menu button white on black and remove bar
2008-04-04 13:43:25 -05:00
Christian Ebert
87c730b788
pager: make config info accessible with "hg help pager"
2008-04-03 13:47:05 +02:00
OHASHI Hideya
3cdbbe36e4
win32text: Add macencode/macdecode
2008-04-03 20:41:31 +09:00
Dirkjan Ochtman
95639b6467
hgweb: make hgwebdir work in the absence of PATH_INFO
...
Thanks to Andrea Arcangeli for reporting and an initial patch.
2008-04-03 13:14:43 +02:00
Dirkjan Ochtman
9700c3ce4c
tests: easier error diagnostics for test-serve
2008-04-03 12:46:37 +02:00
Dirkjan Ochtman
67493fd86d
Merge from crew-stable.
2008-04-03 13:21:42 +02:00
Dirkjan Ochtman
31023eeb56
Merge from main.
2008-04-03 11:18:43 +02:00
Dirkjan Ochtman
c31920c8cc
Merge from crew-stable.
2008-04-03 11:16:07 +02:00
Gilles Moris
5b548b29f2
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.)
2008-04-03 11:11:31 +02:00
