Commit Graph

40 Commits

Author SHA1 Message Date
Matt Mackall
f37d605b14 clean up remaining generic exceptions 2010-05-07 16:59:00 -05:00
Brandon Parsons
dc54791a49 cvs: skip bad tags
If the CVS repo somehow has a symbolic name that references a revision
consisting of a single number (e.g. BAD_TAG: 1), convert will fail when
attempting to find the branches, preventing the initial import from
working.
This patch skips those symbolic names--without warning.
2010-03-04 14:32:01 -06:00
Martin Geisler
9346f78d09 convert: mark strings for translation 2010-04-18 15:47:49 +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
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
Martin Geisler
9f1896c083 do not attempt to translate ui.debug output 2009-09-19 01:15:38 +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
Rocco Rutte
7373bdd271 convert: fix builtin cvsps when no branchpoints are present 2009-06-14 20:24:18 +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
Martin Geisler
053908e089 convert/cvsps: wrap long lines 2009-05-31 01:28:18 +02:00
Frank Kingswood
a4f60cfd85 convert: implement two hooks in builtin cvsps 2009-12-15 10:37:23 +00:00
Martin Geisler
4e29349121 convert/cvsps: use set.update for bulk update 2009-05-17 16:57:40 +02:00
Benoit Boissinot
04ba054816 convert: use set instead of dict 2009-05-17 03:04:17 +02:00
Martin Geisler
750183bdad updated license to be explicit about GPL version 2 2009-04-26 01:08:54 +02:00
Matt Mackall
2f9b02c62d replace util.sort with sorted built-in
This is marginally faster for small and moderately-sized lists
2009-04-26 16:50:44 -05:00
Greg Ward
c5b50c8953 cvsps: fix crash when log message refers to non-existent branch (issue1615). 2009-04-19 13:12:20 -04:00
Greg Ward
524e44bf0e cvsps: make debugging easier by adding __repr__() methods. 2009-04-18 09:43:21 -04:00
Greg Ward
53ff712654 cvsps: update docstring for changeset class. 2009-04-18 09:44:51 -04:00
Martin Geisler
42fa3800bd expand "rev" to "revision" in help texts 2009-04-07 23:06:50 +02:00
Rocco Rutte
4e357910ab convert: simple fix for non-existent synthetic/mergepoint attributes 2009-04-04 18:08:41 +02:00
Henrik Stuart
ced279d296 convert: added cvsnt mergepoint support 2009-04-02 14:48:06 +02:00
Greg Ward
4d99354f37 issue1578: fix crash: do not use synthetic changesets as merge parents. 2009-03-28 12:27:20 -04:00
Greg Ward
c9426abe07 cvsps: recognize and eliminate CVS' synthetic "file added" revisions. 2009-03-18 09:15:38 -04:00
Benoit Boissinot
722aaa1329 merge with crew 2009-01-04 21:49:37 +01:00
David Champion
f484d83337 cvsps: cvs log loop uses lookahead to avoid misleading text
Changes cvsps.py's cvs log reader to use a one-line lookahead, so
that possibly misleading log messages can be disambiguated.  In
particular I have past committers who used cvs log's 28-character
row of hyphens within commit messages; this throws cvsps and disrupts
conversion.  The only alternative in this case is to edit the cvs
,v file by hand, which bloodies mercurial's "don't change history"
principle.
2009-01-04 01:43:12 -06:00
Dirkjan Ochtman
19267d8a4d cvsps: kill some more trailing whitespace 2009-01-03 21:25:19 +01:00
Martin Geisler
cbcd677f60 lowercase ui.debug and assert output
This does not effect the log or status commands and should be okay
according to the compatibility rules.
2009-01-03 17:15:21 +01:00
Frank Kingswood
3e985ec0a4 Add debugcvsps command, replacing cvsps script 2008-12-10 14:02:54 +00:00
Benoit Boissinot
ea7fe6dacc remove unused variables 2008-10-28 19:25:26 +01:00
Patrick Mezard
8e45917fce convert: fix builtin cvsps under Windows
Drafted and reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>.
2008-10-13 17:31:03 +01:00
Martin Geisler
a791bcac31 i18n: mark strings for translation in convert extension 2008-08-31 16:12:02 +02:00
Matt Mackall
a65ef7bc5d util: add sort helper 2008-06-27 18:28:45 -05:00
Frank Kingswood
4e99be7f9e cvsps.py: remove unused Changeset member of logentry 2008-06-18 09:13:39 +01:00
Dirkjan Ochtman
08a17664d9 cvsps: fix a final whitespace nit 2008-06-18 11:09:18 +02:00
Matt Mackall
16a97c7d30 cvsps: fix up some whitespace 2008-06-17 12:10:19 -05:00
Frank Kingswood
9cb301831a convert: cvsps.py - code to generate changesets from a CVS repository 2008-06-15 15:59:27 +01:00