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

annotate hgext/convert/cvsps.py @ 7502:16905fc2690f

Add debugcvsps command, replacing cvsps script

author	Frank Kingswood <frank@kingswood-consulting.co.uk>
date	Wed, 10 Dec 2008 14:02:54 +0000
parents	810ca383da9c
children	8bea01a65391

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 #
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	2 # 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	3 #
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	4 # 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	5 #
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	6 # This software may be used and distributed according to the terms
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	8
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	9 import os
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	10 import re
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	11 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	12 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	13 from mercurial.i18n import _
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 def listsort(list, key):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	16 "helper to sort by key in Python 2.3"
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	17 try:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	18 list.sort(key=key)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	19 except TypeError:
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	20 list.sort(lambda l, r: cmp(key(l), key(r)))
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	21
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	22 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	23 '''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	24 .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	25 .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	26 .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	27 .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	28 .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	29 .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	30 .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	31 .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	32 .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	33 .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	34 .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	35 .tags - list of tags on the file
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	36 '''
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	37 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	38 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	39
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	40 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	41 pass
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	42
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	43 def getrepopath(cvspath):
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	44 """Return the repository path from a CVS path.
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	45
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	46 >>> getrepopath('/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	47 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	48 >>> getrepopath('c:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	49 'c:/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	50 >>> getrepopath(':pserver:10/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	51 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	52 >>> getrepopath(':pserver:10c:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	53 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	54 >>> getrepopath(':pserver:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	55 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	56 >>> getrepopath(':pserver:c:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	57 'c:/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	58 >>> getrepopath(':pserver:truc@foo.bar:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	59 '/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	60 >>> getrepopath(':pserver:truc@foo.bar:c:/foo/bar')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	61 'c:/foo/bar'
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	62 """
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	63 # 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	64 # [:method:][[user][:password]@]hostname[:[port]]/path/to/repository
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 # 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	67 # 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	68 # 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	69 # 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	70 # to disambiguate.
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	71 parts = cvspath.split(':')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	72 if len(parts) == 1:
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	73 return parts[0]
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	74 # 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	75 # 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	76 # 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	77 # therefore ignoring it.
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	78 if len(parts[-2]) > 1:
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	79 return parts[-1].lstrip('0123456789')
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	80 return parts[-2] + ':' + parts[-1]
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	81
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	82 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	83 '''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	84
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	85 # 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	86 # 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	87 _scache = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	88 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	89 "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	90 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	91
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	92 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	93
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	94 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	95
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	96 # 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	97 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	98 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	99 re_02 = re.compile('cvs (r?log\|server): (.+)\n$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	100 re_03 = re.compile("(Cannot access.+CVSROOT)\|(can't create temporary directory.+)$")
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	101 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	102 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	103 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	104 re_31 = re.compile('----------------------------$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	105 re_32 = re.compile('=============================================================================$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	106 re_50 = re.compile('revision ([\\d.]+)(\s+locked by:\s+.+;)?$')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	107 re_60 = re.compile(r'date:\s+(.+);\s+author:\s+(.+);\s+state:\s+(.+?);(\s+lines:\s+(\+\d+)?\s+(-\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_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	109
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	110 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	111
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	112 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	113 # 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	114
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	115 # 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	116 try:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	117 prefix = file(os.path.join('CVS','Repository')).read().strip()
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	118 if prefix == ".":
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	119 prefix = ""
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	120 directory = prefix
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	121 except IOError:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	122 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	123
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	124 if prefix and not prefix.endswith(os.sep):
d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	125 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	126
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	127 # 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	128 try:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	129 root = file(os.path.join('CVS','Root')).read().strip()
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 pass
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	132
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	133 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	134 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	135
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	136 # 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	137 oldlog = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	138 date = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	139
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	140 if cache:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	141 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	142 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	143 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	144
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	145 # 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	146 # 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	147 # 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	148 # 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	149 # 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	150 # :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	151 # and
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	152 # /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	153 # are mapped to different cache file names.
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	154 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	155 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	156 cachefile = os.path.join(cachedir,
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	157 '.'.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	158
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	159 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	160 try:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	161 ui.note(_('reading cvs log cache %s\n') % cachefile)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	162 oldlog = pickle.load(file(cachefile))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	163 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	164 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	165 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	166
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	167 if oldlog:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	168 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	169 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	170
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	171 # 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	172 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	173 if root:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	174 cmd.append('-d%s' % root)
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	175 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	176 if not p.endswith('/'):
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	177 p += '/'
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	178 prefix = p + util.normpath(prefix)
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	179 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	180 if date:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	181 # 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	182 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	183 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	184
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	185 # 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	186 tags = {} # dictionary of revisions on current file with their tags
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	187 state = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	188 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	189
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	190 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	191 ui.note(_("running %s\n") % (' '.join(cmd)))
12472a240398 i18n: mark strings for translation in convert extension Martin Geisler <mg@daimi.au.dk> parents: 6764 diff changeset	192 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	193
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	194 for line in util.popen(' '.join(cmd)):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	195 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	196 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	197 #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	198
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	199 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	200 # 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	201 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	202 if match:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	203 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	204 tags = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	205 if rlog:
7097 d4218edd55bd convert: fix builtin cvsps under Windows Patrick Mezard <pmezard@gmail.com> parents: 6956 diff changeset	206 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	207 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	208 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	209 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	210 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	211 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	212 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	213 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	214 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	215 state = 2
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	216 continue
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	217 state = 1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	218 continue
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	219 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	220 if match:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	221 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	222 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	223 if match:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	224 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	225 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	226 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	227
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	228 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	229 # 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	230 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	231 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	232 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	233 state = 2
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	234
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	235 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	236 # 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	237 if re_20.match(line):
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	238 state = 3
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	239
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	240 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	241 # 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	242 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	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 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	245
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	246 # 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	247 revn = len(rev)
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	248 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	249 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	250 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	251
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	252 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	253 tags[rev] = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	254 tags[rev].append(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	255
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	256 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	257 state = 5
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	258 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	259 state = 0
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 == 4:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	262 # 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	263 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	264 state = 5
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	265 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	266 assert not re_32.match(line), _('Must have at least some revisions')
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	267
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	268 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	269 # 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	270 # 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	271 # 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	272 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	273 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	274 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	275 revision=tuple([int(x) for x in match.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	276 branches=[], parent=None)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	277 state = 6
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	278
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	279 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	280 # 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	281 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	282 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	283 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	284 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	285 # Y2K
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	286 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	287
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	288 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	289 # cvs log dates always in GMT
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	290 d = d + ' UTC'
6687 f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	291 e.date = util.parsedate(d, ['%y/%m/%d %H:%M:%S', '%Y/%m/%d %H:%M:%S', '%Y-%m-%d %H:%M:%S'])
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	292 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	293 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	294
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	295 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	296 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	297 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	298 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	299 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	300 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	301 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	302 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	303 e.lines = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	304 e.comment = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	305 state = 7
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	306
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	307 elif state == 7:
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	308 # 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	309 # 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	310 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	311 if m:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	312 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	313 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	314 state = 8
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	315 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	316 state = 5
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	317 store = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	318 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	319 state = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	320 store = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	321 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	322 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	323
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	324 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	325 # 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	326 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	327 state = 5
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	328 store = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	329 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	330 state = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	331 store = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	332 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	333 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	334
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	335 if store:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	336 # 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	337 store = False
6764 f67d1468ac50 util: add sort helper Matt Mackall <mpm@selenic.com> parents: 6699 diff changeset	338 e.tags = util.sort([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	339 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	340
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	341 revn = len(e.revision)
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	342 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	343 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	344 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	345 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	346
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	347 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	348
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	349 if len(log) % 100 == 0:
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	350 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	351
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	352 listsort(log, key=lambda x:(x.rcs, x.revision))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	353
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	354 # 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	355 versions = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	356 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	357 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	358 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	359 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	360 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	361 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	362 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	363
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	364 # 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	365 if cache:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	366 if log:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	367 # join up the old and new logs
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	368 listsort(log, key=lambda x:x.date)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	369
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	370 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	371 raise logerror('Log cache overlaps with new log entries,'
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	372 ' 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	373
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	374 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	375
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	376 # 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	377 ui.note(_('writing cvs log cache %s\n') % cachefile)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	378 pickle.dump(log, file(cachefile, 'w'))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	379 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	380 log = oldlog
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	381
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	382 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	383
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	384 return log
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	385
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	386
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	387 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	388 '''Class changeset 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	389 .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	390 .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	391 .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	392 .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	393 .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	394 .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	395 .tags - list of tags on this changeset
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	396 '''
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	397 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	398 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	399
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	400 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	401 '''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	402
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	403 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	404
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	405 # Merge changesets
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	406
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	407 listsort(log, key=lambda x:(x.comment, x.author, x.branch, x.date))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	408
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	409 changesets = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	410 files = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	411 c = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	412 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	413
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	414 # Check if log entry belongs to the current changeset or not.
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	415 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	416 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	417 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	418 e.branch == c.branch and
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	419 ((c.date[0] + c.date[1]) <=
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	420 (e.date[0] + e.date[1]) <=
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	421 (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	422 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	423 c = changeset(comment=e.comment, author=e.author,
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.branch, date=e.date, entries=[])
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	425 changesets.append(c)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	426 files = {}
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	427 if len(changesets) % 100 == 0:
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	428 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	429 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	430
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	431 c.entries.append(e)
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	432 files[e.file] = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	433 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	434
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	435 # 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	436
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	437 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	438 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	439 '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	440 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	441 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	442 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	443 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	444 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	445 for i in range(n):
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	446 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	447 return -1
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	448 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	449 return +1
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	450 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	451 return -1
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	452 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	453 return +1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	454 return 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	455 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	456 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	457
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	458 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	459
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	460 # 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	461
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	462 def cscmp(l, r):
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	463 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	464 if d:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	465 return d
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	466
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	467 # 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	468 le = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	469 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	470 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	471 re = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	472 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	473 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	474
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	475 d = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	476 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	477 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	478 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	479 d = 1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	480 break
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 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	483 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	484 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	485 d = -1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	486 break
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 return d
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	489
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	490 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	491
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	492 # Collect tags
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	493
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	494 globaltags = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	495 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	496 tags = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	497 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	498 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	499 # 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	500 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	501
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	502 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	503 tags = {}
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	504 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	505 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	506 tags[tag] = True
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	507 # remember tags only if this is the latest changeset to have it
6764 f67d1468ac50 util: add sort helper Matt Mackall <mpm@selenic.com> parents: 6699 diff changeset	508 c.tags = util.sort([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	509
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	510 # 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	511 # 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	512 # {{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	513
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	514 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	515 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	516 if mergeto:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	517 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	518
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	519 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	520 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	521 if mergefrom:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	522 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	523
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	524 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	525 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	526 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	527 i = 0
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	528 while i<n:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	529 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	530
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	531 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	532 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	533
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	534 p = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	535 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	536 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	537 else:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	538 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	539 p = max(p, versions.get((f.rcs, f.parent), None))
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	540
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	541 c.parents = []
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	542 if p is not None:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	543 c.parents.append(changesets[p])
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	544
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	545 if mergefrom:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	546 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	547 if m:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	548 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	549 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	550 m = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	551 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	552 c.parents.append(changesets[branches[m]])
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	553
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	554 if mergeto:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	555 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	556 if m:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	557 try:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	558 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	559 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	560 m = None
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	561 except:
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	562 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	563 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	564 # insert empty changeset for merge
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	565 cc = changeset(author=c.author, branch=m, date=c.date,
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	566 comment='convert-repo: CVS merge from branch %s' % c.branch,
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	567 entries=[], tags=[], parents=[changesets[branches[m]], c])
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	568 changesets.insert(i + 1, cc)
5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	569 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	570
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	571 # 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	572 n += 1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	573 i += 2
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	574 continue
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	575
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	576 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	577 i += 1
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	578
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	579 # Number changesets
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	580
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	581 for i, c in enumerate(changesets):
6688 5cd7a8433cd4 cvsps: fix up some whitespace Matt Mackall <mpm@selenic.com> parents: 6687 diff changeset	582 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	583
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	584 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	585
f8ef39206f6a convert: cvsps.py - code to generate changesets from a CVS repository Frank Kingswood <frank@kingswood-consulting.co.uk> parents: diff changeset	586 return changesets
7502 16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	587
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	588
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	589 def debugcvsps(ui, args, *opts):
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	590 '''Read CVS rlog for current directory or named path in repository, and
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	591 convert the log to changesets based on matching commit log entries and dates.'''
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	592
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	593 if opts["new_cache"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	594 cache = "write"
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	595 elif opts["update_cache"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	596 cache = "update"
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	597 else:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	598 cache = None
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	599
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	600 revisions = opts["revisions"]
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	601
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	602 try:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	603 if args:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	604 log = []
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	605 for d in args:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	606 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	607 else:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	608 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	609 except logerror, e:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	610 ui.write("%r\n"%e)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	611 return
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	612
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	613 changesets = createchangeset(ui, log, opts["fuzz"])
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	614 del log
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	615
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	616 # Print changesets (optionally filtered)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	617
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	618 off = len(revisions)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	619 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	620 ancestors = {} # parent branch
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	621 for cs in changesets:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	622
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	623 if opts["ancestors"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	624 if cs.branch not in branches and cs.parents and cs.parents[0].id:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	625 ancestors[cs.branch] = changesets[cs.parents[0].id-1].branch, cs.parents[0].id
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	626 branches[cs.branch] = cs.id
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	627
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	628 # limit by branches
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	629 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	630 continue
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	631
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	632 if not off:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	633 # 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	634 # bug-for-bug compatibility with cvsps.
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	635 ui.write('---------------------\n')
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	636 ui.write('PatchSet %d \n' % cs.id)
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	637 ui.write('Date: %s\n' % util.datestr(cs.date, '%Y/%m/%d %H:%M:%S %1%2'))
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	638 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	639 ui.write('Branch: %s\n' % (cs.branch or 'HEAD'))
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	640 ui.write('Tag%s: %s \n' % (['', 's'][len(cs.tags)>1],
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	641 ','.join(cs.tags) or '(none)'))
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	642 if opts["parents"] and cs.parents:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	643 if len(cs.parents)>1:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	644 ui.write('Parents: %s\n' % (','.join([str(p.id) for p in cs.parents])))
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	645 else:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	646 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	647
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	648 if opts["ancestors"]:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	649 b = cs.branch
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	650 r = []
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	651 while b:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	652 b, c = ancestors[b]
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	653 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	654 if r:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	655 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	656
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	657 ui.write('Log:\n')
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	658 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	659 ui.write('Members: \n')
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	660 for f in cs.entries:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	661 fn = f.file
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	662 if fn.startswith(opts["prefix"]):
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	663 fn = fn[len(opts["prefix"]):]
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	664 ui.write('\t%s:%s->%s%s \n' % (fn, '.'.join([str(x) for x in f.parent]) or 'INITIAL',
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	665 '.'.join([str(x) for x in f.revision]), ['', '(DEAD)'][f.dead]))
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	666 ui.write('\n')
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	667
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	668 # have we seen the start tag?
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	669 if revisions and off:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	670 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	671 revisions[0] in cs.tags:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	672 off = False
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	673
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	674 # see if we reached the end tag
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	675 if len(revisions)>1 and not off:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	676 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	677 revisions[1] in cs.tags:
16905fc2690f Add debugcvsps command, replacing cvsps script Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 7278 diff changeset	678 break

Mercurial > hg > mercurial-source

annotate hgext/convert/cvsps.py @ 7502:16905fc2690f