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

annotate hgext/convert/subversion.py @ 4942:c79e3fa6dc29

Remove unused pprint import and the commented line which used it before.

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Sat, 21 Jul 2007 10:43:29 +0200
parents	cdd33a048289
children	b6c3abdbe0eb

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 locale
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	17 import os
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	18 import cPickle as pickle
4758 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
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	41 class changedpath(object):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	42 def __init__(self, p):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	43 self.copyfrom_path = p.copyfrom_path
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	44 self.copyfrom_rev = p.copyfrom_rev
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	45 self.action = p.action
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	46
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	47 # SVN conversion code stolen from bzr-svn and tailor
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	48 class convert_svn(converter_source):
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	49 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	50 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	51
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	52 try:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	53 SubversionException
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	54 except NameError:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	55 msg = 'subversion python bindings could not be loaded\n'
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	56 ui.warn(msg)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	57 raise NoRepo(msg)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	58
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	59 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	60 self.lastrevs = {}
1fcdf2fe3d7c convert: svn: use revmap to parse only new revisions in incremental conversions Brendan Cully <brendan@kublai.com> parents: 4810 diff changeset	61
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	62 latest = None
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	63 if rev:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	64 try:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	65 latest = int(rev)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	66 except ValueError:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	67 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	68 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	69 # Support file://path@rev syntax. Useful e.g. to convert
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	70 # 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	71 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	72 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	73 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	74 url = url[:at]
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	75 except ValueError, e:
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	76 pass
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	77 self.url = url
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	78 self.encoding = 'UTF-8' # Subversion is always nominal UTF-8
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	79 try:
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	80 self.transport = transport.SvnRaTransport(url=url)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	81 self.ra = self.transport.ra
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	82 self.ctx = self.transport.client
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	83 self.base = svn.ra.get_repos_root(self.ra)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	84 self.module = self.url[len(self.base):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	85 self.modulemap = {} # revision, module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	86 self.commits = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	87 self.files = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	88 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	89 except SubversionException, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	90 raise NoRepo("couldn't open SVN repo %s" % url)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	91
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	92 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	93 self.get_blacklist()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	94 except IOError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	95 pass
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	96
4787 c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	97 self.last_changed = self.latest(self.module, latest)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	98
4809 c2d529f288a1 convert: move some code into common init function Brendan Cully <brendan@kublai.com> parents: 4806 diff changeset	99 self.head = self.revid(self.last_changed)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	100
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	101 def setrevmap(self, revmap):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	102 lastrevs = {}
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	103 for revid in revmap.keys():
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	104 uuid, module, revnum = self.revsplit(revid)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	105 lastrevnum = lastrevs.setdefault(module, revnum)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	106 if revnum > lastrevnum:
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	107 lastrevs[module] = revnum
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	108 self.lastrevs = lastrevs
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	109
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	110 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	111 try:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	112 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	113 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	114 except SubversionException, err:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	115 return []
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	116
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	117 def getheads(self):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	118 # detect standard /branches, /tags, /trunk layout
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	119 optrev = svn.core.svn_opt_revision_t()
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	120 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	121 optrev.value.number = self.last_changed
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	122 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	123 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	124 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	125 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	126 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	127 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	128 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	129 (trunk, branches))
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	130 oldmodule = self.module
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	131 self.module += '/' + trunk
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	132 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	133 self.head = self.revid(lt)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	134 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	135 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	136 self.ctx)
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	137 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	138 if oldmodule:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	139 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	140 else:
2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	141 module = '/' + branches + '/' + branch
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	142 brevnum = self.latest(module, self.last_changed)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	143 brev = self.revid(brevnum, module)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	144 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	145 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	146 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	147 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	148 'but not found'))
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	149 else:
4906 2642726b61b6 convert/subversion.py: fix bad assumptions about SVN path naming Bryan O'Sullivan <bos@serpentine.com> parents: 4873 diff changeset	150 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	151 self.heads = [self.head]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	152 return self.heads
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	153
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	154 def getfile(self, file, rev):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	155 data, mode = self._getfile(file, rev)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	156 self.modecache[(file, rev)] = mode
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	157 return data
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	158
4939 cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4931 diff changeset	159 def getmode(self, file, rev):
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	160 return self.modecache[(file, rev)]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	161
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	162 def getchanges(self, rev):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	163 self.modecache = {}
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	164 files = self.files[rev]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	165 cl = files
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	166 cl.sort()
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	167 # 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	168 del self.files[rev]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	169 return cl
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	170
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	171 def getcommit(self, rev):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	172 if rev not in self.commits:
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	173 uuid, module, revnum = self.revsplit(rev)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	174 self.module = module
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	175 self.reparent(module)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	176 stop = self.lastrevs.get(module, 0)
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	177 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	178 commit = self.commits[rev]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	179 # 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	180 del self.commits[rev]
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	181 return commit
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	182
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	183 def get_log(self, paths, start, end, limit=0, discover_changed_paths=True,
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	184 strict_node_history=False):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	185 '''wrapper for svn.ra.get_log.
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	186 on a large repository, svn.ra.get_log pins huge amounts of
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	187 memory that cannot be recovered. work around it by forking
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	188 and writing results over a pipe.'''
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	189
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	190 def child(fp):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	191 protocol = -1
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	192 def receiver(orig_paths, revnum, author, date, message, pool):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	193 if orig_paths is not None:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	194 for k, v in orig_paths.iteritems():
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	195 orig_paths[k] = changedpath(v)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	196 pickle.dump((orig_paths, revnum, author, date, message),
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	197 fp, protocol)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	198
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	199 try:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	200 # Use an ra of our own so that our parent can consume
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	201 # our results without confusing the server.
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	202 t = transport.SvnRaTransport(url=self.url)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	203 svn.ra.get_log(t.ra, paths, start, end, limit,
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	204 discover_changed_paths,
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	205 strict_node_history,
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	206 receiver)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	207 except SubversionException, (_, num):
4931 2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	208 self.ui.print_exc()
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	209 pickle.dump(num, fp, protocol)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	210 else:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	211 pickle.dump(None, fp, protocol)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	212 fp.close()
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	213
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	214 def parent(fp):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	215 while True:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	216 entry = pickle.load(fp)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	217 try:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	218 orig_paths, revnum, author, date, message = entry
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	219 except:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	220 if entry is None:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	221 break
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	222 raise SubversionException("child raised exception", entry)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	223 yield entry
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	224
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	225 rfd, wfd = os.pipe()
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	226 pid = os.fork()
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	227 if pid:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	228 os.close(wfd)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	229 for p in parent(os.fdopen(rfd, 'rb')):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	230 yield p
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	231 ret = os.waitpid(pid, 0)[1]
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	232 if ret:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	233 raise util.Abort(_('get_log %s') % util.explain_exit(ret))
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	234 else:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	235 os.close(rfd)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	236 child(os.fdopen(wfd, 'wb'))
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	237 os._exit(0)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	238
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	239 def gettags(self):
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	240 tags = {}
4931 2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	241 start = self.revnum(self.head)
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	242 try:
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	243 for entry in self.get_log(['/tags'], 0, start):
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	244 orig_paths, revnum, author, date, message = entry
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	245 for path in orig_paths:
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	246 if not path.startswith('/tags/'):
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	247 continue
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	248 ent = orig_paths[path]
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	249 source = ent.copyfrom_path
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	250 rev = ent.copyfrom_rev
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	251 tag = path.split('/', 2)[2]
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	252 tags[tag] = self.revid(rev, module=source)
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	253 except SubversionException, (_, num):
2f0f9528e77b convert/subversion: rehandle the no-tags case Bryan O'Sullivan <bos@serpentine.com> parents: 4928 diff changeset	254 self.ui.note('no tags found at revision %d\n' % start)
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	255 return tags
4825 a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	256
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	257 # -- helper functions --
a265fe42abe7 convert: svn code movement (no actual changes) Brendan Cully <brendan@kublai.com> parents: 4824 diff changeset	258
4809 c2d529f288a1 convert: move some code into common init function Brendan Cully <brendan@kublai.com> parents: 4806 diff changeset	259 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	260 if not module:
ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	261 module = self.module
ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	262 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	263
d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	264 def revnum(self, rev):
d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	265 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	266
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	267 def revsplit(self, rev):
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	268 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	269 revnum = int(revnum)
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	270 parts = url.split('/', 1)
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	271 uuid = parts.pop(0)[4:]
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	272 mod = ''
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	273 if parts:
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	274 mod = '/' + parts[0]
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	275 return uuid, mod, revnum
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	276
4788 c2ef09a35c53 convert: typo in svn.latest Brendan Cully <brendan@kublai.com> parents: 4787 diff changeset	277 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	278 '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	279 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	280 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	281 try:
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	282 self.reparent('')
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	283 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	284 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	285 except SubversionException:
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	286 dirent = None
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	287 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	288 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	289 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	290
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	291 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	292
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	293 def get_blacklist(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	294 """Avoid certain revision numbers.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	295 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	296 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	297 of making a branch'. The converted repository is significantly
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	298 smaller if we ignore such revisions."""
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	299 self.blacklist = set()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	300 blacklist = self.blacklist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	301 for line in file("blacklist.txt", "r"):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	302 if not line.startswith("#"):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	303 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	304 svn_rev = int(line.strip())
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	305 blacklist.add(svn_rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	306 except ValueError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	307 pass # not an integer or a comment
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	308
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	309 def is_blacklisted(self, svn_rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	310 return svn_rev in self.blacklist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	311
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	312 def reparent(self, module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	313 svn_url = self.base + module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	314 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	315 svn.ra.reparent(self.ra, svn_url.encode(self.encoding))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	316
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	317 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	318 def get_entry_from_path(path, module=self.module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	319 # Given the repository url of this wc, say
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	320 # "http://server/plone/CMFPlone/branches/Plone-2_0-branch"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	321 # extract the "entry" portion (a relative path) from what
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	322 # svn log --xml says, ie
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	323 # "/CMFPlone/branches/Plone-2_0-branch/tests/PloneTestCase.py"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	324 # that is to say "tests/PloneTestCase.py"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	325
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	326 if path.startswith(module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	327 relative = path[len(module):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	328 if relative.startswith('/'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	329 return relative[1:]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	330 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	331 return relative
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	332
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	333 # The path is outside our tracked tree...
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	334 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	335 return None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	336
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	337 self.child_cset = None
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	338 def parselogentry(orig_paths, revnum, author, date, message):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	339 self.ui.debug("parsing revision %d (%d changes)\n" %
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	340 (revnum, len(orig_paths)))
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	341
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	342 if revnum in self.modulemap:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	343 new_module = self.modulemap[revnum]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	344 if new_module != self.module:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	345 self.module = new_module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	346 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	347
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	348 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	349 copies = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	350 entries = []
4809 c2d529f288a1 convert: move some code into common init function Brendan Cully <brendan@kublai.com> parents: 4806 diff changeset	351 rev = self.revid(revnum)
4793 ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	352 parents = []
4814 4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	353
4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	354 # 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	355 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	356 (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	357 return
4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	358
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	359 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	360 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	361 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	362 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	363 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	364 branch = None
4814 4cdbaa885d8a convert: svn: some improvements in memory usage Brendan Cully <brendan@kublai.com> parents: 4813 diff changeset	365
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	366 orig_paths = orig_paths.items()
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	367 orig_paths.sort()
961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	368 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	369 # 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	370 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	371 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	372 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	373 # 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	374 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	375 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	376 parents = [self.revid(prev, ent.copyfrom_path)]
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	377 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	378 (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	379 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	380 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	381 # 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	382 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	383 # 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	384 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	385 # 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	386 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	387 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	388 entry = entrypath.decode(self.encoding)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	389
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	390 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	391 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	392 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	393 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	394 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	395 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	396 # 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	397 # 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	398 # 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	399 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	400 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	401 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	402 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	403 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	404 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	405
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	406 # 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	407 # changeset, get the right fromrev
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	408 if parents:
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	409 uuid, old_module, fromrev = self.revsplit(parents[0])
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	410 else:
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	411 fromrev = revnum - 1
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	412 # 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	413 old_module = self.modulemap.get(fromrev, self.module)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	414
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	415 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	416 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	417
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	418 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	419 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	420 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	421 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	422 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	423 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	424 if info[1] is not None:
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	425 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	426 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	427 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	428
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 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	430
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	431 frompath, froment = lookup_parts(entrypath) or (None, revnum - 1)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	432
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	433 # 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	434 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	435 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	436 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	437 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	438 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	439 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	440 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	441
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	442 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	443 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	444 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	445 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	446 # 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	447 # 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	448 # 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	449 # 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	450 # The Subversion Repository revision 6940 a dir
4939 cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4931 diff changeset	451 # was copied and one of its files was deleted
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	452 # 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	453 # 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	454 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	455 children = self._find_children(path, fromrev)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	456 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	457 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	458 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	459 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	460 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	461 # Mark all [files, not directories] as deleted.
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	462 for child in children:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	463 # Can we move a child directory and its
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	464 # parent in the same commit? (probably can). Could
4939 cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4931 diff changeset	465 # cause problems if instead of revnum -1,
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	466 # 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	467 entrypath = get_entry_from_path("/" + child, module=old_module)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	468 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	469 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	470 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	471 # 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	472 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	473 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	474 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	475 else:
83c1bbb934ec convert: svn merges produce hard-to-trace file entries. Ignore them for now. Brendan Cully <brendan@kublai.com> parents: 4795 diff changeset	476 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	477 (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	478 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	479 # 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	480 # 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	481
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	482 # 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	483 # 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	484 # 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	485 # 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	486 # 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	487 # 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	488 # 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	489 # 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	490 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	491 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	492 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	493 # 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	494 # parent in the same commit? (probably can). Could
4939 cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4931 diff changeset	495 # cause problems if instead of 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	496 # 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	497 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	498 # 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	499 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	500 # 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	501 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	502 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	503 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	504
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 # 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	506 # 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	507 # 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	508
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	509 # 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	510 # 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	511 # 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	512 # 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	513 # 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	514 #
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 # 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	516 #
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.append((copyfrom_entry, copyto_entry))
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	518
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	519 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	520 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	521 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	522 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	523 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	524 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	525
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	526 # 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	527 # 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	528 # 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	529 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	530 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	531 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	532 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	533 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	534 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	535 # 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	536 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	537 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	538 # 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	539 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	540 # copy from quux splort/quuxfile
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	541
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	542 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	543 # a list of (filename, id) where id lets us retrieve the file.
4939 cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4931 diff changeset	544 # eg in git, id is the object hash. for svn it'll be the
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	545 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	546 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	547 return
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	548
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	549 # 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	550 # 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	551 # '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	552 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	553
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	554 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	555 author = author and self.recode(author) or ''
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	556
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	557 cset = commit(author=author,
4939 cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4931 diff changeset	558 date=util.datestr(date),
cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4931 diff changeset	559 desc=log,
4793 ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	560 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	561 copies=copies,
4873 28b23b9073a8 convert: record the source revision in the changelog Brendan Cully <brendan@kublai.com> parents: 4835 diff changeset	562 branch=branch,
28b23b9073a8 convert: record the source revision in the changelog Brendan Cully <brendan@kublai.com> parents: 4835 diff changeset	563 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	564
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	565 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	566 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	567 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	568 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	569
4922 961379b2c586 convert/subversion: reduce memory usage by filtering early Bryan O'Sullivan <bos@serpentine.com> parents: 4908 diff changeset	570 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	571 (self.module, from_revnum, to_revnum))
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	572
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	573 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	574 discover_changed_paths = True
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	575 strict_node_history = False
4928 e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	576 for entry in self.get_log([self.module], from_revnum, to_revnum):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	577 orig_paths, revnum, author, date, message = entry
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	578 if self.is_blacklisted(revnum):
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	579 self.ui.note('skipping blacklisted revision %d\n' % revnum)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	580 continue
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	581 if orig_paths is None:
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	582 self.ui.debug('revision %d has no entries\n' % revnum)
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	583 continue
e8f4e40f285a convert/subversion: work around memory leak in svn's python bindings Bryan O'Sullivan <bos@serpentine.com> parents: 4926 diff changeset	584 parselogentry(orig_paths, revnum, author, date, message)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	585 except SubversionException, (_, num):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	586 if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
4939 cdd33a048289 removed trailing whitespace Thomas Arendsen Hein <thomas@intevation.de> parents: 4931 diff changeset	587 raise NoSuchRevision(branch=self,
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	588 revision="Revision number %d" % to_revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	589 raise
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	590
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	591 def _getfile(self, file, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	592 io = StringIO()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	593 # 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	594 mode = ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	595 try:
4767 d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	596 revnum = self.revnum(rev)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	597 if self.module != self.modulemap[revnum]:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	598 self.module = self.modulemap[revnum]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	599 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	600 info = svn.ra.get_file(self.ra, file, revnum, io)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	601 if isinstance(info, list):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	602 info = info[-1]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	603 mode = ("svn:executable" in info) and 'x' or ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	604 mode = ("svn:special" in info) and 'l' or mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	605 except SubversionException, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	606 notfound = (svn.core.SVN_ERR_FS_NOT_FOUND,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	607 svn.core.SVN_ERR_RA_DAV_PATH_NOT_FOUND)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	608 if e.apr_err in notfound: # File not found
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	609 raise IOError()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	610 raise
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	611 data = io.getvalue()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	612 if mode == 'l':
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	613 link_prefix = "link "
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	614 if data.startswith(link_prefix):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	615 data = data[len(link_prefix):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	616 return data, mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	617
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	618 def _find_children(self, path, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	619 path = path.strip("/")
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 def _find_children_fallback(path, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	622 # 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	623 pool = Pool()
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	624 optrev = svn.core.svn_opt_revision_t()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	625 optrev.kind = svn.core.svn_opt_revision_number
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	626 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	627 rpath = '/'.join([self.base, path]).strip('/')
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	628 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	629
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	630 if hasattr(self, '_find_children_fallback'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	631 return _find_children_fallback(path, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	632
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	633 self.reparent("/" + path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	634 pool = Pool()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	635
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	636 children = []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	637 def find_children_inner(children, path, revnum = revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	638 if hasattr(svn.ra, 'get_dir2'): # Since SVN 1.4
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	639 fields = 0xffffffff # Binding does not provide SVN_DIRENT_ALL
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	640 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	641 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	642 getdir = svn.ra.get_dir(self.ra, path, revnum, pool)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	643 if type(getdir) == dict:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	644 # 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	645 raise CompatibilityException()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	646 dirents = getdir[0]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	647 if type(dirents) == int:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	648 # got here once due to infinite recursion bug
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	649 return
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	650 c = dirents.keys()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	651 c.sort()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	652 for child in c:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	653 dirent = dirents[child]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	654 if dirent.kind == svn.core.svn_node_dir:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	655 find_children_inner(children, (path + "/" + child).strip("/"))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	656 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	657 children.append((path + "/" + child).strip("/"))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	658
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	659 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	660 find_children_inner(children, "")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	661 except CompatibilityException:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	662 self._find_children_fallback = True
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	663 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	664 return _find_children_fallback(path, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	665
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	666 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	667 return [path + "/" + c for c in children]

Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/convert/subversion.py @ 4942:c79e3fa6dc29