Patrick Mezard
acfe08ba86
Merge with crew-stable
2008-04-14 23:04:34 +02:00
Patrick Mezard
f7c7c06863
convert: fix svn file copy detection code
2008-04-14 22:31:34 +02:00
Patrick Mezard
9d916aae03
convert: fix svn branch source detection corner case
...
It was confused by composite-looking revisions made by copy + remove.
2008-04-14 22:31:34 +02:00
Patrick Mezard
b54ae05232
convert: cleanup svn file copy handling
2008-04-14 22:31:34 +02:00
Patrick Mezard
7914c93a87
convert: handle past or foreign partial svn copies
...
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
2008-04-14 22:31:34 +02:00
Patrick Mezard
19cd4308ab
convert: more cleanup in svn directory copy handling
2008-04-14 22:31:33 +02:00
Patrick Mezard
c06ff5b448
convert: svn directory copy handling cleanup
2008-04-14 22:31:33 +02:00
Patrick Mezard
a5bba7499c
convert: improve subversion branch filtering
2008-04-14 22:31:33 +02:00
Patrick Mezard
a210321674
convert: rename get_entry_from_path() into an svn_source method
2008-04-14 22:31:33 +02:00
Patrick Mezard
8278052793
convert: fix subpaths detection in svn source
2008-04-14 22:31:33 +02:00
Patrick Mezard
2b144ed542
test-convert-svn-branches: short identifiers are more legible
2008-04-14 22:31:33 +02:00
Patrick Mezard
e6d132922b
cmdutil: handle and warn about missing copy revisions
2008-04-14 22:31:33 +02:00
Patrick Mezard
53bdaf2c6b
localrepo: forbid nullid copyrev
2008-04-14 22:31:33 +02:00
Patrick Mezard
e6b5e91a5d
verify: check copy source revlog and nodeid
2008-04-14 22:31:33 +02:00
Dirkjan Ochtman
2f149e4634
replace usage of os.popen() with util.popen()
...
To make this possible, I added a mode parameter to both implementations of
util.popen(), defaulting to 'r' (as it does in the Python stdlib).
2008-04-14 14:34:38 +02:00
Matt Mackall
619e79c725
Merge with -stable
2008-04-13 11:31:45 -05:00
Adrian Buehlmann
8dddfa01ec
removing unused local ccache in patch.diff
2008-04-11 15:14:00 +02:00
Benoit Boissinot
60caa13781
merge with -stable
2008-04-12 23:05:51 -04:00
Benoit Boissinot
e297c198c0
fix import with -p0
2008-04-12 22:41:07 -04:00
Patrick Mezard
3409e6fdc3
context: handle untracked files in filectx.fileflags()
2008-04-12 21:08:03 +02:00
Patrick Mezard
d06361ae38
merge: replace readline() call, missing from posixfile_nt
2008-04-12 20:51:26 +02:00
Patrick Mezard
91d2df2c77
Merge with crew-stable
2008-04-12 21:34:01 +02:00
Dirkjan Ochtman
f6fe408f92
remove trailing whitespace introduced in b0e5c3bce42a
2008-04-12 20:03:54 +02:00
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
