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

equal deleted inserted replaced

-:26857a6f9dd0
+:09dae950919f
 import transport
 except ImportError:
 pass
 class CompatibilityException(Exception): pass
-LOG_BATCH_SIZE = 50
 class svn_entry(object):
 """Emulate a Subversion path change."""
 __slots__ = ['path', 'copyfrom_path', 'copyfrom_rev', 'action']
 def __init__(self, entry):
 self.url = url
 self.encoding = 'UTF-8' # Subversion is always nominal UTF-8
 try:
 self.transport = transport.SvnRaTransport(url = url)
 self.ra = self.transport.ra
+self.ctx = svn.client.create_context()
 self.base = svn.ra.get_repos_root(self.ra)
 self.module = self.url[len(self.base):]
 self.modulemap = {} # revision, module
 self.commits = {}
 self.files = {}
 def revsplit(self, rev):
 url, revnum = rev.encode(self.encoding).split('@', 1)
 revnum = int(revnum)
 parts = url.split('/', 1)
 uuid = parts.pop(0)[4:]
-mod = '/'
+mod = ''
 if parts:
-mod += parts[0]
+mod = '/' + parts[0]
 return uuid, mod, revnum
 def latest(self, path, stop=0):
 'find the latest revision affecting path, up to stop'
 if not stop:
 def reparent(self, module):
 svn_url = self.base + module
 self.ui.debug("reparent to %s\n" % svn_url.encode(self.encoding))
 svn.ra.reparent(self.ra, svn_url.encode(self.encoding))
-def _fetch_revisions(self, from_revnum = 0, to_revnum = 347, module=None):
+def _fetch_revisions(self, from_revnum = 0, to_revnum = 347):
 def get_entry_from_path(path, module=self.module):
 # Given the repository url of this wc, say
 #   "http://server/plone/CMFPlone/branches/Plone-2_0-branch"
 # extract the "entry" portion (a relative path) from what
 # svn log --xml says, ie
 if self.is_blacklisted(revnum):
 self.ui.note('skipping blacklisted revision %d\n' % revnum)
 return
-self.ui.note("parsing revision %d\n" % revnum)
+self.ui.debug("parsing revision %d\n" % revnum)
 if orig_paths is None:
 self.ui.debug('revision %d has no entries\n' % revnum)
 return
 if path == self.module: # Follow branching back in history
 ent = orig_paths[path]
 if ent:
 if ent.copyfrom_path:
 # ent.copyfrom_rev may not be the actual last revision
-prev = self.latest(ent.copyfrom_path, revnum)
+prev = self.latest(ent.copyfrom_path, ent.copyfrom_rev)
 self.modulemap[prev] = ent.copyfrom_path
 parents = [self.rev(prev, ent.copyfrom_path)]
+self.ui.note('found parent of branch %s at %d: %s\n' % \
+(self.module, prev, ent.copyfrom_path))
 else:
 self.ui.debug("No copyfrom path, don't know what to do.\n")
 # Maybe it was added and there is no more history.
 entrypath = get_entry_from_path(path, module=self.module)
 # self.ui.write("entrypath %s\n" % entrypath)
 copies[self.recode(entry)] = self.recode(copyfrom_path)
 entries.append(self.recode(entry))
 elif kind == 0: # gone, but had better be a deleted *file*
 self.ui.debug("gone from %s\n" % ent.copyfrom_rev)
-fromrev = revnum - 1
+# if a branch is created but entries are removed in the same
-# might always need to be revnum - 1 in these 3 lines?
+# changeset, get the right fromrev
-old_module = self.modulemap.get(fromrev, self.module)
+if parents:
+uuid, old_module, fromrev = self.revsplit(parents[0])
+else:
+fromrev = revnum - 1
+# might always need to be revnum - 1 in these 3 lines?
+old_module = self.modulemap.get(fromrev, self.module)
 basepath = old_module + "/" + get_entry_from_path(path, module=self.module)
 entrypath = old_module + "/" + get_entry_from_path(path, module=self.module)
 def lookup_parts(p):
 rc = None
 parts = p.split("/")
 for i in range(len(parts)):
 part = "/".join(parts[:i])
 info = part, copyfrom.get(part, None)
 if info[1] is not None:
-self.ui.debug("Found parent directory %s\n" % info)
+self.ui.debug("Found parent directory %s\n" % info[1])
 rc = info
 return rc
 self.ui.debug("base, entry %s %s\n" % (basepath, entrypath))
 self.commits[rev] = cset
 if self.child_cset and not self.child_cset.parents:
 self.child_cset.parents = [rev]
 self.child_cset = cset
-self.ui.note('fetching revision log from %d to %d\n' % \
+self.ui.note('fetching revision log for "%s" from %d to %d\n' % \
-(from_revnum, to_revnum))
+(self.module, from_revnum, to_revnum))
-if module is None:
-module = self.module
 try:
 discover_changed_paths = True
 strict_node_history = False
-svn.ra.get_log(self.ra, [module], from_revnum, to_revnum, 0,
+svn.ra.get_log(self.ra, [self.module], from_revnum, to_revnum, 0,
 discover_changed_paths, strict_node_history,
 parselogentry)
 self.last_revnum = to_revnum
 except SubversionException, (_, num):
 if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
 raise NoSuchRevision(branch=self,
 revision="Revision number %d" % to_revnum)
 raise
 def getheads(self):
-# svn-url@rev
+# detect standard /branches, /tags, /trunk layout
-# Not safe if someone committed:
+optrev = svn.core.svn_opt_revision_t()
-self.heads = [self.head]
+optrev.kind = svn.core.svn_opt_revision_number
-# print self.commits.keys()
+optrev.value.number = self.last_changed
+rpath = self.url.strip('/')
+paths = svn.client.ls(rpath, optrev, False, self.ctx)
+if 'branches' in paths and 'trunk' in paths:
+self.module += '/trunk'
+lt = self.latest(self.module, self.last_changed)
+self.head = self.rev(lt)
+self.heads = [self.head]
+branches = svn.client.ls(rpath + '/branches', optrev, False, self.ctx)
+for branch in branches.keys():
+module = '/branches/' + branch
+brevnum = self.latest(module, self.last_changed)
+brev = self.rev(brevnum, module)
+self.ui.note('found branch %s at %d\n' % (branch, brevnum))
+self.heads.append(brev)
+else:
+self.heads = [self.head]
 return self.heads
 def _getfile(self, file, rev):
 io = StringIO()
 # TODO: ra.get_file transmits the whole file instead of diffs.
 return cl
 def getcommit(self, rev):
 if rev not in self.commits:
 uuid, module, revnum = self.revsplit(rev)
-minrev = revnum - LOG_BATCH_SIZE > 0 and revnum - LOG_BATCH_SIZE or 0
+self.module = module
-self._fetch_revisions(from_revnum=revnum, to_revnum=0,
+self.reparent(module)
-module=module)
+self._fetch_revisions(from_revnum=revnum, to_revnum=0)
 return self.commits[rev]
 def gettags(self):
 tags = {}
 def parselogentry(*arg, **args):
 def _find_children(self, path, revnum):
 path = path.strip("/")
 def _find_children_fallback(path, revnum):
 # SWIG python bindings for getdir are broken up to at least 1.4.3
-if not hasattr(self, 'client_ctx'):
-self.client_ctx = svn.client.create_context()
 pool = Pool()
 optrev = svn.core.svn_opt_revision_t()
 optrev.kind = svn.core.svn_opt_revision_number
 optrev.value.number = revnum
 rpath = '/'.join([self.base, path]).strip('/')
-return ['%s/%s' % (path, x) for x in svn.client.ls(rpath, optrev, True, self.client_ctx, pool).keys()]
+return ['%s/%s' % (path, x) for x in svn.client.ls(rpath, optrev, True, self.ctx, pool).keys()]
 if hasattr(self, '_find_children_fallback'):
 return _find_children_fallback(path, revnum)
 self.reparent("/" + path)

changeset 4795	09dae950919f
parent 4794	26857a6f9dd0
child 4796	83c1bbb934ec