Commit Graph

1232 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
fa0374301e Always copy the necessary files before applying a git patch
This patch removes the "copymod" attribute from the gitpatch
class.

AFAICS, that attribute was only used to delay the copying of
renamed/copied files if there are no other changes to the target,
but in this case, if there are changes to the source, we'll end
up copying the wrong version.

This should fix issue762.
2007-10-06 15:30:15 -03:00
Patrick Mezard
0dd09ef0fc Test *_ISLINK merge environment vars 2007-10-05 23:01:38 +02:00
Bryan O'Sullivan
f5b570e3a6 run-tests.py: allow a different temporary directory to be specified 2007-10-05 12:42:52 -07:00
Bryan O'Sullivan
01e8a7db01 Update test for new output produced since e24568a05150 2007-10-05 12:30:19 -07:00
Bryan O'Sullivan
74de1ac8b8 Fix accidentally broken test. 2007-10-05 12:28:18 -07:00
Bryan O'Sullivan
1a3055eb4e Merge with crew. 2007-10-05 12:17:29 -07:00
Bryan O'Sullivan
a03fea73e0 Allow tests to run in parallel. 2007-10-05 12:17:01 -07:00
Bryan O'Sullivan
b1622da091 run-tests.py: reorder options alphabetically. 2007-10-05 09:30:02 -07:00
Alexis S. L. Carvalho
a305a3e419 convert_svn: add --filemap support 2007-10-04 23:21:37 -03:00
Alexis S. L. Carvalho
df6f43b4df convert_cvs: add --filemap support 2007-10-04 23:21:37 -03:00
Alexis S. L. Carvalho
b7d48206ca convert_git: add --filemap support 2007-10-04 23:21:37 -03:00
Alexis S. L. Carvalho
f951bc5803 mercurial_source: add --filemap support 2007-10-04 23:21:37 -03:00
Matt Mackall
24f40f64eb Merge with crew 2007-10-04 19:47:22 -05:00
Matt Mackall
3f58de820d merge: add debug diagnostics for findcopies 2007-10-04 19:44:37 -05:00
Patrick Mezard
755593a7fa Merge with crew-stable 2007-10-04 14:26:34 +02:00
Thomas Arendsen Hein
245381e916 test-convert-git: support older git client (1.4.4.4) 2007-10-04 14:23:28 +02:00
Patrick Mezard
01d91ed943 Merge with crew-stable 2007-10-03 21:08:37 +02:00
Christian Ebert
aa9b7d6cfb test-convert-cvs: handle older cvs client 2007-10-03 21:01:47 +02:00
Patrick Mezard
2b0b08ada6 Merge with crew-stable 2007-09-30 16:38:42 +02:00
Patrick Mezard
1ae2852b6f Test debugindexdot 2007-09-30 16:36:22 +02:00
Patrick Mezard
091596b961 Merge with crew-stable 2007-09-30 12:36:11 +02:00
Patrick Mezard
298631f312 Test mercurial convert sink removes empty directories. 2007-09-30 12:08:33 +02:00
Alexis S. L. Carvalho
07df6adfb5 revlog: fix revlogio.packentry corner case
We want to store version information about the revlog in the first
entry of its index.  The code in packentry was using some heuristics
to detect whether this was the first entry, but these heuristics could
fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from
the nullid and is stored as a delta).

We now give the revision number to packentry to avoid heuristics.
2007-09-26 01:58:45 -03:00
Dirkjan Ochtman
7b9cb3b6fc Don't try to determine interactivity if ui() called with interactive=False.
WSGI applications are not supposed to refer to sys.stdin. In af5aceab19f4,
hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but
sys.stdin.isatty() was still called by the ui objects. This change makes sure
only the ui.fixconfig() method will call ui.isatty() (by making the
ui._readline() method, which is currently only called from ui.prompt(),
private). ui.fixconfig() is changed to let config files override the initial
interactivity setting, but not check isatty() if interactive=False was
specified in the creation of the ui.
2007-09-25 19:05:34 +02:00
Alexis S. L. Carvalho
ddf41e005d Merge with crew-stable 2007-09-24 19:14:18 -03:00
Alexis S. L. Carvalho
6f75c91b5f convert_git: avoid returning two entries for the same file in getchanges
This could happen in merge changesets if the merged file was different
from both parents.
2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
38a7ae7001 mq: fix qrefresh -e with no patches applied 2007-09-24 19:00:11 -03:00
Alexis S. L. Carvalho
bcee2981c6 copy: if destination ends with "/", make sure it's a directory
Fixes issue724.
2007-09-24 19:00:11 -03:00
Matt Mackall
1e7f28023a Merge with crew 2007-09-24 12:34:26 -05:00
Patrick Mezard
c6d86b7b87 Merge with crew-stable 2007-09-23 15:29:58 +02:00
Patrick Mezard
d611888360 Test renaming files brought by merge second parent (issue 746) 2007-09-23 14:40:44 +02:00
Patrick Mezard
f770ac70cd Merge with crew-stable 2007-09-22 18:56:36 +02:00
Patrick Mezard
091a0db4eb Test static-http calls on '/' URI (issue 747) 2007-09-22 18:52:26 +02:00
Matt Mackall
e8a1dfd594 convert-cvs: update test to pass on Linux 2007-09-21 17:25:25 -05:00
Patrick Mezard
d24e36a450 Merge with crew-stable 2007-09-14 23:10:41 +02:00
Patrick Mezard
7c438d2066 convert: test cvs repository conversion 2007-09-14 22:47:15 +02:00
Patrick Mezard
ee42bab2ca hghave: detect cvs and cvsps availability
"cvsps -h" was returning 1 in cygwin, probably because CVSROOT was unset, which does not prevent it to work correctly.
2007-09-14 22:17:53 +02:00
Patrick Mezard
6e671bc489 Merge with crew-stable 2007-09-11 23:38:29 +02:00
Patrick Mezard
5f594a636f Test parents behaviour with files. 2007-09-11 23:05:30 +02:00
Brendan Cully
92a19d3a72 mq: fix regression in c5d80ff6828f
It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate.
It should be marked added on the second pass.
2007-09-10 15:00:05 -07:00
Brendan Cully
c0a2a485b0 Update test-record for 7012707aa4c6 2007-09-06 18:12:36 -07:00
Thomas Arendsen Hein
2455f3e93d Forgot to quote "6^" in test-parentrevspec (see 1beb065d7447) 2007-09-04 18:37:28 +02:00
Patrick Mezard
a375f7f845 test-convert-hg-source: enforce conversion order with --date 2007-09-04 13:56:15 +02:00
Alexis S. L. Carvalho
7dac6f1262 convert: mercurial_source: also search for copies in modified files
There are some corner cases where we may have a copy in a file that
isn't in the added list:

- the result of a hg copy --after --force

- after a merge across a (local) rename
2007-09-01 02:49:18 -03:00
Alexis S. L. Carvalho
6309fee56a convert: clear the dirstate before a conversion, invalidate it afterwards
Clearing it before the conversion protects us from whatever data were
there (file copies in particular).

Invalidating it after the conversion avoids writing a possibly
inconsistent dirstate to disk.
2007-09-01 02:49:18 -03:00
Alexis S. L. Carvalho
41b6be949d convert: avoid dirstate checks; add a test
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.

While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
2007-09-01 02:49:18 -03:00
Thomas Arendsen Hein
bf2d3bd959 Fix \ inside ` problem in test-convert-svn (avoids code duplication, too) 2007-08-31 12:54:07 +02:00
Thomas Arendsen Hein
f79502e9bd merge with crew-stable 2007-08-31 12:40:23 +02:00
Thomas Arendsen Hein
58eb01c17d Make test-convert-git compatible with other git versions (tested with 1.4.4.3) 2007-08-31 12:32:18 +02:00
Brendan Cully
2a5ee3fd3f Include . in PYTHONPATH (makes testing unbundled extensions easier) 2007-08-29 17:01:10 -07:00