hg-stable: hgext/convert/subversion.py comparison

comparison hgext/convert/subversion.py @ 13690:af331f557942

convert/svn: extract revsplit() in a function

author	Patrick Mezard <pmezard@gmail.com>
date	Thu, 17 Mar 2011 22:17:27 +0100
parents	30a0e3519f69
children	d13913355390

comparison

equal deleted inserted replaced

-:65399579da68
+:af331f557942
 except ImportError:
 svn = None
 class SvnPathNotFound(Exception):
 pass
+def revsplit(rev):
+"""Parse a revision string and return (uuid, path, revnum)."""
+url, revnum = rev.rsplit('@', 1)
+parts = url.split('/', 1)
+mod = ''
+if len(parts) > 1:
+mod = '/' + parts[1]
+return parts[0][4:], mod, int(revnum)
 def geturl(path):
 try:
 return svn.client.url_from_path(svn.core.svn_path_canonicalize(path))
 except SubversionException:
 self.convertfp = None
 def setrevmap(self, revmap):
 lastrevs = {}
 for revid in revmap.iterkeys():
-uuid, module, revnum = self.revsplit(revid)
+uuid, module, revnum = revsplit(revid)
 lastrevnum = lastrevs.setdefault(module, revnum)
 if revnum > lastrevnum:
 lastrevs[module] = revnum
 self.lastrevs = lastrevs
 (paths, parents) = self.paths[rev]
 if parents:
 files, self.removed, copies = self.expandpaths(rev, paths, parents)
 else:
 # Perform a full checkout on roots
-uuid, module, revnum = self.revsplit(rev)
+uuid, module, revnum = revsplit(rev)
 entries = svn.client.ls(self.baseurl + urllib.quote(module),
 optrev(revnum), True, self.ctx)
 files = [n for n, e in entries.iteritems()
 if e.kind == svn.core.svn_node_file]
 copies = {}
 self._changescache = (rev, changes)
 return [f[0] for f in changes[0]]
 def getcommit(self, rev):
 if rev not in self.commits:
-uuid, module, revnum = self.revsplit(rev)
+uuid, module, revnum = revsplit(rev)
 self.module = module
 self.reparent(module)
 # We assume that:
 # - requests for revisions after "stop" come from the
 # revision graph backward traversal. Cache all of them
 return 'svn:%s%s@%s' % (self.uuid, module or self.module, revnum)
 def revnum(self, rev):
 return int(rev.split('@')[-1])
-def revsplit(self, rev):
-url, revnum = rev.rsplit('@', 1)
-revnum = int(revnum)
-parts = url.split('/', 1)
-uuid = parts.pop(0)[4:]
-mod = ''
-if parts:
-mod = '/' + parts[0]
-return uuid, mod, revnum
 def latest(self, path, stop=0):
 """Find the latest revid affecting path, up to stop. It may return
 a revision in a different module, since a branch may be moved without
 a change being reported. Return None if computed module does not
 belong to rootmodule subtree.
 def expandpaths(self, rev, paths, parents):
 changed, removed = set(), set()
 copies = {}
-new_module, revnum = self.revsplit(rev)[1:]
+new_module, revnum = revsplit(rev)[1:]
 if new_module != self.module:
 self.module = new_module
 self.reparent(self.module)
 for i, (path, ent) in enumerate(paths):
 changed.add(self.recode(entrypath))
 if not ent.copyfrom_path or not parents:
 continue
 # Copy sources not in parent revisions cannot be
 # represented, ignore their origin for now
-pmodule, prevnum = self.revsplit(parents[0])[1:]
+pmodule, prevnum = revsplit(parents[0])[1:]
 if ent.copyfrom_rev < prevnum:
 continue
 copyfrom_path = self.getrelpath(ent.copyfrom_path, pmodule)
 if not copyfrom_path:
 continue
 self.ui.debug("copied to %s from %s@%s\n" %
 (entrypath, copyfrom_path, ent.copyfrom_rev))
 copies[self.recode(entrypath)] = self.recode(copyfrom_path)
 elif kind == 0: # gone, but had better be a deleted *file*
 self.ui.debug("gone from %s\n" % ent.copyfrom_rev)
-pmodule, prevnum = self.revsplit(parents[0])[1:]
+pmodule, prevnum = revsplit(parents[0])[1:]
 parentpath = pmodule + "/" + entrypath
 fromkind = self._checkpath(entrypath, prevnum, pmodule)
 if fromkind == svn.core.svn_node_file:
 removed.add(self.recode(entrypath))
 # then we shouldn't need to look for its children.
 continue
 if ent.action == 'R' and parents:
 # If a directory is replacing a file, mark the previous
 # file as deleted
-pmodule, prevnum = self.revsplit(parents[0])[1:]
+pmodule, prevnum = revsplit(parents[0])[1:]
 pkind = self._checkpath(entrypath, prevnum, pmodule)
 if pkind == svn.core.svn_node_file:
 removed.add(self.recode(entrypath))
 elif pkind == svn.core.svn_node_dir:
 # We do not know what files were kept or removed,
 # Handle directory copies
 if not ent.copyfrom_path or not parents:
 continue
 # Copy sources not in parent revisions cannot be
 # represented, ignore their origin for now
-pmodule, prevnum = self.revsplit(parents[0])[1:]
+pmodule, prevnum = revsplit(parents[0])[1:]
 if ent.copyfrom_rev < prevnum:
 continue
 copyfrompath = self.getrelpath(ent.copyfrom_path, pmodule)
 if not copyfrompath:
 continue
 branched = True
 newpath = ent.copyfrom_path + self.module[len(path):]
 # ent.copyfrom_rev may not be the actual last revision
 previd = self.latest(newpath, ent.copyfrom_rev)
 if previd is not None:
-prevmodule, prevnum = self.revsplit(previd)[1:]
+prevmodule, prevnum = revsplit(previd)[1:]
 if prevnum >= self.startrev:
 parents = [previd]
 self.ui.note(
 _('found parent of branch %s at %d: %s\n') %
 (self.module, prevnum, prevmodule))
 # TODO: ra.get_file transmits the whole file instead of diffs.
 if file in self.removed:
 raise IOError()
 mode = ''
 try:
-new_module, revnum = self.revsplit(rev)[1:]
+new_module, revnum = revsplit(rev)[1:]
 if self.module != new_module:
 self.module = new_module
 self.reparent(self.module)
 io = StringIO()
 info = svn.ra.get_file(self.ra, file, revnum, io)

Mercurial > hg-stable

comparison hgext/convert/subversion.py @ 13690:af331f557942