mercurial-source: hgext/convert/cvsps.py annotate

annotate hgext/convert/cvsps.py @ 10695:b4b16e90712f stable

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>.

author	Mathieu Clabaut <mathieu.clabaut@systerel.fr>
date	Tue, 09 Mar 2010 12:09:57 +0100
parents	08a0f04b56bd
children	35893dcfd40c

rev	line source
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	1 # Mercurial built-in replacement for cvsps.
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	2 #
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	3 # Copyright 2008, Frank Kingswood <frank@kingswood-consulting.co.uk>
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8209 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9466 diff changeset	6 # GNU General Public License version 2 or any later version.
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	7
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	8 import os
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	9 import re
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	10 import cPickle as pickle
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	11 from mercurial import util
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	12 from mercurial.i18n import _
10090 69ce7a10e593 convert: implement two hooks in builtin cvsps Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 9466 diff changeset	13 from mercurial import hook
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	14
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	15 class logentry(object):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	16 '''Class logentry has the following attributes:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	17 .author - author name as CVS knows it
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	18 .branch - name of branch this revision is on
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	19 .branches - revision tuple of branches starting at this revision
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	20 .comment - commit message
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	21 .date - the commit date as a (time, tz) tuple
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	22 .dead - true if file revision is dead
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	23 .file - Name of file
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	24 .lines - a tuple (+lines, -lines) or None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	25 .parent - Previous revision of this entry
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	26 .rcs - name of file as returned from CVS
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	27 .revision - revision number as tuple
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	28 .tags - list of tags on the file
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	29 .synthetic - is this a synthetic "file ... added on ..." revision?
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	30 .mergepoint- the branch that has been merged from
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	31 (if present in rlog output)
8756 6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	32 .branchpoints- the branches that start at the current entry
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	33 '''
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	34 def __init__(self, **entries):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	35 self.__dict__.update(entries)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	36
8079 19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	37 def __repr__(self):
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	38 return "<%s at 0x%x: %s %s>" % (self.__class__.__name__,
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	39 id(self),
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	40 self.file,
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	41 ".".join(map(str, self.revision)))
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	42
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	43 class logerror(Exception):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	44 pass
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	45
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	46 def getrepopath(cvspath):
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	47 """Return the repository path from a CVS path.
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	48
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	49 >>> getrepopath('/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	50 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	51 >>> getrepopath('c:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	52 'c:/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	53 >>> getrepopath(':pserver:10/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	54 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	55 >>> getrepopath(':pserver:10c:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	56 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	57 >>> getrepopath(':pserver:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	58 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	59 >>> getrepopath(':pserver:c:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	60 'c:/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	61 >>> getrepopath(':pserver:truc@foo.bar:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	62 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	63 >>> getrepopath(':pserver:truc@foo.bar:c:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	64 'c:/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	65 """
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	66 # According to CVS manual, CVS paths are expressed like:
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	67 # [:method:][[user][:password]@]hostname[:[port]]/path/to/repository
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	68 #
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	69 # Unfortunately, Windows absolute paths start with a drive letter
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	70 # like 'c:' making it harder to parse. Here we assume that drive
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	71 # letters are only one character long and any CVS component before
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	72 # the repository path is at least 2 characters long, and use this
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	73 # to disambiguate.
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	74 parts = cvspath.split(':')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	75 if len(parts) == 1:
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	76 return parts[0]
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	77 # Here there is an ambiguous case if we have a port number
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	78 # immediately followed by a Windows driver letter. We assume this
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	79 # never happens and decide it must be CVS path component,
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	80 # therefore ignoring it.
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	81 if len(parts[-2]) > 1:
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	82 return parts[-1].lstrip('0123456789')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	83 return parts[-2] + ':' + parts[-1]
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	84
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	85 def createlog(ui, directory=None, root="", rlog=True, cache=None):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	86 '''Collect the CVS rlog'''
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	87
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	88 # Because we store many duplicate commit log messages, reusing strings
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	89 # saves a lot of memory and pickle storage space.
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	90 _scache = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	91 def scache(s):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	92 "return a shared version of a string"
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	93 return _scache.setdefault(s, s)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	94
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	95 ui.status(_('collecting CVS rlog\n'))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	96
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	97 log = [] # list of logentry objects containing the CVS state
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	98
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	99 # patterns to match in CVS (r)log output, by state of use
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	100 re_00 = re.compile('RCS file: (.+)$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	101 re_01 = re.compile('cvs \\[r?log aborted\\]: (.+)$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	102 re_02 = re.compile('cvs (r?log\|server): (.+)\n$')
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	103 re_03 = re.compile("(Cannot access.+CVSROOT)\|"
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	104 "(can't create temporary directory.+)$")
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	105 re_10 = re.compile('Working file: (.+)$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	106 re_20 = re.compile('symbolic names:')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	107 re_30 = re.compile('\t(.+): ([\\d.]+)$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	108 re_31 = re.compile('----------------------------$')
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	109 re_32 = re.compile('======================================='
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	110 '======================================$')
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	111 re_50 = re.compile('revision ([\\d.]+)(\s+locked by:\s+.+;)?$')
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	112 re_60 = re.compile(r'date:\s+(.+);\s+author:\s+(.+);\s+state:\s+(.+?);'
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	113 r'(\s+lines:\s+(\+\d+)?\s+(-\d+)?;)?'
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	114 r'(.*mergepoint:\s+([^;]+);)?')
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	115 re_70 = re.compile('branches: (.+);$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	116
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	117 file_added_re = re.compile(r'file [^/]+ was (initially )?added on branch')
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	118
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	119 prefix = '' # leading path to strip of what we get from CVS
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	120
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	121 if directory is None:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	122 # Current working directory
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	123
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	124 # Get the real directory in the repository
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	125 try:
9031 3b76321aa0de compat: use open() instead of file() everywhere Alejandro Santos <alejolp@alejolp.com> parents: 8890 diff changeset	126 prefix = open(os.path.join('CVS','Repository')).read().strip()
10695 b4b16e90712f convert: teach cvsps to handle . repository (issue1649) Mathieu Clabaut <mathieu.clabaut@systerel.fr> parents: 10282 diff changeset	127 directory = prefix
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	128 if prefix == ".":
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	129 prefix = ""
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	130 except IOError:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	131 raise logerror('Not a CVS sandbox')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	132
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	133 if prefix and not prefix.endswith(os.sep):
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	134 prefix += os.sep
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	135
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	136 # Use the Root file in the sandbox, if it exists
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	137 try:
9031 3b76321aa0de compat: use open() instead of file() everywhere Alejandro Santos <alejolp@alejolp.com> parents: 8890 diff changeset	138 root = open(os.path.join('CVS','Root')).read().strip()
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	139 except IOError:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	140 pass
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	141
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	142 if not root:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	143 root = os.environ.get('CVSROOT', '')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	144
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	145 # read log cache if one exists
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	146 oldlog = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	147 date = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	148
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	149 if cache:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	150 cachedir = os.path.expanduser('~/.hg.cvsps')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	151 if not os.path.exists(cachedir):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	152 os.mkdir(cachedir)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	153
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	154 # The cvsps cache pickle needs a uniquified name, based on the
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	155 # repository location. The address may have all sort of nasties
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	156 # in it, slashes, colons and such. So here we take just the
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	157 # alphanumerics, concatenated in a way that does not mix up the
6696 49c0be9eb8c4 cvsps: fix a final whitespace nit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6688 diff changeset	158 # various components, so that
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	159 # :pserver:user@server:/path
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	160 # and
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	161 # /pserver/user/server/path
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	162 # are mapped to different cache file names.
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	163 cachefile = root.split(":") + [directory, "cache"]
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	164 cachefile = ['-'.join(re.findall(r'\w+', s)) for s in cachefile if s]
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	165 cachefile = os.path.join(cachedir,
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	166 '.'.join([s for s in cachefile if s]))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	167
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	168 if cache == 'update':
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	169 try:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	170 ui.note(_('reading cvs log cache %s\n') % cachefile)
9031 3b76321aa0de compat: use open() instead of file() everywhere Alejandro Santos <alejolp@alejolp.com> parents: 8890 diff changeset	171 oldlog = pickle.load(open(cachefile))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	172 ui.note(_('cache has %d log entries\n') % len(oldlog))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	173 except Exception, e:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	174 ui.note(_('error reading cache: %r\n') % e)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	175
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	176 if oldlog:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	177 date = oldlog[-1].date # last commit date as a (time,tz) tuple
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	178 date = util.datestr(date, '%Y/%m/%d %H:%M:%S %1%2')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	179
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	180 # build the CVS commandline
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	181 cmd = ['cvs', '-q']
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	182 if root:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	183 cmd.append('-d%s' % root)
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	184 p = util.normpath(getrepopath(root))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	185 if not p.endswith('/'):
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	186 p += '/'
10695 b4b16e90712f convert: teach cvsps to handle . repository (issue1649) Mathieu Clabaut <mathieu.clabaut@systerel.fr> parents: 10282 diff changeset	187 if prefix:
b4b16e90712f convert: teach cvsps to handle . repository (issue1649) Mathieu Clabaut <mathieu.clabaut@systerel.fr> parents: 10282 diff changeset	188 # looks like normpath replaces "" by "."
b4b16e90712f convert: teach cvsps to handle . repository (issue1649) Mathieu Clabaut <mathieu.clabaut@systerel.fr> parents: 10282 diff changeset	189 prefix = p + util.normpath(prefix)
b4b16e90712f convert: teach cvsps to handle . repository (issue1649) Mathieu Clabaut <mathieu.clabaut@systerel.fr> parents: 10282 diff changeset	190 else:
b4b16e90712f convert: teach cvsps to handle . repository (issue1649) Mathieu Clabaut <mathieu.clabaut@systerel.fr> parents: 10282 diff changeset	191 prefix = p
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	192 cmd.append(['log', 'rlog'][rlog])
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	193 if date:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	194 # no space between option and date string
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	195 cmd.append('-d>%s' % date)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	196 cmd.append(directory)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	197
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	198 # state machine begins here
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	199 tags = {} # dictionary of revisions on current file with their tags
7956 3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	200 branchmap = {} # mapping between branch names and revision numbers
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	201 state = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	202 store = False # set when a new record can be appended
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	203
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	204 cmd = [util.shellquote(arg) for arg in cmd]
6956 12472a240398 i18n: mark strings for translation in convert extension Martin Geisler <mg@daimi.au.dk> parents: 6764 diff changeset	205 ui.note(_("running %s\n") % (' '.join(cmd)))
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9032 diff changeset	206 ui.debug("prefix=%r directory=%r root=%r\n" % (prefix, directory, root))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	207
7589 9811cc670c51 cvsps: cvs log loop uses lookahead to avoid misleading text David Champion <dgc@uchicago.edu> parents: 7567 diff changeset	208 pfp = util.popen(' '.join(cmd))
9811cc670c51 cvsps: cvs log loop uses lookahead to avoid misleading text David Champion <dgc@uchicago.edu> parents: 7567 diff changeset	209 peek = pfp.readline()
9811cc670c51 cvsps: cvs log loop uses lookahead to avoid misleading text David Champion <dgc@uchicago.edu> parents: 7567 diff changeset	210 while True:
9811cc670c51 cvsps: cvs log loop uses lookahead to avoid misleading text David Champion <dgc@uchicago.edu> parents: 7567 diff changeset	211 line = peek
9811cc670c51 cvsps: cvs log loop uses lookahead to avoid misleading text David Champion <dgc@uchicago.edu> parents: 7567 diff changeset	212 if line == '':
9811cc670c51 cvsps: cvs log loop uses lookahead to avoid misleading text David Champion <dgc@uchicago.edu> parents: 7567 diff changeset	213 break
9811cc670c51 cvsps: cvs log loop uses lookahead to avoid misleading text David Champion <dgc@uchicago.edu> parents: 7567 diff changeset	214 peek = pfp.readline()
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	215 if line.endswith('\n'):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	216 line = line[:-1]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	217 #ui.debug('state=%d line=%r\n' % (state, line))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	218
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	219 if state == 0:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	220 # initial state, consume input until we see 'RCS file'
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	221 match = re_00.match(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	222 if match:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	223 rcs = match.group(1)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	224 tags = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	225 if rlog:
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	226 filename = util.normpath(rcs[:-2])
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	227 if filename.startswith(prefix):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	228 filename = filename[len(prefix):]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	229 if filename.startswith('/'):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	230 filename = filename[1:]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	231 if filename.startswith('Attic/'):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	232 filename = filename[6:]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	233 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	234 filename = filename.replace('/Attic/', '/')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	235 state = 2
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	236 continue
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	237 state = 1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	238 continue
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	239 match = re_01.match(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	240 if match:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	241 raise Exception(match.group(1))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	242 match = re_02.match(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	243 if match:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	244 raise Exception(match.group(2))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	245 if re_03.match(line):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	246 raise Exception(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	247
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	248 elif state == 1:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	249 # expect 'Working file' (only when using log instead of rlog)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	250 match = re_10.match(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	251 assert match, _('RCS file must be followed by working file')
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	252 filename = util.normpath(match.group(1))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	253 state = 2
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	254
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	255 elif state == 2:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	256 # expect 'symbolic names'
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	257 if re_20.match(line):
7956 3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	258 branchmap = {}
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	259 state = 3
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	260
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	261 elif state == 3:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	262 # read the symbolic names and store as tags
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	263 match = re_30.match(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	264 if match:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	265 rev = [int(x) for x in match.group(2).split('.')]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	266
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	267 # Convert magic branch number to an odd-numbered one
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	268 revn = len(rev)
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	269 if revn > 3 and (revn % 2) == 0 and rev[-2] == 0:
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	270 rev = rev[:-2] + rev[-1:]
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	271 rev = tuple(rev)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	272
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	273 if rev not in tags:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	274 tags[rev] = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	275 tags[rev].append(match.group(1))
7956 3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	276 branchmap[match.group(1)] = match.group(2)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	277
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	278 elif re_31.match(line):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	279 state = 5
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	280 elif re_32.match(line):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	281 state = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	282
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	283 elif state == 4:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	284 # expecting '------' separator before first revision
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	285 if re_31.match(line):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	286 state = 5
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	287 else:
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	288 assert not re_32.match(line), _('must have at least '
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	289 'some revisions')
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	290
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	291 elif state == 5:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	292 # expecting revision number and possibly (ignored) lock indication
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	293 # we create the logentry here from values stored in states 0 to 4,
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	294 # as this state is re-entered for subsequent revisions of a file.
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	295 match = re_50.match(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	296 assert match, _('expected revision number')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	297 e = logentry(rcs=scache(rcs), file=scache(filename),
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	298 revision=tuple([int(x) for x in match.group(1).split('.')]),
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	299 branches=[], parent=None,
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	300 synthetic=False)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	301 state = 6
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	302
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	303 elif state == 6:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	304 # expecting date, author, state, lines changed
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	305 match = re_60.match(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	306 assert match, _('revision must be followed by date line')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	307 d = match.group(1)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	308 if d[2] == '/':
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	309 # Y2K
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	310 d = '19' + d
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	311
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	312 if len(d.split()) != 3:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	313 # cvs log dates always in GMT
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	314 d = d + ' UTC'
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	315 e.date = util.parsedate(d, ['%y/%m/%d %H:%M:%S',
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	316 '%Y/%m/%d %H:%M:%S',
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	317 '%Y-%m-%d %H:%M:%S'])
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	318 e.author = scache(match.group(2))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	319 e.dead = match.group(3).lower() == 'dead'
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	320
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	321 if match.group(5):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	322 if match.group(6):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	323 e.lines = (int(match.group(5)), int(match.group(6)))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	324 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	325 e.lines = (int(match.group(5)), 0)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	326 elif match.group(6):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	327 e.lines = (0, int(match.group(6)))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	328 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	329 e.lines = None
7956 3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	330
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	331 if match.group(7): # cvsnt mergepoint
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	332 myrev = match.group(8).split('.')
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	333 if len(myrev) == 2: # head
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	334 e.mergepoint = 'HEAD'
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	335 else:
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	336 myrev = '.'.join(myrev[:-2] + ['0', myrev[-2]])
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	337 branches = [b for b in branchmap if branchmap[b] == myrev]
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	338 assert len(branches) == 1, 'unknown branch: %s' % e.mergepoint
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	339 e.mergepoint = branches[0]
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	340 else:
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	341 e.mergepoint = None
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	342 e.comment = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	343 state = 7
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	344
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	345 elif state == 7:
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	346 # read the revision numbers of branches that start at this revision
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	347 # or store the commit log message otherwise
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	348 m = re_70.match(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	349 if m:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	350 e.branches = [tuple([int(y) for y in x.strip().split('.')])
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	351 for x in m.group(1).split(';')]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	352 state = 8
7589 9811cc670c51 cvsps: cvs log loop uses lookahead to avoid misleading text David Champion <dgc@uchicago.edu> parents: 7567 diff changeset	353 elif re_31.match(line) and re_50.match(peek):
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	354 state = 5
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	355 store = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	356 elif re_32.match(line):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	357 state = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	358 store = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	359 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	360 e.comment.append(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	361
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	362 elif state == 8:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	363 # store commit log message
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	364 if re_31.match(line):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	365 state = 5
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	366 store = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	367 elif re_32.match(line):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	368 state = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	369 store = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	370 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	371 e.comment.append(line)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	372
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	373 # When a file is added on a branch B1, CVS creates a synthetic
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	374 # dead trunk revision 1.1 so that the branch has a root.
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	375 # Likewise, if you merge such a file to a later branch B2 (one
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	376 # that already existed when the file was added on B1), CVS
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	377 # creates a synthetic dead revision 1.1.x.1 on B2. Don't drop
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	378 # these revisions now, but mark them synthetic so
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	379 # createchangeset() can take care of them.
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	380 if (store and
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	381 e.dead and
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	382 e.revision[-1] == 1 and # 1.1 or 1.1.x.1
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	383 len(e.comment) == 1 and
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	384 file_added_re.match(e.comment[0])):
9466 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9032 diff changeset	385 ui.debug('found synthetic revision in %s: %r\n'
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	386 % (e.rcs, e.comment[0]))
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	387 e.synthetic = True
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	388
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	389 if store:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	390 # clean up the results and save in the log.
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	391 store = False
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8171 diff changeset	392 e.tags = sorted([scache(x) for x in tags.get(e.revision, [])])
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	393 e.comment = scache('\n'.join(e.comment))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	394
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	395 revn = len(e.revision)
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	396 if revn > 3 and (revn % 2) == 0:
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	397 e.branch = tags.get(e.revision[:-1], [None])[0]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	398 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	399 e.branch = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	400
8756 6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	401 # find the branches starting from this revision
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	402 branchpoints = set()
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	403 for branch, revision in branchmap.iteritems():
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	404 revparts = tuple([int(i) for i in revision.split('.')])
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	405 if revparts[-2] == 0 and revparts[-1] % 2 == 0:
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	406 # normal branch
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	407 if revparts[:-2] == e.revision:
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	408 branchpoints.add(branch)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	409 elif revparts == (1, 1, 1): # vendor branch
8756 6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	410 if revparts in e.branches:
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	411 branchpoints.add(branch)
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	412 e.branchpoints = branchpoints
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	413
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	414 log.append(e)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	415
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	416 if len(log) % 100 == 0:
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	417 ui.status(util.ellipsis('%d %s' % (len(log), e.file), 80)+'\n')
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	418
9032 1fa80c5428b8 compat: use 'key' argument instead of 'cmp' when sorting a list Alejandro Santos <alejolp@alejolp.com> parents: 9031 diff changeset	419 log.sort(key=lambda x: (x.rcs, x.revision))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	420
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	421 # find parent revisions of individual files
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	422 versions = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	423 for e in log:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	424 branch = e.revision[:-1]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	425 p = versions.get((e.rcs, branch), None)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	426 if p is None:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	427 p = e.revision[:-2]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	428 e.parent = p
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	429 versions[(e.rcs, branch)] = e.revision
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	430
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	431 # update the log cache
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	432 if cache:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	433 if log:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	434 # join up the old and new logs
9032 1fa80c5428b8 compat: use 'key' argument instead of 'cmp' when sorting a list Alejandro Santos <alejolp@alejolp.com> parents: 9031 diff changeset	435 log.sort(key=lambda x: x.date)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	436
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	437 if oldlog and oldlog[-1].date >= log[0].date:
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	438 raise logerror('Log cache overlaps with new log entries,'
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	439 ' re-run without cache.')
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	440
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	441 log = oldlog + log
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	442
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	443 # write the new cachefile
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	444 ui.note(_('writing cvs log cache %s\n') % cachefile)
9031 3b76321aa0de compat: use open() instead of file() everywhere Alejandro Santos <alejolp@alejolp.com> parents: 8890 diff changeset	445 pickle.dump(log, open(cachefile, 'w'))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	446 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	447 log = oldlog
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	448
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	449 ui.status(_('%d log entries\n') % len(log))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	450
10090 69ce7a10e593 convert: implement two hooks in builtin cvsps Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 9466 diff changeset	451 hook.hook(ui, None, "cvslog", True, log=log)
69ce7a10e593 convert: implement two hooks in builtin cvsps Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 9466 diff changeset	452
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	453 return log
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	454
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	455
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	456 class changeset(object):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	457 '''Class changeset has the following attributes:
8078 fb162c47000b cvsps: update docstring for changeset class. Greg Ward <greg-hg@gerg.ca> parents: 8028 diff changeset	458 .id - integer identifying this changeset (list index)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	459 .author - author name as CVS knows it
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	460 .branch - name of branch this changeset is on, or None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	461 .comment - commit message
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	462 .date - the commit date as a (time,tz) tuple
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	463 .entries - list of logentry objects in this changeset
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	464 .parents - list of one or two parent changesets
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	465 .tags - list of tags on this changeset
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	466 .synthetic - from synthetic revision "file ... added on branch ..."
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	467 .mergepoint- the branch that has been merged from
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	468 (if present in rlog output)
8756 6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	469 .branchpoints- the branches that start at the current entry
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	470 '''
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	471 def __init__(self, **entries):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	472 self.__dict__.update(entries)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	473
8079 19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	474 def __repr__(self):
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	475 return "<%s at 0x%x: %s>" % (self.__class__.__name__,
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	476 id(self),
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	477 getattr(self, 'id', "(no id)"))
19229b0b292d cvsps: make debugging easier by adding __repr__() methods. Greg Ward <greg-hg@gerg.ca> parents: 8078 diff changeset	478
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	479 def createchangeset(ui, log, fuzz=60, mergefrom=None, mergeto=None):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	480 '''Convert log into changesets.'''
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	481
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	482 ui.status(_('creating changesets\n'))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	483
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	484 # Merge changesets
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	485
9032 1fa80c5428b8 compat: use 'key' argument instead of 'cmp' when sorting a list Alejandro Santos <alejolp@alejolp.com> parents: 9031 diff changeset	486 log.sort(key=lambda x: (x.comment, x.author, x.branch, x.date))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	487
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	488 changesets = []
8454 e9e2a2c9b294 convert: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8225 diff changeset	489 files = set()
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	490 c = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	491 for i, e in enumerate(log):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	492
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	493 # Check if log entry belongs to the current changeset or not.
8756 6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	494
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	495 # Since CVS is file centric, two different file revisions with
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	496 # different branchpoints should be treated as belonging to two
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	497 # different changesets (and the ordering is important and not
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	498 # honoured by cvsps at this point).
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	499 #
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	500 # Consider the following case:
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	501 # foo 1.1 branchpoints: [MYBRANCH]
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	502 # bar 1.1 branchpoints: [MYBRANCH, MYBRANCH2]
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	503 #
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	504 # Here foo is part only of MYBRANCH, but not MYBRANCH2, e.g. a
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	505 # later version of foo may be in MYBRANCH2, so foo should be the
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	506 # first changeset and bar the next and MYBRANCH and MYBRANCH2
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	507 # should both start off of the bar changeset. No provisions are
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	508 # made to ensure that this is, in fact, what happens.
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	509 if not (c and
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	510 e.comment == c.comment and
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	511 e.author == c.author and
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	512 e.branch == c.branch and
8890 c487719cccef convert: fix builtin cvsps when no branchpoints are present Rocco Rutte <pdmef@gmx.net> parents: 8756 diff changeset	513 (not hasattr(e, 'branchpoints') or
c487719cccef convert: fix builtin cvsps when no branchpoints are present Rocco Rutte <pdmef@gmx.net> parents: 8756 diff changeset	514 not hasattr (c, 'branchpoints') or
c487719cccef convert: fix builtin cvsps when no branchpoints are present Rocco Rutte <pdmef@gmx.net> parents: 8756 diff changeset	515 e.branchpoints == c.branchpoints) and
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	516 ((c.date[0] + c.date[1]) <=
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	517 (e.date[0] + e.date[1]) <=
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	518 (c.date[0] + c.date[1]) + fuzz) and
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	519 e.file not in files):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	520 c = changeset(comment=e.comment, author=e.author,
7956 3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	521 branch=e.branch, date=e.date, entries=[],
8756 6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	522 mergepoint=getattr(e, 'mergepoint', None),
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	523 branchpoints=getattr(e, 'branchpoints', set()))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	524 changesets.append(c)
8454 e9e2a2c9b294 convert: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8225 diff changeset	525 files = set()
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	526 if len(changesets) % 100 == 0:
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	527 t = '%d %s' % (len(changesets), repr(e.comment)[1:-1])
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	528 ui.status(util.ellipsis(t, 80) + '\n')
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	529
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	530 c.entries.append(e)
8454 e9e2a2c9b294 convert: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8225 diff changeset	531 files.add(e.file)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	532 c.date = e.date # changeset date is date of latest commit in it
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	533
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	534 # Mark synthetic changesets
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	535
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	536 for c in changesets:
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	537 # Synthetic revisions always get their own changeset, because
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	538 # the log message includes the filename. E.g. if you add file3
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	539 # and file4 on a branch, you get four log entries and three
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	540 # changesets:
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	541 # "File file3 was added on branch ..." (synthetic, 1 entry)
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	542 # "File file4 was added on branch ..." (synthetic, 1 entry)
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	543 # "Add file3 and file4 to fix ..." (real, 2 entries)
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	544 # Hence the check for 1 entry here.
7969 a969b1470987 convert: simple fix for non-existent synthetic/mergepoint attributes Rocco Rutte <pdmef@gmx.net> parents: 7956 diff changeset	545 synth = getattr(c.entries[0], 'synthetic', None)
a969b1470987 convert: simple fix for non-existent synthetic/mergepoint attributes Rocco Rutte <pdmef@gmx.net> parents: 7956 diff changeset	546 c.synthetic = (len(c.entries) == 1 and synth)
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	547
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	548 # Sort files in each changeset
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	549
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	550 for c in changesets:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	551 def pathcompare(l, r):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	552 'Mimic cvsps sorting order'
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	553 l = l.split('/')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	554 r = r.split('/')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	555 nl = len(l)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	556 nr = len(r)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	557 n = min(nl, nr)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	558 for i in range(n):
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	559 if i + 1 == nl and nl < nr:
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	560 return -1
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	561 elif i + 1 == nr and nl > nr:
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	562 return +1
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	563 elif l[i] < r[i]:
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	564 return -1
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	565 elif l[i] > r[i]:
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	566 return +1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	567 return 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	568 def entitycompare(l, r):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	569 return pathcompare(l.file, r.file)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	570
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	571 c.entries.sort(entitycompare)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	572
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	573 # Sort changesets by date
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	574
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	575 def cscmp(l, r):
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	576 d = sum(l.date) - sum(r.date)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	577 if d:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	578 return d
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	579
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	580 # detect vendor branches and initial commits on a branch
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	581 le = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	582 for e in l.entries:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	583 le[e.rcs] = e.revision
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	584 re = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	585 for e in r.entries:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	586 re[e.rcs] = e.revision
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	587
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	588 d = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	589 for e in l.entries:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	590 if re.get(e.rcs, None) == e.parent:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	591 assert not d
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	592 d = 1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	593 break
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	594
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	595 for e in r.entries:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	596 if le.get(e.rcs, None) == e.parent:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	597 assert not d
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	598 d = -1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	599 break
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	600
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	601 return d
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	602
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	603 changesets.sort(cscmp)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	604
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	605 # Collect tags
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	606
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	607 globaltags = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	608 for c in changesets:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	609 for e in c.entries:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	610 for tag in e.tags:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	611 # remember which is the latest changeset to have this tag
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	612 globaltags[tag] = c
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	613
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	614 for c in changesets:
8454 e9e2a2c9b294 convert: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8225 diff changeset	615 tags = set()
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	616 for e in c.entries:
8481 221786b9ce34 convert/cvsps: use set.update for bulk update Martin Geisler <mg@lazybytes.net> parents: 8454 diff changeset	617 tags.update(e.tags)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	618 # remember tags only if this is the latest changeset to have it
8454 e9e2a2c9b294 convert: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8225 diff changeset	619 c.tags = sorted(tag for tag in tags if globaltags[tag] is c)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	620
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	621 # Find parent changesets, handle {{mergetobranch BRANCHNAME}}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	622 # by inserting dummy changesets with two parents, and handle
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	623 # {{mergefrombranch BRANCHNAME}} by setting two parents.
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	624
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	625 if mergeto is None:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	626 mergeto = r'{{mergetobranch ([-\w]+)}}'
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	627 if mergeto:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	628 mergeto = re.compile(mergeto)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	629
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	630 if mergefrom is None:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	631 mergefrom = r'{{mergefrombranch ([-\w]+)}}'
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	632 if mergefrom:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	633 mergefrom = re.compile(mergefrom)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	634
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	635 versions = {} # changeset index where we saw any particular file version
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	636 branches = {} # changeset index where we saw a branch
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	637 n = len(changesets)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	638 i = 0
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	639 while i < n:
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	640 c = changesets[i]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	641
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	642 for f in c.entries:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	643 versions[(f.rcs, f.revision)] = i
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	644
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	645 p = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	646 if c.branch in branches:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	647 p = branches[c.branch]
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	648 else:
8756 6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	649 # first changeset on a new branch
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	650 # the parent is a changeset with the branch in its
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	651 # branchpoints such that it is the latest possible
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	652 # commit without any intervening, unrelated commits.
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	653
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	654 for candidate in xrange(i):
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	655 if c.branch not in changesets[candidate].branchpoints:
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	656 if p is not None:
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	657 break
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	658 continue
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	659 p = candidate
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	660
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	661 c.parents = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	662 if p is not None:
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	663 p = changesets[p]
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	664
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	665 # Ensure no changeset has a synthetic changeset as a parent.
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	666 while p.synthetic:
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	667 assert len(p.parents) <= 1, \
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	668 _('synthetic changeset cannot have multiple parents')
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	669 if p.parents:
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	670 p = p.parents[0]
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	671 else:
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	672 p = None
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	673 break
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	674
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	675 if p is not None:
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	676 c.parents.append(p)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	677
7956 3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	678 if c.mergepoint:
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	679 if c.mergepoint == 'HEAD':
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	680 c.mergepoint = None
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	681 c.parents.append(changesets[branches[c.mergepoint]])
3e7611a83230 convert: added cvsnt mergepoint support Henrik Stuart <henrik.stuart@edlund.dk> parents: 7950 diff changeset	682
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	683 if mergefrom:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	684 m = mergefrom.search(c.comment)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	685 if m:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	686 m = m.group(1)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	687 if m == 'HEAD':
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	688 m = None
8171 4e5bd9b97bb3 cvsps: fix crash when log message refers to non-existent branch (issue1615). Greg Ward <greg-hg@gerg.ca> parents: 8079 diff changeset	689 try:
4e5bd9b97bb3 cvsps: fix crash when log message refers to non-existent branch (issue1615). Greg Ward <greg-hg@gerg.ca> parents: 8079 diff changeset	690 candidate = changesets[branches[m]]
4e5bd9b97bb3 cvsps: fix crash when log message refers to non-existent branch (issue1615). Greg Ward <greg-hg@gerg.ca> parents: 8079 diff changeset	691 except KeyError:
4e5bd9b97bb3 cvsps: fix crash when log message refers to non-existent branch (issue1615). Greg Ward <greg-hg@gerg.ca> parents: 8079 diff changeset	692 ui.warn(_("warning: CVS commit message references "
4e5bd9b97bb3 cvsps: fix crash when log message refers to non-existent branch (issue1615). Greg Ward <greg-hg@gerg.ca> parents: 8079 diff changeset	693 "non-existent branch %r:\n%s\n")
4e5bd9b97bb3 cvsps: fix crash when log message refers to non-existent branch (issue1615). Greg Ward <greg-hg@gerg.ca> parents: 8079 diff changeset	694 % (m, c.comment))
7950 9bbcfa898cd3 issue1578: fix crash: do not use synthetic changesets as merge parents. Greg Ward <greg-hg@gerg.ca> parents: 7862 diff changeset	695 if m in branches and c.branch != m and not candidate.synthetic:
9bbcfa898cd3 issue1578: fix crash: do not use synthetic changesets as merge parents. Greg Ward <greg-hg@gerg.ca> parents: 7862 diff changeset	696 c.parents.append(candidate)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	697
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	698 if mergeto:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	699 m = mergeto.search(c.comment)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	700 if m:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	701 try:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	702 m = m.group(1)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	703 if m == 'HEAD':
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	704 m = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	705 except:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	706 m = None # if no group found then merge to HEAD
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	707 if m in branches and c.branch != m:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	708 # insert empty changeset for merge
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	709 cc = changeset(
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	710 author=c.author, branch=m, date=c.date,
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	711 comment='convert-repo: CVS merge from branch %s'
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	712 % c.branch,
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	713 entries=[], tags=[],
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	714 parents=[changesets[branches[m]], c])
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	715 changesets.insert(i + 1, cc)
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	716 branches[m] = i + 1
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	717
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	718 # adjust our loop counters now we have inserted a new entry
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	719 n += 1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	720 i += 2
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	721 continue
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	722
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	723 branches[c.branch] = i
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	724 i += 1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	725
7862 02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	726 # Drop synthetic changesets (safe now that we have ensured no other
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	727 # changesets can have them as parents).
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	728 i = 0
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	729 while i < len(changesets):
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	730 if changesets[i].synthetic:
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	731 del changesets[i]
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	732 else:
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	733 i += 1
02981000012e cvsps: recognize and eliminate CVS' synthetic "file added" revisions. Greg Ward <greg-hg@gerg.ca> parents: 7598 diff changeset	734
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	735 # Number changesets
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	736
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	737 for i, c in enumerate(changesets):
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	738 c.id = i + 1
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	739
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	740 ui.status(_('%d changeset entries\n') % len(changesets))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	741
10090 69ce7a10e593 convert: implement two hooks in builtin cvsps Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 9466 diff changeset	742 hook.hook(ui, None, "cvschangesets", True, changesets=changesets)
69ce7a10e593 convert: implement two hooks in builtin cvsps Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 9466 diff changeset	743
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	744 return changesets
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	745
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	746
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	747 def debugcvsps(ui, args, *opts):
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	748 '''Read CVS rlog for current directory or named path in
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	749 repository, and convert the log to changesets based on matching
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	750 commit log entries and dates.
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	751 '''
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	752 if opts["new_cache"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	753 cache = "write"
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	754 elif opts["update_cache"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	755 cache = "update"
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	756 else:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	757 cache = None
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	758
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	759 revisions = opts["revisions"]
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	760
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	761 try:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	762 if args:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	763 log = []
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	764 for d in args:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	765 log += createlog(ui, d, root=opts["root"], cache=cache)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	766 else:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	767 log = createlog(ui, root=opts["root"], cache=cache)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	768 except logerror, e:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	769 ui.write("%r\n"%e)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	770 return
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	771
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	772 changesets = createchangeset(ui, log, opts["fuzz"])
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	773 del log
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	774
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	775 # Print changesets (optionally filtered)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	776
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	777 off = len(revisions)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	778 branches = {} # latest version number in each branch
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	779 ancestors = {} # parent branch
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	780 for cs in changesets:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	781
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	782 if opts["ancestors"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	783 if cs.branch not in branches and cs.parents and cs.parents[0].id:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	784 ancestors[cs.branch] = (changesets[cs.parents[0].id - 1].branch,
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	785 cs.parents[0].id)
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	786 branches[cs.branch] = cs.id
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	787
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	788 # limit by branches
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	789 if opts["branches"] and (cs.branch or 'HEAD') not in opts["branches"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	790 continue
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	791
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	792 if not off:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	793 # Note: trailing spaces on several lines here are needed to have
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	794 # bug-for-bug compatibility with cvsps.
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	795 ui.write('---------------------\n')
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	796 ui.write('PatchSet %d \n' % cs.id)
8661 883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	797 ui.write('Date: %s\n' % util.datestr(cs.date,
883f14fcd1df convert/cvsps: wrap long lines Martin Geisler <mg@lazybytes.net> parents: 8481 diff changeset	798 '%Y/%m/%d %H:%M:%S %1%2'))
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	799 ui.write('Author: %s\n' % cs.author)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	800 ui.write('Branch: %s\n' % (cs.branch or 'HEAD'))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	801 ui.write('Tag%s: %s \n' % (['', 's'][len(cs.tags) > 1],
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	802 ','.join(cs.tags) or '(none)'))
8756 6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	803 branchpoints = getattr(cs, 'branchpoints', None)
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	804 if branchpoints:
6019e6517f95 convert: better support for CVS branchpoints (issue1447) Henrik Stuart <hg@hstuart.dk> parents: 8661 diff changeset	805 ui.write('Branchpoints: %s \n' % ', '.join(branchpoints))
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	806 if opts["parents"] and cs.parents:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	807 if len(cs.parents) > 1:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	808 ui.write('Parents: %s\n' %
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	809 (','.join([str(p.id) for p in cs.parents])))
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	810 else:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	811 ui.write('Parent: %d\n' % cs.parents[0].id)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	812
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	813 if opts["ancestors"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	814 b = cs.branch
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	815 r = []
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	816 while b:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	817 b, c = ancestors[b]
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	818 r.append('%s:%d:%d' % (b or "HEAD", c, branches[b]))
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	819 if r:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	820 ui.write('Ancestors: %s\n' % (','.join(r)))
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	821
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	822 ui.write('Log:\n')
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	823 ui.write('%s\n\n' % cs.comment)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	824 ui.write('Members: \n')
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	825 for f in cs.entries:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	826 fn = f.file
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	827 if fn.startswith(opts["prefix"]):
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	828 fn = fn[len(opts["prefix"]):]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	829 ui.write('\t%s:%s->%s%s \n' % (
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	830 fn, '.'.join([str(x) for x in f.parent]) or 'INITIAL',
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	831 '.'.join([str(x) for x in f.revision]),
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	832 ['', '(DEAD)'][f.dead]))
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	833 ui.write('\n')
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	834
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	835 # have we seen the start tag?
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	836 if revisions and off:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	837 if revisions[0] == str(cs.id) or \
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	838 revisions[0] in cs.tags:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	839 off = False
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	840
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	841 # see if we reached the end tag
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	842 if len(revisions) > 1 and not off:
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	843 if revisions[1] == str(cs.id) or \
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	844 revisions[1] in cs.tags:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	845 break

Mercurial > hg > mercurial-source

annotate hgext/convert/cvsps.py @ 10695:b4b16e90712f stable