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

author	Daniel Holth <dholth@fastmail.fm>
date	Sun, 01 Jul 2007 23:56:11 +0200
parents
children	95cbb6b74790

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 svn.core import SubversionException, Pool
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	15 import svn.core
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	16 import svn.ra
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	17 import svn.delta
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	18 import svn
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	19 import transport
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	20 from cStringIO import StringIO
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	21
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	22 from common import NoRepo, commit, converter_source, recode, nocommitmsg
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	23
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	24 class CompatibilityException(Exception): pass
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	25
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	26 nbRevisionsPerFetch = 50
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 svn_entry(object):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	29 """Emulate a Subversion path change."""
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	30 __slots__ = ['path', 'copyfrom_path', 'copyfrom_rev', 'action']
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	31 def __init__(self, entry):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	32 self.copyfrom_path = entry.copyfrom_path
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	33 self.copyfrom_rev = entry.copyfrom_rev
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	34 self.action = entry.action
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	35
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	36 def __str__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	37 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	38
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	39 def __repr__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	40 return self.__str__()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	41
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	42 class svn_paths(object):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	43 """Emulate a Subversion ordered dictionary of changed paths."""
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	44 __slots__ = ['values', 'order']
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	45 def __init__(self, orig_paths):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	46 self.order = []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	47 self.values = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	48 if hasattr(orig_paths, 'keys'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	49 self.order = sorted(orig_paths.keys())
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	50 self.values.update(orig_paths)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	51 return
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	52 if not 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 for path in orig_paths:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	55 self.order.append(path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	56 self.values[path] = svn_entry(orig_paths[path])
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	57 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	58
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	59 def __iter__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	60 return iter(self.order)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	61
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	62 def __getitem__(self, key):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	63 return self.values[key]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	64
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	65 def __str__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	66 s = "{\n"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	67 for path in self.order:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	68 s += "'%s': %s,\n" % (path, self.values[path])
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	69 s += "}"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	70 return s
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	71
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	72 def __repr__(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	73 return self.__str__()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	74
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	75 # SVN conversion code stolen from bzr-svn and tailor
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	76 class convert_svn(converter_source):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	77 def __init__(self, ui, url):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	78 self.ui = ui
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	79 self.encoding = locale.getpreferredencoding()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	80 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	81 # Support file://path@rev syntax. Useful e.g. to convert
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	82 # deleted branches.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	83 url, latest = url.rsplit("@", 1)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	84 latest = int(latest)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	85 except ValueError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	86 latest = None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	87 self.url = url
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	88 self.encoding = 'UTF-8' # Subversion is always nominal UTF-8
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	89 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	90 self.transport = transport.SvnRaTransport(url = url)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	91 self.ra = self.transport.ra
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	92 self.base = svn.ra.get_repos_root(self.ra)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	93 self.module = self.url[len(self.base):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	94 self.modulemap = {} # revision, module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	95 self.commits = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	96 self.files = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	97 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	98 except SubversionException, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	99 raise NoRepo("couldn't open SVN repo %s" % url)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	100
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	101 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	102 self.get_blacklist()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	103 except IOError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	104 pass
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	105
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	106 if not latest:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	107 latest = svn.ra.get_latest_revnum(self.ra)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	108 dirent = svn.ra.stat(self.ra, self.module, latest)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	109 self.last_changed = dirent.created_rev
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	110
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	111 self.head = self.rev(self.last_changed)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	112
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	113 # Should lazily fetch revisions in batches of, say, 1,000...:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	114 self._fetch_revisions(from_revnum=self.last_changed, to_revnum=0)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	115
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	116 def rev(self, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	117 return (u"svn:%s%s@%s" % (self.uuid, self.module, revnum)).decode(self.encoding)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	118
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	119 def get_blacklist(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	120 """Avoid certain revision numbers.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	121 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	122 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	123 of making a branch'. The converted repository is significantly
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	124 smaller if we ignore such revisions."""
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	125 self.blacklist = set()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	126 blacklist = self.blacklist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	127 for line in file("blacklist.txt", "r"):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	128 if not line.startswith("#"):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	129 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	130 svn_rev = int(line.strip())
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	131 blacklist.add(svn_rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	132 except ValueError, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	133 pass # not an integer or a comment
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	134
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	135 def is_blacklisted(self, svn_rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	136 return svn_rev in self.blacklist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	137
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	138 def reparent(self, module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	139 svn_url = self.base + module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	140 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	141 svn.ra.reparent(self.ra, svn_url.encode(self.encoding))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	142
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	143 def _fetch_revisions(self, from_revnum = 0, to_revnum = 347, pb=None):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	144 self.parent_cset = None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	145 self.child_cset = None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	146
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	147 self.ui.debug('Fetching revisions %d to %d\n' % (from_revnum, to_revnum))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	148
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	149 def get_entry_from_path(path, module=self.module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	150 # Given the repository url of this wc, say
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	151 # "http://server/plone/CMFPlone/branches/Plone-2_0-branch"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	152 # extract the "entry" portion (a relative path) from what
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	153 # svn log --xml says, ie
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	154 # "/CMFPlone/branches/Plone-2_0-branch/tests/PloneTestCase.py"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	155 # that is to say "tests/PloneTestCase.py"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	156
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	157 if path.startswith(module):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	158 relative = path[len(module):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	159 if relative.startswith('/'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	160 return relative[1:]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	161 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	162 return relative
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	163
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	164 # The path is outside our tracked tree...
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	165 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	166 return None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	167
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	168 received = []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	169 def rcvr(arg, *args):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	170 orig_paths, revnum, author, date, message, pool = arg
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	171 new_orig_paths = svn_paths(orig_paths)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	172 rcvr2(new_orig_paths, revnum, author, date, message, pool)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	173
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	174 def rcvr2(orig_paths, revnum, author, date, message, pool, better_paths = None):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	175 if not self.is_blacklisted(revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	176 received.append((orig_paths, revnum, author, date, message))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	177
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	178 def after_received(orig_paths, revnum, author, date, message):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	179 if revnum == 1172:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	180 import pdb
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	181 pdb.set_trace()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	182 if revnum in self.modulemap:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	183 new_module = self.modulemap[revnum]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	184 if new_module != self.module:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	185 self.module = new_module
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	186 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	187
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	188 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	189 copies = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	190 entries = []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	191 self.ui.debug("Parsing revision %d\n" % revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	192 if orig_paths is not None:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	193 rev = self.rev(revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	194 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	195 branch = self.module.split("/")[-1]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	196 except IndexError:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	197 branch = None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	198
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	199 for path in orig_paths:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	200 # self.ui.write("path %s\n" % path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	201 if path == self.module: # Follow branching back in history
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	202 ent = orig_paths[path]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	203 if ent:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	204 if ent.copyfrom_path:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	205 self.modulemap[ent.copyfrom_rev] = ent.copyfrom_path
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	206 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	207 self.ui.debug("No copyfrom path, don't know what to do.\n")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	208 # Maybe it was added and there is no more history.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	209 entrypath = get_entry_from_path(path, module=self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	210 # self.ui.write("entrypath %s\n" % entrypath)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	211 if not entrypath:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	212 # Outside our area of interest
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	213 self.ui.debug("boring@%s: %s\n" % (revnum, path))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	214 continue
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	215 entry = entrypath.decode(self.encoding)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	216 ent = orig_paths[path]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	217
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	218 kind = svn.ra.check_path(self.ra, entrypath, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	219 if kind == svn.core.svn_node_file:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	220 if ent.copyfrom_path:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	221 copyfrom_path = get_entry_from_path(ent.copyfrom_path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	222 if copyfrom_path:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	223 self.ui.debug("Copied to %s from %s@%s\n" % (entry, copyfrom_path, ent.copyfrom_rev))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	224 # It's probably important for hg that the source
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	225 # exists in the revision's parent, not just the
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	226 # ent.copyfrom_rev
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	227 fromkind = svn.ra.check_path(self.ra, copyfrom_path, ent.copyfrom_rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	228 if fromkind != 0:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	229 copies[self.recode(entry)] = self.recode(copyfrom_path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	230 entries.append(self.recode(entry))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	231 elif kind == 0: # gone, but had better be a deleted file
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	232 self.ui.debug("gone from %s\n" % ent.copyfrom_rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	233
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	234 fromrev = revnum - 1
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	235 # might always need to be revnum - 1 in these 3 lines?
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	236 old_module = self.modulemap.get(fromrev, self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	237 basepath = old_module + "/" + get_entry_from_path(path, module=self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	238 entrypath = old_module + "/" + get_entry_from_path(path, module=self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	239
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	240 def lookup_parts(p):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	241 rc = None
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	242 parts = p.split("/")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	243 for i in range(len(parts)):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	244 part = "/".join(parts[:i])
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	245 info = part, copyfrom.get(part, None)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	246 if info[1] is not None:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	247 self.ui.debug("Found parent directory %s\n" % info)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	248 rc = info
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	249 return rc
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	250
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	251 self.ui.debug("base, entry %s %s\n" % (basepath, entrypath))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	252
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	253 frompath, froment = lookup_parts(entrypath) or (None, revnum - 1)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	254
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	255 # need to remove fragment from lookup_parts and replace with copyfrom_path
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	256 if frompath is not None:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	257 self.ui.debug("munge-o-matic\n")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	258 self.ui.debug(entrypath + '\n')
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	259 self.ui.debug(entrypath[len(frompath):] + '\n')
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	260 entrypath = froment.copyfrom_path + entrypath[len(frompath):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	261 fromrev = froment.copyfrom_rev
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	262 self.ui.debug("Info: %s %s %s %s\n" % (frompath, froment, ent, entrypath))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	263
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	264 fromkind = svn.ra.check_path(self.ra, entrypath, fromrev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	265 if fromkind == svn.core.svn_node_file: # a deleted file
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	266 entries.append(self.recode(entry))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	267 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	268 # print "Deleted/moved non-file:", revnum, path, ent
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	269 # children = self._find_children(path, revnum - 1)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	270 # print "find children %s@%d from %d action %s" % (path, revnum, ent.copyfrom_rev, ent.action)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	271 # Sometimes this is tricky. For example: in
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	272 # The Subversion Repository revision 6940 a dir
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	273 # was copied and one of its files was deleted
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	274 # from the new location in the same commit. This
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	275 # code can't deal with that yet.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	276 if ent.action == 'C':
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	277 children = self._find_children(path, fromrev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	278 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	279 oroot = entrypath.strip('/')
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	280 nroot = path.strip('/')
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	281 children = self._find_children(oroot, fromrev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	282 children = [s.replace(oroot,nroot) for s in children]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	283 # Mark all [files, not directories] as deleted.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	284 for child in children:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	285 # Can we move a child directory and its
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	286 # parent in the same commit? (probably can). Could
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	287 # cause problems if instead of revnum -1,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	288 # we have to look in (copyfrom_path, revnum - 1)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	289 entrypath = get_entry_from_path("/" + child, module=old_module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	290 if entrypath:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	291 entry = self.recode(entrypath.decode(self.encoding))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	292 if entry in copies:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	293 # deleted file within a copy
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	294 del copies[entry]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	295 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	296 entries.append(entry)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	297 elif kind == svn.core.svn_node_dir:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	298 # Should probably synthesize normal file entries
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	299 # and handle as above to clean up copy/rename handling.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	300
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	301 # If the directory just had a prop change,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	302 # then we shouldn't need to look for its children.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	303 # Also this could create duplicate entries. Not sure
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	304 # whether this will matter. Maybe should make entries a set.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	305 # print "Changed directory", revnum, path, ent.action, ent.copyfrom_path, ent.copyfrom_rev
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	306 # This will fail if a directory was copied
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	307 # from another branch and then some of its files
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	308 # were deleted in the same transaction.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	309 children = self._find_children(path, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	310 children.sort()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	311 for child in children:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	312 # Can we move a child directory and its
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	313 # parent in the same commit? (probably can). Could
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	314 # cause problems if instead of revnum -1,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	315 # we have to look in (copyfrom_path, revnum - 1)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	316 entrypath = get_entry_from_path("/" + child, module=self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	317 # print child, self.module, entrypath
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	318 if entrypath:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	319 # Need to filter out directories here...
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	320 kind = svn.ra.check_path(self.ra, entrypath, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	321 if kind != svn.core.svn_node_dir:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	322 entries.append(self.recode(entrypath))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	323
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	324 # Copies here (must copy all from source)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	325 # Probably not a real problem for us if
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	326 # source does not exist
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	327
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	328 # Can do this with the copy command "hg copy"
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	329 # if ent.copyfrom_path:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	330 # copyfrom_entry = get_entry_from_path(ent.copyfrom_path.decode(self.encoding),
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	331 # module=self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	332 # copyto_entry = entrypath
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	333 #
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	334 # print "copy directory", copyfrom_entry, 'to', copyto_entry
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	335 #
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	336 # copies.append((copyfrom_entry, copyto_entry))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	337
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	338 if ent.copyfrom_path:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	339 copyfrom_path = ent.copyfrom_path.decode(self.encoding)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	340 copyfrom_entry = get_entry_from_path(copyfrom_path, module=self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	341 if copyfrom_entry:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	342 copyfrom[path] = ent
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	343 self.ui.debug("mark %s came from %s\n" % (path, copyfrom[path]))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	344
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	345 # Good, /probably/ a regular copy. Really should check
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	346 # to see whether the parent revision actually contains
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	347 # the directory in question.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	348 children = self._find_children(self.recode(copyfrom_path), ent.copyfrom_rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	349 children.sort()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	350 for child in children:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	351 entrypath = get_entry_from_path("/" + child, module=self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	352 if entrypath:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	353 entry = entrypath.decode(self.encoding)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	354 # print "COPY COPY From", copyfrom_entry, entry
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	355 copyto_path = path + entry[len(copyfrom_entry):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	356 copyto_entry = get_entry_from_path(copyto_path, module=self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	357 # print "COPY", entry, "COPY To", copyto_entry
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	358 copies[self.recode(copyto_entry)] = self.recode(entry)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	359 # copy from quux splort/quuxfile
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	360
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	361 self.modulemap[revnum] = self.module # track backwards in time
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	362 # a list of (filename, id) where id lets us retrieve the file.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	363 # eg in git, id is the object hash. for svn it'll be the
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	364 self.files[rev] = zip(entries, [rev] * len(entries))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	365
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	366 # Example SVN datetime. Includes microseconds.
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	367 # ISO-8601 conformant
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	368 # '2007-01-04T17:35:00.902377Z'
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	369 date = util.parsedate(date[:18] + " UTC", ["%Y-%m-%dT%H:%M:%S"])
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	370
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	371 log = message and self.recode(message) or nocommitmsg
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	372 author = author and self.recode(author) or ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	373
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	374 cset = commit(author=author,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	375 date=util.datestr(date),
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	376 desc=log,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	377 parents=[],
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	378 copies=copies,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	379 branch=branch)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	380
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	381 if self.child_cset is not None:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	382 self.child_cset.parents = [rev]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	383
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	384 self.child_cset = cset
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	385
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	386 self.commits[rev] = cset
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	387
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	388 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	389 discover_changed_paths = True
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	390 strict_node_history = False
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	391 svn.ra.get_log(self.ra, [self.module], from_revnum, to_revnum,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	392 0, discover_changed_paths, strict_node_history, rcvr)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	393 for args in received:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	394 after_received(*args)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	395 self.last_revnum = to_revnum
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	396 except SubversionException, (_, num):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	397 if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	398 raise NoSuchRevision(branch=self,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	399 revision="Revision number %d" % to_revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	400 raise
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	401
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	402 def getheads(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	403 # svn-url@rev
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	404 # Not safe if someone committed:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	405 self.heads = [self.head]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	406 # print self.commits.keys()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	407 return self.heads
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	408
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	409 def _getfile(self, file, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	410 io = StringIO()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	411 # 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	412 mode = ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	413 try:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	414 revnum = int(rev.split("@")[-1])
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	415 if self.module != self.modulemap[revnum]:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	416 self.module = self.modulemap[revnum]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	417 self.reparent(self.module)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	418 info = svn.ra.get_file(self.ra, file, revnum, io)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	419 if isinstance(info, list):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	420 info = info[-1]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	421 mode = ("svn:executable" in info) and 'x' or ''
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	422 mode = ("svn:special" in info) and 'l' or mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	423 except SubversionException, e:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	424 notfound = (svn.core.SVN_ERR_FS_NOT_FOUND,
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	425 svn.core.SVN_ERR_RA_DAV_PATH_NOT_FOUND)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	426 if e.apr_err in notfound: # File not found
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	427 raise IOError()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	428 raise
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	429 data = io.getvalue()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	430 if mode == 'l':
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	431 link_prefix = "link "
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	432 if data.startswith(link_prefix):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	433 data = data[len(link_prefix):]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	434 return data, mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	435
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	436 def getfile(self, file, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	437 data, mode = self._getfile(file, rev)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	438 self.modecache[(file, rev)] = mode
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	439 return data
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	440
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	441 def getmode(self, file, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	442 return self.modecache[(file, rev)]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	443
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	444 def getchanges(self, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	445 self.modecache = {}
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	446 files = self.files[rev]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	447 cl = files
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	448 cl.sort()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	449 return cl
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	450
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	451 def getcommit(self, rev):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	452 return self.commits[rev]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	453
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	454 def gettags(self):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	455 return []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	456
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	457 def _find_children(self, path, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	458 path = path.strip("/")
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	459
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	460 def _find_children_fallback(path, revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	461 # SWIG python bindings for getdir are broken up to at least 1.4.3
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	462 if not hasattr(self, 'client_ctx'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	463 self.client_ctx = svn.client.create_context()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	464 optrev = svn.core.svn_opt_revision_t()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	465 optrev.kind = svn.core.svn_opt_revision_number
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	466 optrev.value.number = revnum
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	467 rpath = '/'.join([self.url, path]).strip('/')
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	468 return ['%s/%s' % (path, x) for x in svn.client.ls(rpath, optrev, True, self.client_ctx).keys()]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	469
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	470 if hasattr(self, '_find_children_fallback'):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	471 return _find_children_fallback(path, revnum)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	472
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	473 self.reparent("/" + path)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	474 pool = Pool()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	475
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	476 children = []
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	477 def find_children_inner(children, path, revnum = revnum):
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	478 if hasattr(svn.ra, 'get_dir2'): # Since SVN 1.4
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	479 fields = 0xffffffff # Binding does not provide SVN_DIRENT_ALL
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	480 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	481 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	482 getdir = svn.ra.get_dir(self.ra, path, revnum, pool)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	483 if type(getdir) == dict:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	484 # 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	485 raise CompatibilityException()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	486 dirents = getdir[0]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	487 if type(dirents) == int:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	488 # got here once due to infinite recursion bug
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	489 # pprint.pprint(getdir)
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	490 return
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	491 c = dirents.keys()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	492 c.sort()
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	493 for child in c:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	494 dirent = dirents[child]
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	495 if dirent.kind == svn.core.svn_node_dir:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	496 find_children_inner(children, (path + "/" + child).strip("/"))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	497 else:
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	498 children.append((path + "/" + child).strip("/"))
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	499
b6a1f2c46c6c convert extension: Add SVN converter Daniel Holth <dholth@fastmail.fm> parents: diff changeset	500 try:

4758

b6a1f2c46c6c convert extension: Add SVN converter