Commit Graph

544 Commits

Author SHA1 Message Date
Martin Geisler
623a2040a4 Merge with hg-i18n-stable 2009-09-30 21:14:24 +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
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
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
Martin Geisler
38c7268d62 convert: wrap docstrings at 70 characters 2009-07-26 01:44:41 +02:00
Patrick Mezard
6fb02d8b2c Merge with crew-stable 2009-07-17 16:01:19 +02:00
Martin Geisler
3951831e0b commands: use minirst parser when displaying help 2009-07-16 23:25:26 +02:00
Nicolas Dumazet
7eadbe8d42 for calls expecting bool args, pass bool instead of int
str.splitlines and email.message.as_string both expect a bool argument
defaulting at False: replace f(1) by f(True) and f(0) by f()
2009-07-13 09:50:26 +09:00
Martin Geisler
c15a8f8118 convert: do not ask for translation of "%s %s" 2009-06-27 12:31:41 +02:00
Martin Geisler
bd5efe5737 convert: fix inconsistent indentation in help text
The sort modes flags and convert.cvsps options were indented while the
convert.hg, convert.svn, and convert.p4 options were not. I've now
un-indented all of them.
2009-07-09 20:15:15 +02:00
Greg Ward
2a117f0e09 convert/cvs: improve error message on unexpected server output. 2009-07-08 22:08:45 -04:00
Martin Geisler
c2c41ac679 convert: fixed typo in docstring 2009-07-08 23:12:40 +02:00
Martin Geisler
e4a37ea58a convert: wrapped docstrings at 78 characters 2009-07-07 23:54:42 +02:00
Martin Geisler
3b7f4cb3d1 p4: simplify sort key 2009-07-05 12:50:14 +02:00
Alejandro Santos
1ef2fb42a7 compat: use 'key' argument instead of 'cmp' when sorting a list 2009-07-05 11:02:00 +02:00
Alejandro Santos
77d606ac51 compat: use open() instead of file() everywhere 2009-07-05 11:01:30 +02:00
Brodie Rao
a77b70fbf3 extensions: remove unused imports 2009-07-01 10:19:40 -04:00
Dirkjan Ochtman
1c6c4a9bc7 extensions: fix up description lines some more 2009-06-24 12:25:56 +02:00
Cédric Duval
dbcec5595d extensions: improve the consistency of synopses
Trying as much as possible to consistently:
 - use a present tense predicate followed by a direct object
 - verb referring directly to the functionality provided
   (ie. not "add command that does this" but simple "do that")
 - keep simple and to the point, leaving details for the long help
   (width is tight, possibly even more so for translations)

Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom
Podlaski Christiansen and others for the helpful suggestions.
2009-06-22 15:48:08 +02:00
Rocco Rutte
7373bdd271 convert: fix builtin cvsps when no branchpoints are present 2009-06-14 20:24:18 +02:00
Patrick Mezard
0370a2ceed convert/svn: drop undocumented and untested revision 'blacklist' 2009-06-21 23:17:05 +02:00
Patrick Mezard
64f9f43970 convert/svn: test svn tags encoding 2009-06-21 23:17:05 +02:00
Patrick Mezard
55cbeb1d9a convert/svn: stop returning unicode revision identifiers 2009-06-21 23:17:02 +02:00
Patrick Mezard
38e366e1e6 convert/svn: remove confusing unicode variable 2009-06-21 23:04:02 +02:00
Patrick Mezard
872c1fc1ec convert/svn: remove dead code from entry deletion code path
It was made obsolete when multi-branches commit were split into multiple
Mercurial commits.
2009-06-21 23:04:02 +02:00
Patrick Mezard
76e308b8db convert/svn: remove a useless recode() call in deletion path 2009-06-21 23:04:02 +02:00
Patrick Mezard
5943f46c36 convert/svn: remove useless encoding/decoding calls (issue1676) 2009-06-21 23:04:02 +02:00
Patrick Mezard
beed8285f4 convert/svn: remove dead code and obsolete comments 2009-06-21 23:04:01 +02:00
Dirkjan Ochtman
605b944edf kill trailing whitespace 2009-06-19 13:47:50 +02:00
Frank Kingswood
d0ec83933c convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Convert now handles errors from p4 during conversion more gracefully.
If keyword expansion is enabled in a P4 file then keywords will be
unexpanded in hg.
Added testcase for p4 filetypes and keyword (un)expansion.
This testcase ignores UTF and Apple files to avoid binary data.

Edited by pmezard: fixed collation issue on OSX
2009-06-18 10:39:04 +01:00
Brendan Cully
a03c60a23d Merge with crew-stable 2009-06-11 12:23:08 -07:00
Brendan Cully
50a940c93e bzr convert: restore paths to source encoding. Closes issue1692. 2009-06-11 12:18:40 -07:00
Benoit Boissinot
125a85ec87 use new style classes 2009-06-10 15:10:21 +02:00
Edouard Gomez
892817d985 convert: default to file protocol when no :// found for svn repo url
Edited by pmezard: add path separator normalization
2009-06-06 00:08:37 +02:00
Henrik Stuart
4ad17e2831 convert: better support for CVS branchpoints (issue1447)
This records the branches starting at individual CVS file revisions,
using the symbolic names map rather than just the branches
information.  This information is used to generate Mercurial
changesets. Despite the changes, the CVS conversion still suffers
heavily from cvsps' deficiencies in generating a correct
representation of the CVS repository history.
2009-06-09 08:59:49 +02:00
Patrick Mezard
a848b6f227 convert: rewrite tags when converting from hg to hg 2009-06-01 17:12:42 +02:00
Patrick Mezard
06e4a5967d convert: default revisions order depends on source
When converting Mercurial repositories you expect the revision numbers to be
preserved, while other sources conversions focus on efficiency.
2009-06-01 17:12:41 +02:00
Patrick Mezard
e8585b2da9 convert: fail fast if source does not support --sourcesort 2009-06-01 17:12:39 +02:00
Patrick Mezard
7c73a84f65 convert: add --sourcesort option for source specific sort
Only supported by Mercurial source for now.
2009-06-01 17:12:39 +02:00
Patrick Mezard
e3f91663d5 convert: parse sort mode sooner 2009-06-01 17:12:38 +02:00
Patrick Mezard
a745de1eb9 convert: split toposort() into subfunctions for readability 2009-06-01 17:12:37 +02:00
Martin Geisler
c624e91552 fixed typos found in translatable strings
This is from a spell-check of hg.pot.
2009-05-31 14:55:51 +02:00
Martin Geisler
1d423b04e4 convert/gnuarch: wrap long line, format kwargs without spaces 2009-05-31 01:29:30 +02:00