Giorgos Keramidas
b330da7a59
templates/coal: spell class correctly in {fileentry}
2008-04-12 06:37:38 +03:00
Bryan O'Sullivan
369f2e957f
repo: add rjoin method
2008-04-11 22:19:52 -07:00
Bryan O'Sullivan
6676f1cebf
parseurl: make revs optional
2008-04-11 22:19:51 -07:00
Bryan O'Sullivan
99462bd4ec
Hoist localpath to the top level
2008-04-11 22:18:38 -07:00
Bryan O'Sullivan
1234e5c53b
test-imerge: disable due to massive brokenness
2008-04-11 22:17:20 -07:00
Matt Mackall
edf5a0f5d0
resolve: new command
...
- add basic resolve command functionality
- point failed update and merge at resolve
2008-04-11 12:52:56 -05:00
Dirkjan Ochtman
77eea08b47
python-2.6: use sha wrapper from util for new merge code
2008-04-11 12:04:26 +02:00
Adrian Buehlmann
00f3faf7cc
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.
2008-04-11 09:27:28 +02:00
Patrick Mezard
0ec4a6ad34
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'.
2008-04-11 11:21:55 +02:00
Dirkjan Ochtman
882c57fdb6
Merge from main.
2008-04-11 08:35:37 +02:00
Paul Moore
7113d144ac
Add a batch file driver for Windows
2008-04-10 23:07:54 +02:00
Matt Mackall
8d82cba09a
merge: introduce mergestate
2008-04-10 15:02:24 -05:00
Dirkjan Ochtman
c60b0f560c
Merge with crew-stable.
2008-04-10 14:25:50 +02:00
Benoit Allard
81977fe9ba
highlight: backward compatibility with pygments 0.5.1
2008-04-10 14:24:27 +02:00
Dirkjan Ochtman
b639f42f79
win32text: actually import util so util.binary() can be used
2008-04-10 14:08:38 +02:00
Bryan O'Sullivan
69667c0265
issue 1053: heavily qualify the "cp -al" advice for cloning
2008-04-09 16:02:37 -07:00
Bryan O'Sullivan
324c60f864
Get rid of reimplementations of util.binary
2008-04-09 15:49:20 -07:00
Thomas Arendsen Hein
657d20646f
Fix spacing error introduced in d44685e2377e
2008-04-08 18:39:02 +02:00
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
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
