# HG changeset patch # User David Schleimer # Date 1367270545 25200 # Node ID 438dc704b0d62cfee15419586976670308ba6d4a # Parent ea6109f5c000d71b052dfff94079254b5a52df14 layouts: use layout library in hg svn info diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py --- a/hgsubversion/svncommands.py +++ b/hgsubversion/svncommands.py @@ -413,17 +413,8 @@ def info(ui, repo, **opts): return 0 r, br = hashes[pn] subdir = util.getsvnrev(parent)[40:].split('@')[0] - if meta.layout == 'single': - branchpath = '' - elif br == None: - branchpath = '/trunk' - elif br.startswith('../'): - branchpath = '/%s' % br[3:] - subdir = subdir.replace('branches/../', '') - else: - branchpath = '/branches/%s' % br remoterepo = svnrepo.svnremoterepo(repo.ui) - url = '%s%s' % (remoterepo.svnurl, branchpath) + url = meta.layoutobj.remotepath(br, remoterepo.svnurl) author = meta.authors.reverselookup(parent.user()) # cleverly figure out repo root w/o actually contacting the server reporoot = url[:len(url)-len(subdir)]