facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

convert/subversion.py: fix bad assumptions about SVN path naming

Browse Source 
The SVN converter assumed that the trunk and branches paths were fixed,
and immediately under the base of the SVN URL.  Fix the second assumption,
and allow the trunk and branches paths to be reconfigured.
This commit is contained in:
Bryan O'Sullivan 2007-07-17 15:24:59 -07:00
parent 1f2fa7bf13
commit 4946c0febe
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hgext/convert/subversion.py
View File

@ -1,6 +1,17 @@
# Subversion 1.4/1.5 Python API backend # Subversion 1.4/1.5 Python API backend
# #
# Copyright(C) 2007 Daniel Holth et al # Copyright(C) 2007 Daniel Holth et al
#
# Configuration options:
#
# convert.svn.trunk
# Relative path to the trunk (default: "trunk")
# convert.svn.branches
# Relative path to tree of branches (default: "branches")
#
# Set these in a hgrc, or on the command line as follows:
#
# hg convert --config convert.svn.trunk=wackoname [...]
import pprint import pprint
import locale import locale
@ -88,26 +99,47 @@ class convert_svn(converter_source):
lastrevs[module] = revnum lastrevs[module] = revnum
self.lastrevs = lastrevs self.lastrevs = lastrevs
def exists(self, path, optrev):
try:
return svn.client.ls(self.url.rstrip('/') + '/' + path,
optrev, False, self.ctx)
except SubversionException, err:
return []
def getheads(self): def getheads(self):
# detect standard /branches, /tags, /trunk layout # detect standard /branches, /tags, /trunk layout
optrev = svn.core.svn_opt_revision_t() optrev = svn.core.svn_opt_revision_t()
optrev.kind = svn.core.svn_opt_revision_number optrev.kind = svn.core.svn_opt_revision_number
optrev.value.number = self.last_changed optrev.value.number = self.last_changed
rpath = self.url.strip('/') rpath = self.url.strip('/')
paths = svn.client.ls(rpath, optrev, False, self.ctx) cfgtrunk = self.ui.config('convert', 'svn.trunk')
if 'branches' in paths and 'trunk' in paths: cfgbranches = self.ui.config('convert', 'svn.branches')
self.module += '/trunk' trunk = (cfgtrunk or 'trunk').strip('/')
branches = (cfgbranches or 'branches').strip('/')
if self.exists(trunk, optrev) and self.exists(branches, optrev):
self.ui.note('found trunk at %r and branches at %r\n' %
(trunk, branches))
oldmodule = self.module
self.module += '/' + trunk
lt = self.latest(self.module, self.last_changed) lt = self.latest(self.module, self.last_changed)
self.head = self.revid(lt) self.head = self.revid(lt)
self.heads = [self.head] self.heads = [self.head]
branches = svn.client.ls(rpath + '/branches', optrev, False, self.ctx) branchnames = svn.client.ls(rpath + '/' + branches, optrev, False,
for branch in branches.keys(): self.ctx)
module = '/branches/' + branch for branch in branchnames.keys():
if oldmodule:
module = '/' + oldmodule + '/' + branches + '/' + branch
else:
module = '/' + branches + '/' + branch
brevnum = self.latest(module, self.last_changed) brevnum = self.latest(module, self.last_changed)
brev = self.revid(brevnum, module) brev = self.revid(brevnum, module)
self.ui.note('found branch %s at %d\n' % (branch, brevnum)) self.ui.note('found branch %s at %d\n' % (branch, brevnum))
self.heads.append(brev) self.heads.append(brev)
elif cfgtrunk or cfgbranches:
raise util.Abort(_('trunk/branch layout expected, '
'but not found'))
else: else:
self.ui.note('working with one branch\n')
self.heads = [self.head] self.heads = [self.head]
return self.heads return self.heads
@ -193,8 +225,8 @@ class convert_svn(converter_source):
except SubversionException: except SubversionException:
dirent = None dirent = None
if not dirent: if not dirent:
raise util.Abort('%s not found up to revision %d' \ print self.base, path
% (path, stop)) raise util.Abort('%s not found up to revision %d' % (path, stop))
return dirent.created_rev return dirent.created_rev