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

annotate hgext/convert/subversion.py @ 4797:d00ca99bc54e

convert svn: minor improvement to tag detection. The better way is probably to list the latest tags directory and look up the last log message for each entry. This is surprisingly annoying to do.

author	Brendan Cully <brendan@kublai.com>
date	Tue, 03 Jul 2007 20:22:39 -0700
parents	83c1bbb934ec
children	15a3cbfc6568

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
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	4
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	5 import pprint
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	6 import locale
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	7
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	8 from mercurial import util
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	9
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	10 # Subversion stuff. Works best with very recent Python SVN bindings
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	11 # 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	12 # these bindings.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	13
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	14 from cStringIO import StringIO
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	15
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	16 from common import NoRepo, commit, converter_source
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	17
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	18 try:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	19 from svn.core import SubversionException, Pool
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	20 import svn.core
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	21 import svn.ra
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	22 import svn.delta
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	23 import svn
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	24 import transport
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	25 except ImportError:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	26 pass
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	27
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	28 class CompatibilityException(Exception): pass
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	29
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	30 class svn_entry(object):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	31 """Emulate a Subversion path change."""
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	32 __slots__ = ['path', 'copyfrom_path', 'copyfrom_rev', 'action']
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	33 def __init__(self, entry):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	34 self.copyfrom_path = entry.copyfrom_path
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	35 self.copyfrom_rev = entry.copyfrom_rev
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	36 self.action = entry.action
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	37
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	38 def __str__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	39 return "%s %s %s" % (self.action, self.copyfrom_path, self.copyfrom_rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	40
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	41 def __repr__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	42 return self.__str__()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	43
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	44 class svn_paths(object):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	45 """Emulate a Subversion ordered dictionary of changed paths."""
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	46 __slots__ = ['values', 'order']
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	47 def __init__(self, orig_paths):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	48 self.order = []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	49 self.values = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	50 if hasattr(orig_paths, 'keys'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	51 self.order = sorted(orig_paths.keys())
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	52 self.values.update(orig_paths)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	53 return
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	54 if not orig_paths:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	55 return
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	56 for path in orig_paths:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	57 self.order.append(path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	58 self.values[path] = svn_entry(orig_paths[path])
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	59 self.order.sort() # maybe the order it came in isn't so great...
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	60
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	61 def __iter__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	62 return iter(self.order)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	63
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	64 def __getitem__(self, key):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	65 return self.values[key]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	66
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	67 def __str__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	68 s = "{\n"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	69 for path in self.order:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	70 s += "'%s': %s,\n" % (path, self.values[path])
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	71 s += "}"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	72 return s
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	73
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	74 def __repr__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	75 return self.__str__()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	76
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	77 # SVN conversion code stolen from bzr-svn and tailor
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	78 class convert_svn(converter_source):
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	79 def __init__(self, ui, url, rev=None):
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	80 try:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	81 SubversionException
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	82 except NameError:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	83 msg = 'subversion python bindings could not be loaded\n'
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	84 ui.warn(msg)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	85 raise NoRepo(msg)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	86
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	87 self.ui = ui
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	88 self.encoding = locale.getpreferredencoding()
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	89 latest = None
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	90 if rev:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	91 try:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	92 latest = int(rev)
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	93 except ValueError:
95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	94 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	95 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	96 # Support file://path@rev syntax. Useful e.g. to convert
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	97 # deleted branches.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	98 url, latest = url.rsplit("@", 1)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	99 latest = int(latest)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	100 except ValueError, e:
4759 95cbb6b74790 convert: activate subversion engine Brendan Cully <brendan@kublai.com> parents: 4758 diff changeset	101 pass
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	102 self.url = url
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	103 self.encoding = 'UTF-8' # Subversion is always nominal UTF-8
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	104 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	105 self.transport = transport.SvnRaTransport(url = url)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	106 self.ra = self.transport.ra
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	107 self.ctx = svn.client.create_context()
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	108 self.base = svn.ra.get_repos_root(self.ra)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	109 self.module = self.url[len(self.base):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	110 self.modulemap = {} # revision, module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	111 self.commits = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	112 self.files = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	113 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	114 except SubversionException, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	115 raise NoRepo("couldn't open SVN repo %s" % url)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	116
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	117 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	118 self.get_blacklist()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	119 except IOError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	120 pass
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	121
4787 c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	122 self.last_changed = self.latest(self.module, latest)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	123
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	124 self.head = self.rev(self.last_changed)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	125
4793 ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	126 def rev(self, revnum, module=None):
ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	127 if not module:
ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	128 module = self.module
ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	129 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	130
d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	131 def revnum(self, rev):
d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	132 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	133
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	134 def revsplit(self, rev):
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	135 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	136 revnum = int(revnum)
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	137 parts = url.split('/', 1)
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	138 uuid = parts.pop(0)[4:]
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	139 mod = ''
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	140 if parts:
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	141 mod = '/' + parts[0]
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	142 return uuid, mod, revnum
1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	143
4788 c2ef09a35c53 convert: typo in svn.latest Brendan Cully <brendan@kublai.com> parents: 4787 diff changeset	144 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	145 '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	146 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	147 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	148 try:
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	149 self.reparent('')
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	150 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	151 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	152 except SubversionException:
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	153 dirent = None
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	154 if not dirent:
4789 772687e437e5 convert: another typo in svn.latest Brendan Cully <brendan@kublai.com> parents: 4788 diff changeset	155 raise util.Abort('%s not found up to revision %d' \
772687e437e5 convert: another typo in svn.latest Brendan Cully <brendan@kublai.com> parents: 4788 diff changeset	156 % (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	157
c5dd8e184279 convert: svn: add function to get the latest revision touching a path Brendan Cully <brendan@kublai.com> parents: 4786 diff changeset	158 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	159
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	160 def get_blacklist(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	161 """Avoid certain revision numbers.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	162 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	163 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	164 of making a branch'. The converted repository is significantly
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	165 smaller if we ignore such revisions."""
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	166 self.blacklist = set()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	167 blacklist = self.blacklist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	168 for line in file("blacklist.txt", "r"):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	169 if not line.startswith("#"):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	170 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	171 svn_rev = int(line.strip())
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	172 blacklist.add(svn_rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	173 except ValueError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	174 pass # not an integer or a comment
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	175
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	176 def is_blacklisted(self, svn_rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	177 return svn_rev in self.blacklist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	178
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	179 def reparent(self, module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	180 svn_url = self.base + module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	181 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	182 svn.ra.reparent(self.ra, svn_url.encode(self.encoding))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	183
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	184 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	185 def get_entry_from_path(path, module=self.module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	186 # Given the repository url of this wc, say
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	187 # "http://server/plone/CMFPlone/branches/Plone-2_0-branch"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	188 # extract the "entry" portion (a relative path) from what
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	189 # svn log --xml says, ie
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	190 # "/CMFPlone/branches/Plone-2_0-branch/tests/PloneTestCase.py"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	191 # that is to say "tests/PloneTestCase.py"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	192
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	193 if path.startswith(module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	194 relative = path[len(module):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	195 if relative.startswith('/'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	196 return relative[1:]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	197 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	198 return relative
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	199
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	200 # The path is outside our tracked tree...
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	201 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	202 return None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	203
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	204 self.child_cset = None
4791 9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	205 def parselogentry(arg, *args):
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	206 orig_paths, revnum, author, date, message, pool = arg
4791 9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	207 orig_paths = svn_paths(orig_paths)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	208
4791 9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	209 if self.is_blacklisted(revnum):
9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	210 self.ui.note('skipping blacklisted revision %d\n' % revnum)
9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	211 return
9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	212
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	213 self.ui.debug("parsing revision %d\n" % revnum)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	214
4790 2b5723a5b186 convert: svn: move some debug output to verbose Brendan Cully <brendan@kublai.com> parents: 4789 diff changeset	215 if orig_paths is None:
4791 9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	216 self.ui.debug('revision %d has no entries\n' % revnum)
4790 2b5723a5b186 convert: svn: move some debug output to verbose Brendan Cully <brendan@kublai.com> parents: 4789 diff changeset	217 return
2b5723a5b186 convert: svn: move some debug output to verbose Brendan Cully <brendan@kublai.com> parents: 4789 diff changeset	218
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	219 if revnum in self.modulemap:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	220 new_module = self.modulemap[revnum]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	221 if new_module != self.module:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	222 self.module = new_module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	223 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	224
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	225 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	226 copies = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	227 entries = []
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	228 rev = self.rev(revnum)
4793 ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	229 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	230 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	231 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	232 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	233 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	234 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	235 branch = None
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	236
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	237 for path in orig_paths:
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	238 # 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	239 if path == self.module: # Follow branching back in history
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	240 ent = orig_paths[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	241 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	242 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	243 # 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	244 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	245 self.modulemap[prev] = ent.copyfrom_path
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	246 parents = [self.rev(prev, ent.copyfrom_path)]
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	247 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	248 (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	249 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	250 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	251 # 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	252 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	253 # 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	254 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	255 # 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	256 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	257 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	258 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	259 ent = orig_paths[path]
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	260
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	261 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	262 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	263 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	264 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	265 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	266 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	267 # 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	268 # 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	269 # 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	270 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	271 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	272 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	273 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	274 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	275 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	276
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	277 # 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	278 # changeset, get the right fromrev
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	279 if parents:
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	280 uuid, old_module, fromrev = self.revsplit(parents[0])
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	281 else:
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	282 fromrev = revnum - 1
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	283 # 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	284 old_module = self.modulemap.get(fromrev, self.module)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	285
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	286 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	287 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	288
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	289 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	290 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	291 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	292 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	293 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	294 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	295 if info[1] is not None:
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	296 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	297 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	298 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	299
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	300 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	301
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	302 frompath, froment = lookup_parts(entrypath) or (None, revnum - 1)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	303
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	304 # 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	305 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	306 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	307 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	308 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	309 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	310 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	311 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	312
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	313 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	314 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	315 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	316 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	317 # 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	318 # 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	319 # 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	320 # 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	321 # The Subversion Repository revision 6940 a dir
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	322 # was copied and one of its files was deleted
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	323 # 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	324 # 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	325 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	326 children = self._find_children(path, fromrev)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	327 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	328 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	329 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	330 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	331 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	332 # Mark all [files, not directories] as deleted.
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	333 for child in children:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	334 # Can we move a child directory and its
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	335 # parent in the same commit? (probably can). Could
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	336 # cause problems if instead of revnum -1,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	337 # 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	338 entrypath = get_entry_from_path("/" + child, module=old_module)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	339 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	340 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	341 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	342 # 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	343 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	344 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	345 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	346 else:
83c1bbb934ec convert: svn merges produce hard-to-trace file entries. Ignore them for now. Brendan Cully <brendan@kublai.com> parents: 4795 diff changeset	347 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	348 (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	349 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	350 # 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	351 # 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	352
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	353 # 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	354 # 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	355 # 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	356 # 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	357 # 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	358 # 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	359 # 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	360 # 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	361 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	362 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	363 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	364 # 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	365 # parent in the same commit? (probably can). Could
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	366 # cause problems if instead of revnum -1,
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	367 # 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	368 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	369 # 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	370 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	371 # 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	372 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	373 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	374 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	375
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	376 # 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	377 # 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	378 # 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	379
62e1b6412b62 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 # 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	381 # 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	382 # 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	383 # 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	384 # 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	385 #
62e1b6412b62 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 # 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	387 #
62e1b6412b62 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 # copies.append((copyfrom_entry, copyto_entry))
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 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	391 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	392 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	393 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	394 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	395 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	396
62e1b6412b62 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 # 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	398 # 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	399 # 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	400 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	401 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	402 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	403 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	404 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	405 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	406 # 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	407 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	408 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	409 # 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	410 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	411 # copy from quux splort/quuxfile
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	412
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	413 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	414 # a list of (filename, id) where id lets us retrieve the file.
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	415 # eg in git, id is the object hash. for svn it'll be the
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	416 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	417 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	418 return
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	419
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	420 # 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	421 # 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	422 # '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	423 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	424
4786 62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	425 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	426 author = author and self.recode(author) or ''
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	427
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	428 cset = commit(author=author,
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	429 date=util.datestr(date),
62e1b6412b62 convert: svn: add an early return to move most changeset parsing out an indent level Brendan Cully <brendan@kublai.com> parents: 4785 diff changeset	430 desc=log,
4793 ea618c5934f3 convert: svn: get parent for branch creation events Brendan Cully <brendan@kublai.com> parents: 4792 diff changeset	431 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	432 copies=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	433 branch=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	434
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	435 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	436 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	437 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	438 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	439
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	440 self.ui.note('fetching revision log for "%s" from %d to %d\n' % \
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	441 (self.module, from_revnum, to_revnum))
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	442
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	443 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	444 discover_changed_paths = True
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	445 strict_node_history = False
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	446 svn.ra.get_log(self.ra, [self.module], from_revnum, to_revnum, 0,
4791 9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	447 discover_changed_paths, strict_node_history,
9f20f4b205ba convert: svn: parse log entries as they arrive instead of deferring it Brendan Cully <brendan@kublai.com> parents: 4790 diff changeset	448 parselogentry)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	449 self.last_revnum = to_revnum
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	450 except SubversionException, (_, num):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	451 if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	452 raise NoSuchRevision(branch=self,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	453 revision="Revision number %d" % to_revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	454 raise
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	455
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	456 def getheads(self):
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	457 # detect standard /branches, /tags, /trunk layout
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	458 optrev = svn.core.svn_opt_revision_t()
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	459 optrev.kind = svn.core.svn_opt_revision_number
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	460 optrev.value.number = self.last_changed
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	461 rpath = self.url.strip('/')
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	462 paths = svn.client.ls(rpath, optrev, False, self.ctx)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	463 if 'branches' in paths and 'trunk' in paths:
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	464 self.module += '/trunk'
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	465 lt = self.latest(self.module, self.last_changed)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	466 self.head = self.rev(lt)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	467 self.heads = [self.head]
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	468 branches = svn.client.ls(rpath + '/branches', optrev, False, self.ctx)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	469 for branch in branches.keys():
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	470 module = '/branches/' + branch
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	471 brevnum = self.latest(module, self.last_changed)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	472 brev = self.rev(brevnum, module)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	473 self.ui.note('found branch %s at %d\n' % (branch, brevnum))
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	474 self.heads.append(brev)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	475 else:
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	476 self.heads = [self.head]
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	477 return self.heads
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	478
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	479 def _getfile(self, file, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	480 io = StringIO()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	481 # 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	482 mode = ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	483 try:
4767 d305852a5ec8 convert: svn: add revnum() to convert rev to revnum Brendan Cully <brendan@kublai.com> parents: 4766 diff changeset	484 revnum = self.revnum(rev)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	485 if self.module != self.modulemap[revnum]:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	486 self.module = self.modulemap[revnum]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	487 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	488 info = svn.ra.get_file(self.ra, file, revnum, io)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	489 if isinstance(info, list):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	490 info = info[-1]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	491 mode = ("svn:executable" in info) and 'x' or ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	492 mode = ("svn:special" in info) and 'l' or mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	493 except SubversionException, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	494 notfound = (svn.core.SVN_ERR_FS_NOT_FOUND,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	495 svn.core.SVN_ERR_RA_DAV_PATH_NOT_FOUND)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	496 if e.apr_err in notfound: # File not found
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	497 raise IOError()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	498 raise
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	499 data = io.getvalue()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	500 if mode == 'l':
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	501 link_prefix = "link "
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	502 if data.startswith(link_prefix):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	503 data = data[len(link_prefix):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	504 return data, mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	505
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	506 def getfile(self, file, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	507 data, mode = self._getfile(file, rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	508 self.modecache[(file, rev)] = mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	509 return data
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	510
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	511 def getmode(self, file, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	512 return self.modecache[(file, rev)]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	513
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	514 def getchanges(self, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	515 self.modecache = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	516 files = self.files[rev]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	517 cl = files
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	518 cl.sort()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	519 return cl
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	520
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	521 def getcommit(self, rev):
4765 69548a9d9796 convert: fetch svn changes on demand (in batches) Brendan Cully <brendan@kublai.com> parents: 4764 diff changeset	522 if rev not in self.commits:
4792 1f10a6cccdb5 convert: add optional module argument to svn._fetch_revisions Brendan Cully <brendan@kublai.com> parents: 4791 diff changeset	523 uuid, module, revnum = self.revsplit(rev)
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	524 self.module = module
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	525 self.reparent(module)
09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	526 self._fetch_revisions(from_revnum=revnum, to_revnum=0)
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	527 return self.commits[rev]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	528
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	529 def gettags(self):
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	530 tags = {}
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	531 def parselogentry(arg, *args):
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	532 orig_paths, revnum, author, date, message, pool = arg
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	533 orig_paths = svn_paths(orig_paths)
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	534 for path in orig_paths:
4797 d00ca99bc54e convert svn: minor improvement to tag detection. Brendan Cully <brendan@kublai.com> parents: 4796 diff changeset	535 if not path.startswith('/tags/'):
d00ca99bc54e convert svn: minor improvement to tag detection. Brendan Cully <brendan@kublai.com> parents: 4796 diff changeset	536 continue
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	537 ent = orig_paths[path]
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	538 source = ent.copyfrom_path
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	539 rev = ent.copyfrom_rev
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	540 tag = path.split('/', 2)[2]
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	541 tags[tag] = self.rev(rev, module=source)
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	542
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	543 start = self.revnum(self.head)
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	544 try:
4797 d00ca99bc54e convert svn: minor improvement to tag detection. Brendan Cully <brendan@kublai.com> parents: 4796 diff changeset	545 svn.ra.get_log(self.ra, ['/tags'], 0, start, 0, True, False,
4794 26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	546 parselogentry)
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	547 return tags
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	548 except SubversionException:
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	549 self.ui.note('no tags found at revision %d\n' % start)
26857a6f9dd0 convert: svn: pull out broken batching code, add alpha tags support Brendan Cully <brendan@kublai.com> parents: 4793 diff changeset	550 return {}
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	551
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	552 def _find_children(self, path, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	553 path = path.strip("/")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	554
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	555 def _find_children_fallback(path, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	556 # 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	557 pool = Pool()
4758 b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	558 optrev = svn.core.svn_opt_revision_t()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	559 optrev.kind = svn.core.svn_opt_revision_number
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	560 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	561 rpath = '/'.join([self.base, path]).strip('/')
4795 09dae950919f convert: svn: autodetect /branches, /tags, /trunk. Brendan Cully <brendan@kublai.com> parents: 4794 diff changeset	562 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	563
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	564 if hasattr(self, '_find_children_fallback'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	565 return _find_children_fallback(path, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	566
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	567 self.reparent("/" + path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	568 pool = Pool()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	569
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	570 children = []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	571 def find_children_inner(children, path, revnum = revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	572 if hasattr(svn.ra, 'get_dir2'): # Since SVN 1.4
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	573 fields = 0xffffffff # Binding does not provide SVN_DIRENT_ALL
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	574 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	575 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	576 getdir = svn.ra.get_dir(self.ra, path, revnum, pool)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	577 if type(getdir) == dict:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	578 # 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	579 raise CompatibilityException()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	580 dirents = getdir[0]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	581 if type(dirents) == int:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	582 # got here once due to infinite recursion bug
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	583 # pprint.pprint(getdir)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	584 return
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	585 c = dirents.keys()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	586 c.sort()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	587 for child in c:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	588 dirent = dirents[child]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	589 if dirent.kind == svn.core.svn_node_dir:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	590 find_children_inner(children, (path + "/" + child).strip("/"))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	591 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	592 children.append((path + "/" + child).strip("/"))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	593
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	594 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	595 find_children_inner(children, "")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	596 except CompatibilityException:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	597 self._find_children_fallback = True
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	598 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	599 return _find_children_fallback(path, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	600
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	601 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	602 return [path + "/" + c for c in children]

Mercurial > hg > mercurial-crew-with-dirclash

annotate hgext/convert/subversion.py @ 4797:d00ca99bc54e