Commit Graph

589 Commits

Author SHA1 Message Date
Mads Kiilerich
378848d5c1 convert.cvs: Initialize state variable and abort on cvs error
Fix as proposed by Frank Kingswood.

Avoids
UnboundLocalError: local variable 'mode' referenced before assignment
when cvs fails.

This alsa partially fixes issue1592.
2010-03-30 02:42:21 +02:00
Benoit Boissinot
12b6faccfd cvsps: fix traceback involving 'synthetic'
https://bugzilla.redhat.com/show_bug.cgi?id=573666
Reported by Sjoerd Mullender
2010-03-15 19:55:52 +01:00
Mathieu Clabaut
14e6714bd1 convert: teach cvsps to handle . repository (issue1649)
For a CVS repository checked out with "cvs co .", the prefix used to strip of
what we get from CVS was previously erroneously set to "repopath/.".
We now prevent the dot to be added.

Test folded in test-convert-cvs and simplified by Patrick Mézard
<pmezard@gmail.com>.
2010-03-09 12:09:57 +01:00
Patrick Mezard
5f49cde57a convert: handle svn tree with empty roots (issue2079) 2010-03-09 22:11:43 +01:00
Pierre-Yves David
31bf517562 Add ElementPath to the list of package ignored by demand import
The bzrlib try to import the ElementPath module but had a fallback in
case the import fails. Lazy import of this module leads to later
failure.

The bzrlib is used by the convert extension.
2010-03-01 14:15:55 +01:00
Benoit Boissinot
328394047f fix coding style (reported by pylint) 2010-02-08 15:36:34 +01:00
Matt Mackall
8d99be19f0 many, many trivial check-code fixups 2010-01-25 00:05:27 -06:00
Matt Mackall
cd3ef170f7 Merge with stable 2010-01-19 22:45:09 -06:00
Matt Mackall
595d66f424 Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
Matt Mackall
2487655eb4 convert: make hg sink cleanup safer 2009-12-16 16:42:58 -06:00
Patrick Mezard
ceda6d3ffc convert/svn: better handling of hg recursive call failure 2009-12-14 22:09:49 +01:00
Patrick Mezard
9499717be0 convert/svn: make sink recover gracefully from empty changeset
Otherwise when processing a changeset that in fact changes no files
(perhaps due to bug in import from CVS) can get something like:
  unexpected svn output:
  abort: unable to cope with svn output

Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>
2009-12-07 12:44:15 -05:00
Patrick Mezard
7155946405 convert/svn: fix warning when repo detection failed 2009-11-16 14:09:31 +01:00
Patrick Mezard
709ae7efd4 convert/svn: fix HTTP detection bug introduced by bf008106de6f
The probe expected response is a 404 with content, and while urllib returns the
response body in this case, urllib2 raises an HTTP error.
2009-11-12 12:05:43 +01:00
Patrick Mezard
e5e2172bf6 convert/svn: delegate to svn bindings if HTTP probe fails
convert extension tries to guess the remote repository type with HTTP probes.
Unfortunately, it does not handle authentication or HTTPS handshakes, so regular
svn repositories may be excluded. Instead, when a non-404 error is retrieved,
we keep trying with the svn bindings. The drawback is missing svn bindings will
make the conversion to fail even for non-svn targets. This can be avoided with
--source.
2009-11-11 19:45:00 +01:00
Patrick Mezard
1edfa4d1df convert/mtn: handle change in mtn 0.45 certs output 2009-11-10 23:45:24 +01:00
Patrick Mezard
d8a8eb5584 convert: reenable SVN support after license issue solved 2009-11-10 22:32:17 +01:00
Dirkjan Ochtman
12c5890a70 kill trailing whitespace 2009-11-05 10:44:36 +01:00
Martin Geisler
5a115c8c69 convert: document parent order in splicemap help (issue1764) 2009-10-23 22:55:28 +02:00
Patrick Mezard
990e7895a0 Merge with crew-stable 2009-10-16 00:06:23 +02:00
Patrick Mezard
f235a47953 convert/svn: better error when hg cannot call itself (issue1838) 2009-10-15 23:15:30 +02:00
Matt Mackall
879810b360 Merge with -crew-stable 2009-10-07 23:45:30 -05:00
Matt Mackall
daf9754427 Merge with -crew-stable 2009-10-07 23:25:41 -05:00
Patrick Mezard
4b72f54672 convert/hg: handle bogus copy records (issue1843) 2009-10-07 18:52:01 +02:00
Patrick Mezard
d54423a4e5 convert/hg: make parents() return changectx, not nodes 2009-10-07 10:13:04 +02:00
Patrick Mezard
9c21a28056 Merge with crew-stable 2009-10-07 22:50:20 +02:00
Patrick Mezard
0133f8d115 convert/cvs: stop supporting external cvsps 2009-10-05 22:57:15 +02:00
Patrick Mezard
c1dcf4d3bd Merge with crew-stable 2009-10-05 22:17:39 +02:00
Patrick Mezard
6fe64cf348 convert: make mapfile handle LF and CRLF shamap (issue1846) 2009-10-05 22:01:08 +02:00
Patrick Mezard
fd35df4182 Merge with crew-stable 2009-10-04 23:16:54 +02:00
Patrick Mezard
0ee3fec16c convert/darcs: handle directory renaming 2009-10-04 23:06:14 +02:00
Patrick Mezard
e3432a31a9 convert/darcs: fix file renaming (issue1853) 2009-10-04 22:23:11 +02:00
Matt Mackall
13b406f027 Merge with -stable 2009-10-03 14:39:57 -05:00
Brendan Cully
d911a1a256 convert: unbreak non-svn engines 2009-09-30 14:43:22 -07:00
Dirkjan Ochtman
a023094f1f merge with crew-stable 2009-09-23 15:54:43 +02:00
Peter Ingebretson
4cb46e6c5b convert: fix marshalling in P4 convert extension to use a binary stream
The Perforce convert extension uses the p4 -G command line option and
marshal.load to obtain information about the history of a Perforce depot.

The method marshal.load must be provided with a binary stream (mode='rb') in
order to function reliably. Certain changelist descriptions or other elements
in a depot history could trigger a premature EOFError, causing the conversion
process to fail.

This may resolve the issue discussed in the following thread:
http://www.selenic.com/pipermail/mercurial/2009-July/026813.html
2009-09-23 15:36:51 +02:00
Dirkjan Ochtman
6e68e45c6f merge with mpm 2009-09-23 15:19:26 +02:00
Matt Mackall
3ce19e6ce6 convert: disable SVN support due to library license incompatibility 2009-09-23 00:23:50 -05:00
Patrick Mezard
6e34e060d6 convert/cvs: update debugcvsps documentation 2009-09-22 13:30:32 +02:00
Martin Geisler
9f1896c083 do not attempt to translate ui.debug output 2009-09-19 01:15:38 +02:00
Patrick Mezard
30764759c6 Merge with crew-stable 2009-09-06 15:32:16 +02:00
Patrick Mezard
da332667e9 convert: fix history topology when using hg.tagsbranch
When using hg.tagsbranch, all conversions fail at
transcribing the source repo topology with conversion
scenarios interleaving:
 - initial repo conversion,
 - then upstream tag
 - then later incremental conversion

The problem is caused by the usage of the last source
revid as source revid for the tagnode in the revision
map.

On a later incremental conversion, when resolving some
child commit of the true last source revid, convert
will parent the nodes to the tag node. If using
tagsbranch you get a bad topology where all incremental
commit nodes end up in the tag branch.

Analysis and test by Edouard Gomez <ed.gomez@free.fr>
2009-09-06 15:29:14 +02:00
Grauw
5a30039964 Fix issue 1782 don't do url2pathname conversion for urls
And only replace os-dependent path separators when necessary
2009-08-07 01:15:16 +02:00
Nicolas Dumazet
fb2cbab1fb use 'x in dict' instead of 'dict.has_key(x)'
"in" is faster, and has_key will be removed in py3k
2009-08-24 21:00:34 +02:00
Bryan O'Sullivan
f190c5182d issue1251: bail if darcs version is too old 2009-07-25 10:08:20 -07:00
Patrick Mezard
18de6d1538 convert/svn: fix backtrace in tags discovery (issue1742) 2009-07-17 13:31:12 +02:00
Greg Ward
e4f07e8a14 convert/cvs: improve error message on unexpected server output. 2009-07-08 22:08:45 -04:00
Matt Mackall
d76e8a3e52 Merge with i18n 2009-06-30 12:32:30 -05:00
Dirkjan Ochtman
f692d68a57 kill trailing whitespace 2009-08-05 17:08:28 +02:00
Martin Geisler
9fa9fa9e76 Merge with crew-stable 2009-07-26 02:33:38 +02:00