mercurial-crew-with-dirclash: hgext/convert/subversion.py annotate

annotate hgext/convert/subversion.py @ 4922:961379b2c586

convert/subversion: reduce memory usage by filtering early This makes up to a 50% difference in memory consumption.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Wed, 18 Jul 2007 19:56:36 -0700
parents	5e89b0dafce5
children	bbf1c1e89892

rev	line source
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	1 # Subversion 1.4/1.5 Python API backend
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	2 #
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	3 # Copyright(C) 2007 Daniel Holth et al
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	4 #
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	5 # Configuration options:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	6 #
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	7 # convert.svn.trunk
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	8 # Relative path to the trunk (default: "trunk")
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	9 # convert.svn.branches
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	10 # Relative path to tree of branches (default: "branches")
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	11 #
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	12 # Set these in a hgrc, or on the command line as follows:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	13 #
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	14 # hg convert --config convert.svn.trunk=wackoname [...]
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	15
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	16 import pprint
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	17 import locale
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	18
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	19 from mercurial import util
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	20
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	21 # Subversion stuff. Works best with very recent Python SVN bindings
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	22 # e.g. SVN 1.5 or backports. Thanks to the bzr folks for enhancing
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	23 # these bindings.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	24
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	25 from cStringIO import StringIO
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	26
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	27 from common import NoRepo, commit, converter_source
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	28
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	29 try:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	30 from svn.core import SubversionException, Pool
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	31 import svn.core
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	32 import svn.ra
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	33 import svn.delta
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	34 import svn
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	35 import transport
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	36 except ImportError:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	37 pass
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	38
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	39 class CompatibilityException(Exception): pass
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	40
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	41 # SVN conversion code stolen from bzr-svn and tailor
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	42 class convert_svn(converter_source):
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	43 def __init__(self, ui, url, rev=None):
4806 15a3cbfc6568 convert: call superclass init from engine init functions Brendan Cully <brendan@kublai.com> parents: 4797 diff changeset	44 super(convert_svn, self).__init__(ui, url, rev=rev)
15a3cbfc6568 convert: call superclass init from engine init functions Brendan Cully <brendan@kublai.com> parents: 4797 diff changeset	45
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	46 try:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	47 SubversionException
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	48 except NameError:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	49 msg = 'subversion python bindings could not be loaded\n'
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	50 ui.warn(msg)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	51 raise NoRepo(msg)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	52
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	53 self.encoding = locale.getpreferredencoding()
4812 1fcdf2fe3d7c convert: svn: use revmap to parse only new revisions in incremental conversions Brendan Cully <brendan@kublai.com> parents: 4810 diff changeset	54 self.lastrevs = {}
1fcdf2fe3d7c convert: svn: use revmap to parse only new revisions in incremental conversions Brendan Cully <brendan@kublai.com> parents: 4810 diff changeset	55
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	56 latest = None
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	57 if rev:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	58 try:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	59 latest = int(rev)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	60 except ValueError:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	61 raise util.Abort('svn: revision %s is not an integer' % rev)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	62 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	63 # Support file://path@rev syntax. Useful e.g. to convert
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	64 # deleted branches.
4908 5e89b0dafce5 convert/subversion.py: str.rsplit is not available in Python 2.3 Bryan O'Sullivan <bos@serpentine.com> parents: 4906 diff changeset	65 at = url.rfind('@')
5e89b0dafce5 convert/subversion.py: str.rsplit is not available in Python 2.3 Bryan O'Sullivan <bos@serpentine.com> parents: 4906 diff changeset	66 if at >= 0:
5e89b0dafce5 convert/subversion.py: str.rsplit is not available in Python 2.3 Bryan O'Sullivan <bos@serpentine.com> parents: 4906 diff changeset	67 latest = int(url[at+1:])
5e89b0dafce5 convert/subversion.py: str.rsplit is not available in Python 2.3 Bryan O'Sullivan <bos@serpentine.com> parents: 4906 diff changeset	68 url = url[:at]
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	69 except ValueError, e:
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	70 pass
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	71 self.url = url
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	72 self.encoding = 'UTF-8' # Subversion is always nominal UTF-8
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	73 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	74 self.transport = transport.SvnRaTransport(url = url)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	75 self.ra = self.transport.ra
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	76 self.ctx = svn.client.create_context()
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	77 self.base = svn.ra.get_repos_root(self.ra)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	78 self.module = self.url[len(self.base):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	79 self.modulemap = {} # revision, module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	80 self.commits = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	81 self.files = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	82 self.uuid = svn.ra.get_uuid(self.ra).decode(self.encoding)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	83 except SubversionException, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	84 raise NoRepo("couldn't open SVN repo %s" % url)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	85
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	86 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	87 self.get_blacklist()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	88 except IOError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	89 pass
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	90
4787 c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	91 self.last_changed = self.latest(self.module, latest)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	92
4809 c2d529f288a1 convert: move some code into common init function Brendan Cully <brendan@kublai.com> parents: 4806 diff changeset	93 self.head = self.revid(self.last_changed)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	94
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	95 def setrevmap(self, revmap):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	96 lastrevs = {}
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	97 for revid in revmap.keys():
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	98 uuid, module, revnum = self.revsplit(revid)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	99 lastrevnum = lastrevs.setdefault(module, revnum)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	100 if revnum > lastrevnum:
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	101 lastrevs[module] = revnum
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	102 self.lastrevs = lastrevs
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	103
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	104 def exists(self, path, optrev):
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	105 try:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	106 return svn.client.ls(self.url.rstrip('/') + '/' + path,
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	107 optrev, False, self.ctx)
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	108 except SubversionException, err:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	109 return []
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	110
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	111 def getheads(self):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	112 # detect standard /branches, /tags, /trunk layout
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	113 optrev = svn.core.svn_opt_revision_t()
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	114 optrev.kind = svn.core.svn_opt_revision_number
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	115 optrev.value.number = self.last_changed
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	116 rpath = self.url.strip('/')
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	117 cfgtrunk = self.ui.config('convert', 'svn.trunk')
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	118 cfgbranches = self.ui.config('convert', 'svn.branches')
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	119 trunk = (cfgtrunk or 'trunk').strip('/')
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	120 branches = (cfgbranches or 'branches').strip('/')
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	121 if self.exists(trunk, optrev) and self.exists(branches, optrev):
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	122 self.ui.note('found trunk at %r and branches at %r\n' %
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	123 (trunk, branches))
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	124 oldmodule = self.module
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	125 self.module += '/' + trunk
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	126 lt = self.latest(self.module, self.last_changed)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	127 self.head = self.revid(lt)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	128 self.heads = [self.head]
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	129 branchnames = svn.client.ls(rpath + '/' + branches, optrev, False,
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	130 self.ctx)
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	131 for branch in branchnames.keys():
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	132 if oldmodule:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	133 module = '/' + oldmodule + '/' + branches + '/' + branch
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	134 else:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	135 module = '/' + branches + '/' + branch
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	136 brevnum = self.latest(module, self.last_changed)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	137 brev = self.revid(brevnum, module)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	138 self.ui.note('found branch %s at %d\n' % (branch, brevnum))
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	139 self.heads.append(brev)
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	140 elif cfgtrunk or cfgbranches:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	141 raise util.Abort(_('trunk/branch layout expected, '
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	142 'but not found'))
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	143 else:
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	144 self.ui.note('working with one branch\n')
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	145 self.heads = [self.head]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	146 return self.heads
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	147
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	148 def getfile(self, file, rev):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	149 data, mode = self._getfile(file, rev)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	150 self.modecache[(file, rev)] = mode
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	151 return data
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	152
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	153 def getmode(self, file, rev):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	154 return self.modecache[(file, rev)]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	155
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	156 def getchanges(self, rev):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	157 self.modecache = {}
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	158 files = self.files[rev]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	159 cl = files
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	160 cl.sort()
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	161 # caller caches the result, so free it here to release memory
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	162 del self.files[rev]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	163 return cl
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	164
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	165 def getcommit(self, rev):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	166 if rev not in self.commits:
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	167 uuid, module, revnum = self.revsplit(rev)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	168 self.module = module
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	169 self.reparent(module)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	170 stop = self.lastrevs.get(module, 0)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	171 self._fetch_revisions(from_revnum=revnum, to_revnum=stop)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	172 commit = self.commits[rev]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	173 # caller caches the result, so free it here to release memory
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	174 del self.commits[rev]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	175 return commit
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	176
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	177 def gettags(self):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	178 tags = {}
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	179 def parselogentry(arg, *args):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	180 orig_paths, revnum, author, date, message, pool = arg
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	181 for path in orig_paths:
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	182 if not path.startswith('/tags/'):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	183 continue
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	184 ent = orig_paths[path]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	185 source = ent.copyfrom_path
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	186 rev = ent.copyfrom_rev
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	187 tag = path.split('/', 2)[2]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	188 tags[tag] = self.revid(rev, module=source)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	189
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	190 start = self.revnum(self.head)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	191 try:
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	192 svn.ra.get_log(self.ra, ['/tags'], 0, start, 0, True, False,
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	193 parselogentry)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	194 return tags
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	195 except SubversionException:
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	196 self.ui.note('no tags found at revision %d\n' % start)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	197 return {}
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	198
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	199 # -- helper functions --
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	200
4809 c2d529f288a1 convert: move some code into common init function Brendan Cully <brendan@kublai.com> parents: 4806 diff changeset	201 def revid(self, revnum, module=None):
4793 ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	202 if not module:
ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	203 module = self.module
ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	204 return (u"svn:%s%s@%s" % (self.uuid, module, revnum)).decode(self.encoding)
4767 d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	205
d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	206 def revnum(self, rev):
d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	207 return int(rev.split('@')[-1])
4787 c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	208
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	209 def revsplit(self, rev):
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	210 url, revnum = rev.encode(self.encoding).split('@', 1)
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	211 revnum = int(revnum)
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	212 parts = url.split('/', 1)
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	213 uuid = parts.pop(0)[4:]
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	214 mod = ''
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	215 if parts:
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	216 mod = '/' + parts[0]
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	217 return uuid, mod, revnum
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	218
4788 c2ef09a35c53 convert: typo in svn.latest Brendan Cully <brendan@kublai.com> parents: 4787 diff changeset	219 def latest(self, path, stop=0):
4787 c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	220 'find the latest revision affecting path, up to stop'
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	221 if not stop:
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	222 stop = svn.ra.get_latest_revnum(self.ra)
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	223 try:
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	224 self.reparent('')
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	225 dirent = svn.ra.stat(self.ra, path.strip('/'), stop)
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	226 self.reparent(self.module)
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	227 except SubversionException:
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	228 dirent = None
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	229 if not dirent:
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	230 print self.base, path
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	231 raise util.Abort('%s not found up to revision %d' % (path, stop))
4787 c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	232
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	233 return dirent.created_rev
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	234
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	235 def get_blacklist(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	236 """Avoid certain revision numbers.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	237 It is not uncommon for two nearby revisions to cancel each other
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	238 out, e.g. 'I copied trunk into a subdirectory of itself instead
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	239 of making a branch'. The converted repository is significantly
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	240 smaller if we ignore such revisions."""
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	241 self.blacklist = set()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	242 blacklist = self.blacklist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	243 for line in file("blacklist.txt", "r"):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	244 if not line.startswith("#"):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	245 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	246 svn_rev = int(line.strip())
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	247 blacklist.add(svn_rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	248 except ValueError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	249 pass # not an integer or a comment
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	250
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	251 def is_blacklisted(self, svn_rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	252 return svn_rev in self.blacklist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	253
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	254 def reparent(self, module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	255 svn_url = self.base + module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	256 self.ui.debug("reparent to %s\n" % svn_url.encode(self.encoding))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	257 svn.ra.reparent(self.ra, svn_url.encode(self.encoding))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	258
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	259 def _fetch_revisions(self, from_revnum = 0, to_revnum = 347):
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	260 def get_entry_from_path(path, module=self.module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	261 # Given the repository url of this wc, say
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	262 # "http://server/plone/CMFPlone/branches/Plone-2_0-branch"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	263 # extract the "entry" portion (a relative path) from what
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	264 # svn log --xml says, ie
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	265 # "/CMFPlone/branches/Plone-2_0-branch/tests/PloneTestCase.py"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	266 # that is to say "tests/PloneTestCase.py"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	267
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	268 if path.startswith(module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	269 relative = path[len(module):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	270 if relative.startswith('/'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	271 return relative[1:]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	272 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	273 return relative
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	274
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	275 # The path is outside our tracked tree...
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	276 self.ui.debug('Ignoring %r since it is not under %r\n' % (path, module))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	277 return None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	278
4810 f7c8222920ee convert: svn: defer get_log parsing until after get_log completes. Brendan Cully <brendan@kublai.com> parents: 4809 diff changeset	279 received = []
f7c8222920ee convert: svn: defer get_log parsing until after get_log completes. Brendan Cully <brendan@kublai.com> parents: 4809 diff changeset	280 # svn.ra.get_log requires no other calls to the ra until it completes,
f7c8222920ee convert: svn: defer get_log parsing until after get_log completes. Brendan Cully <brendan@kublai.com> parents: 4809 diff changeset	281 # so we just collect the log entries and parse them afterwards
f7c8222920ee convert: svn: defer get_log parsing until after get_log completes. Brendan Cully <brendan@kublai.com> parents: 4809 diff changeset	282 def receivelog(arg, *args):
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	283 orig_paths, revnum, author, date, message, pool = arg
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	284
4791 9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	285 if self.is_blacklisted(revnum):
9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	286 self.ui.note('skipping blacklisted revision %d\n' % revnum)
9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	287 return
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	288
4790 2b5723a5b186 convert: svn: move some debug output to verbose Brendan Cully <brendan@kublai.com> parents: 4789 diff changeset	289 if orig_paths is None:
4791 9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	290 self.ui.debug('revision %d has no entries\n' % revnum)
4790 2b5723a5b186 convert: svn: move some debug output to verbose Brendan Cully <brendan@kublai.com> parents: 4789 diff changeset	291 return
2b5723a5b186 convert: svn: move some debug output to verbose Brendan Cully <brendan@kublai.com> parents: 4789 diff changeset	292
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	293 received.append((revnum, orig_paths.items(), author, date, message))
961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	294
961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	295 self.child_cset = None
961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	296 def parselogentry((revnum, orig_paths, author, date, message)):
961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	297 self.ui.debug("parsing revision %d\n" % revnum)
961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	298
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	299 if revnum in self.modulemap:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	300 new_module = self.modulemap[revnum]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	301 if new_module != self.module:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	302 self.module = new_module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	303 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	304
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	305 copyfrom = {} # Map of entrypath, revision for finding source of deleted revisions.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	306 copies = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	307 entries = []
4809 c2d529f288a1 convert: move some code into common init function Brendan Cully <brendan@kublai.com> parents: 4806 diff changeset	308 rev = self.revid(revnum)
4793 ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	309 parents = []
4814 4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	310
4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	311 # branch log might return entries for a parent we already have
4824 e20e40f67f0e convert: svn: avoid parsing already-seen logentries due to branch following Brendan Cully <brendan@kublai.com> parents: 4814 diff changeset	312 if (rev in self.commits or
e20e40f67f0e convert: svn: avoid parsing already-seen logentries due to branch following Brendan Cully <brendan@kublai.com> parents: 4814 diff changeset	313 (revnum < self.lastrevs.get(self.module, 0))):
4814 4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	314 return
4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	315
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	316 try:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	317 branch = self.module.split("/")[-1]
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	318 if branch == 'trunk':
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	319 branch = ''
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	320 except IndexError:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	321 branch = None
4814 4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	322
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	323 orig_paths.sort()
961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	324 for path, ent in orig_paths:
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	325 # self.ui.write("path %s\n" % path)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	326 if path == self.module: # Follow branching back in history
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	327 if ent:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	328 if ent.copyfrom_path:
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	329 # ent.copyfrom_rev may not be the actual last revision
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	330 prev = self.latest(ent.copyfrom_path, ent.copyfrom_rev)
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	331 self.modulemap[prev] = ent.copyfrom_path
4809 c2d529f288a1 convert: move some code into common init function Brendan Cully <brendan@kublai.com> parents: 4806 diff changeset	332 parents = [self.revid(prev, ent.copyfrom_path)]
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	333 self.ui.note('found parent of branch %s at %d: %s\n' % \
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	334 (self.module, prev, ent.copyfrom_path))
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	335 else:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	336 self.ui.debug("No copyfrom path, don't know what to do.\n")
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	337 # Maybe it was added and there is no more history.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	338 entrypath = get_entry_from_path(path, module=self.module)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	339 # self.ui.write("entrypath %s\n" % entrypath)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	340 if entrypath is None:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	341 # Outside our area of interest
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	342 self.ui.debug("boring@%s: %s\n" % (revnum, path))
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	343 continue
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	344 entry = entrypath.decode(self.encoding)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	345
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	346 kind = svn.ra.check_path(self.ra, entrypath, revnum)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	347 if kind == svn.core.svn_node_file:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	348 if ent.copyfrom_path:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	349 copyfrom_path = get_entry_from_path(ent.copyfrom_path)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	350 if copyfrom_path:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	351 self.ui.debug("Copied to %s from %s@%s\n" % (entry, copyfrom_path, ent.copyfrom_rev))
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	352 # It's probably important for hg that the source
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	353 # exists in the revision's parent, not just the
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	354 # ent.copyfrom_rev
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	355 fromkind = svn.ra.check_path(self.ra, copyfrom_path, ent.copyfrom_rev)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	356 if fromkind != 0:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	357 copies[self.recode(entry)] = self.recode(copyfrom_path)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	358 entries.append(self.recode(entry))
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	359 elif kind == 0: # gone, but had better be a deleted file
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	360 self.ui.debug("gone from %s\n" % ent.copyfrom_rev)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	361
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	362 # if a branch is created but entries are removed in the same
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	363 # changeset, get the right fromrev
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	364 if parents:
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	365 uuid, old_module, fromrev = self.revsplit(parents[0])
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	366 else:
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	367 fromrev = revnum - 1
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	368 # might always need to be revnum - 1 in these 3 lines?
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	369 old_module = self.modulemap.get(fromrev, self.module)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	370
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	371 basepath = old_module + "/" + get_entry_from_path(path, module=self.module)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	372 entrypath = old_module + "/" + get_entry_from_path(path, module=self.module)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	373
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	374 def lookup_parts(p):
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	375 rc = None
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	376 parts = p.split("/")
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	377 for i in range(len(parts)):
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	378 part = "/".join(parts[:i])
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	379 info = part, copyfrom.get(part, None)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	380 if info[1] is not None:
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	381 self.ui.debug("Found parent directory %s\n" % info[1])
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	382 rc = info
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	383 return rc
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	384
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	385 self.ui.debug("base, entry %s %s\n" % (basepath, entrypath))
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	386
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	387 frompath, froment = lookup_parts(entrypath) or (None, revnum - 1)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	388
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	389 # need to remove fragment from lookup_parts and replace with copyfrom_path
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	390 if frompath is not None:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	391 self.ui.debug("munge-o-matic\n")
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	392 self.ui.debug(entrypath + '\n')
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	393 self.ui.debug(entrypath[len(frompath):] + '\n')
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	394 entrypath = froment.copyfrom_path + entrypath[len(frompath):]
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	395 fromrev = froment.copyfrom_rev
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	396 self.ui.debug("Info: %s %s %s %s\n" % (frompath, froment, ent, entrypath))
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	397
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	398 fromkind = svn.ra.check_path(self.ra, entrypath, fromrev)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	399 if fromkind == svn.core.svn_node_file: # a deleted file
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	400 entries.append(self.recode(entry))
4796 83c1bbb934ec convert: svn merges produce hard-to-trace file entries. Ignore them for now. Brendan Cully <brendan@kublai.com> parents: 4795 diff changeset	401 elif fromkind == svn.core.svn_node_dir:
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	402 # print "Deleted/moved non-file:", revnum, path, ent
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	403 # children = self._find_children(path, revnum - 1)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	404 # print "find children %s@%d from %d action %s" % (path, revnum, ent.copyfrom_rev, ent.action)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	405 # Sometimes this is tricky. For example: in
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	406 # The Subversion Repository revision 6940 a dir
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	407 # was copied and one of its files was deleted
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	408 # from the new location in the same commit. This
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	409 # code can't deal with that yet.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	410 if ent.action == 'C':
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	411 children = self._find_children(path, fromrev)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	412 else:
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	413 oroot = entrypath.strip('/')
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	414 nroot = path.strip('/')
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	415 children = self._find_children(oroot, fromrev)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	416 children = [s.replace(oroot,nroot) for s in children]
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	417 # Mark all [files, not directories] as deleted.
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	418 for child in children:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	419 # Can we move a child directory and its
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	420 # parent in the same commit? (probably can). Could
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	421 # cause problems if instead of revnum -1,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	422 # we have to look in (copyfrom_path, revnum - 1)
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	423 entrypath = get_entry_from_path("/" + child, module=old_module)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	424 if entrypath:
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	425 entry = self.recode(entrypath.decode(self.encoding))
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	426 if entry in copies:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	427 # deleted file within a copy
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	428 del copies[entry]
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	429 else:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	430 entries.append(entry)
4796 83c1bbb934ec convert: svn merges produce hard-to-trace file entries. Ignore them for now. Brendan Cully <brendan@kublai.com> parents: 4795 diff changeset	431 else:
83c1bbb934ec convert: svn merges produce hard-to-trace file entries. Ignore them for now. Brendan Cully <brendan@kublai.com> parents: 4795 diff changeset	432 self.ui.debug('unknown path in revision %d: %s\n' % \
83c1bbb934ec convert: svn merges produce hard-to-trace file entries. Ignore them for now. Brendan Cully <brendan@kublai.com> parents: 4795 diff changeset	433 (revnum, path))
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	434 elif kind == svn.core.svn_node_dir:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	435 # Should probably synthesize normal file entries
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	436 # and handle as above to clean up copy/rename handling.
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	437
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	438 # If the directory just had a prop change,
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	439 # then we shouldn't need to look for its children.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	440 # Also this could create duplicate entries. Not sure
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	441 # whether this will matter. Maybe should make entries a set.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	442 # print "Changed directory", revnum, path, ent.action, ent.copyfrom_path, ent.copyfrom_rev
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	443 # This will fail if a directory was copied
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	444 # from another branch and then some of its files
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	445 # were deleted in the same transaction.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	446 children = self._find_children(path, revnum)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	447 children.sort()
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	448 for child in children:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	449 # Can we move a child directory and its
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	450 # parent in the same commit? (probably can). Could
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	451 # cause problems if instead of revnum -1,
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	452 # we have to look in (copyfrom_path, revnum - 1)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	453 entrypath = get_entry_from_path("/" + child, module=self.module)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	454 # print child, self.module, entrypath
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	455 if entrypath:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	456 # Need to filter out directories here...
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	457 kind = svn.ra.check_path(self.ra, entrypath, revnum)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	458 if kind != svn.core.svn_node_dir:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	459 entries.append(self.recode(entrypath))
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	460
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	461 # Copies here (must copy all from source)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	462 # Probably not a real problem for us if
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	463 # source does not exist
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	464
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	465 # Can do this with the copy command "hg copy"
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	466 # if ent.copyfrom_path:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	467 # copyfrom_entry = get_entry_from_path(ent.copyfrom_path.decode(self.encoding),
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	468 # module=self.module)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	469 # copyto_entry = entrypath
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	470 #
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	471 # print "copy directory", copyfrom_entry, 'to', copyto_entry
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	472 #
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	473 # copies.append((copyfrom_entry, copyto_entry))
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	474
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	475 if ent.copyfrom_path:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	476 copyfrom_path = ent.copyfrom_path.decode(self.encoding)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	477 copyfrom_entry = get_entry_from_path(copyfrom_path, module=self.module)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	478 if copyfrom_entry:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	479 copyfrom[path] = ent
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	480 self.ui.debug("mark %s came from %s\n" % (path, copyfrom[path]))
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	481
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	482 # Good, /probably/ a regular copy. Really should check
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	483 # to see whether the parent revision actually contains
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	484 # the directory in question.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	485 children = self._find_children(self.recode(copyfrom_path), ent.copyfrom_rev)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	486 children.sort()
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	487 for child in children:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	488 entrypath = get_entry_from_path("/" + child, module=self.module)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	489 if entrypath:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	490 entry = entrypath.decode(self.encoding)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	491 # print "COPY COPY From", copyfrom_entry, entry
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	492 copyto_path = path + entry[len(copyfrom_entry):]
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	493 copyto_entry = get_entry_from_path(copyto_path, module=self.module)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	494 # print "COPY", entry, "COPY To", copyto_entry
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	495 copies[self.recode(copyto_entry)] = self.recode(entry)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	496 # copy from quux splort/quuxfile
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	497
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	498 self.modulemap[revnum] = self.module # track backwards in time
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	499 # a list of (filename, id) where id lets us retrieve the file.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	500 # eg in git, id is the object hash. for svn it'll be the
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	501 self.files[rev] = zip(entries, [rev] * len(entries))
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	502 if not entries:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	503 return
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	504
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	505 # Example SVN datetime. Includes microseconds.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	506 # ISO-8601 conformant
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	507 # '2007-01-04T17:35:00.902377Z'
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	508 date = util.parsedate(date[:18] + " UTC", ["%Y-%m-%dT%H:%M:%S"])
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	509
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	510 log = message and self.recode(message)
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	511 author = author and self.recode(author) or ''
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	512
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	513 cset = commit(author=author,
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	514 date=util.datestr(date),
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	515 desc=log,
4793 ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	516 parents=parents,
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	517 copies=copies,
4873 28b23b9073a8 convert: record the source revision in the changelog Brendan Cully <brendan@kublai.com> parents: 4835 diff changeset	518 branch=branch,
28b23b9073a8 convert: record the source revision in the changelog Brendan Cully <brendan@kublai.com> parents: 4835 diff changeset	519 rev=rev.encode('utf-8'))
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	520
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	521 self.commits[rev] = cset
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	522 if self.child_cset and not self.child_cset.parents:
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	523 self.child_cset.parents = [rev]
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	524 self.child_cset = cset
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	525
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	526 self.ui.note('fetching revision log for "%s" from %d to %d\n' %
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	527 (self.module, from_revnum, to_revnum))
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	528
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	529 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	530 discover_changed_paths = True
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	531 strict_node_history = False
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	532 svn.ra.get_log(self.ra, [self.module], from_revnum, to_revnum, 0,
4791 9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	533 discover_changed_paths, strict_node_history,
4810 f7c8222920ee convert: svn: defer get_log parsing until after get_log completes. Brendan Cully <brendan@kublai.com> parents: 4809 diff changeset	534 receivelog)
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	535 self.ui.note('parsing %d log entries for "%s"\n' %
961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	536 (len(received), self.module))
4810 f7c8222920ee convert: svn: defer get_log parsing until after get_log completes. Brendan Cully <brendan@kublai.com> parents: 4809 diff changeset	537 for entry in received:
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	538 parselogentry(entry)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	539 except SubversionException, (_, num):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	540 if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	541 raise NoSuchRevision(branch=self,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	542 revision="Revision number %d" % to_revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	543 raise
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	544
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	545 def _getfile(self, file, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	546 io = StringIO()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	547 # TODO: ra.get_file transmits the whole file instead of diffs.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	548 mode = ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	549 try:
4767 d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	550 revnum = self.revnum(rev)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	551 if self.module != self.modulemap[revnum]:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	552 self.module = self.modulemap[revnum]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	553 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	554 info = svn.ra.get_file(self.ra, file, revnum, io)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	555 if isinstance(info, list):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	556 info = info[-1]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	557 mode = ("svn:executable" in info) and 'x' or ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	558 mode = ("svn:special" in info) and 'l' or mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	559 except SubversionException, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	560 notfound = (svn.core.SVN_ERR_FS_NOT_FOUND,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	561 svn.core.SVN_ERR_RA_DAV_PATH_NOT_FOUND)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	562 if e.apr_err in notfound: # File not found
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	563 raise IOError()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	564 raise
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	565 data = io.getvalue()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	566 if mode == 'l':
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	567 link_prefix = "link "
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	568 if data.startswith(link_prefix):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	569 data = data[len(link_prefix):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	570 return data, mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	571
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	572 def _find_children(self, path, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	573 path = path.strip("/")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	574
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	575 def _find_children_fallback(path, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	576 # SWIG python bindings for getdir are broken up to at least 1.4.3
4785 a67f185d0474 convert: svn: use a separate mempool for each ls in the 1.4 fallback path Brendan Cully <brendan@kublai.com> parents: 4769 diff changeset	577 pool = Pool()
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	578 optrev = svn.core.svn_opt_revision_t()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	579 optrev.kind = svn.core.svn_opt_revision_number
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	580 optrev.value.number = revnum
4763 4526ef8c47b2 convert: svn: fix fallback directory listing code when importing a submodule Brendan Cully <brendan@kublai.com> parents: 4762 diff changeset	581 rpath = '/'.join([self.base, path]).strip('/')
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	582 return ['%s/%s' % (path, x) for x in svn.client.ls(rpath, optrev, True, self.ctx, pool).keys()]
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	583
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	584 if hasattr(self, '_find_children_fallback'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	585 return _find_children_fallback(path, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	586
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	587 self.reparent("/" + path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	588 pool = Pool()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	589
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	590 children = []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	591 def find_children_inner(children, path, revnum = revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	592 if hasattr(svn.ra, 'get_dir2'): # Since SVN 1.4
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	593 fields = 0xffffffff # Binding does not provide SVN_DIRENT_ALL
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	594 getdir = svn.ra.get_dir2(self.ra, path, revnum, fields, pool)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	595 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	596 getdir = svn.ra.get_dir(self.ra, path, revnum, pool)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	597 if type(getdir) == dict:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	598 # python binding for getdir is broken up to at least 1.4.3
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	599 raise CompatibilityException()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	600 dirents = getdir[0]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	601 if type(dirents) == int:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	602 # got here once due to infinite recursion bug
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	603 # pprint.pprint(getdir)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	604 return
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	605 c = dirents.keys()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	606 c.sort()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	607 for child in c:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	608 dirent = dirents[child]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	609 if dirent.kind == svn.core.svn_node_dir:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	610 find_children_inner(children, (path + "/" + child).strip("/"))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	611 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	612 children.append((path + "/" + child).strip("/"))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	613
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	614 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	615 find_children_inner(children, "")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	616 except CompatibilityException:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	617 self._find_children_fallback = True
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	618 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	619 return _find_children_fallback(path, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	620
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	621 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	622 return [path + "/" + c for c in children]

Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/convert/subversion.py @ 4922:961379b2c586