# HG changeset patch # User Dan Villiom Podlaski Christiansen # Date 1323817677 -3600 # Node ID 21197f5ee9de8d60e6121d47a1cebb65fb13aa0e # Parent 109c412ecf12fee8c11c5300a62cfeb19735d9a4 expand configured paths diff --git a/hgsubversion/svnmeta.py b/hgsubversion/svnmeta.py --- a/hgsubversion/svnmeta.py +++ b/hgsubversion/svnmeta.py @@ -48,13 +48,13 @@ class SVNMeta(object): self.revmap = maps.RevMap(repo) author_host = self.ui.config('hgsubversion', 'defaulthost', uuid) - authors = self.ui.config('hgsubversion', 'authormap') + authors = util.configpath(self.ui, 'authormap') tag_locations = self.ui.configlist('hgsubversion', 'tagpaths', ['tags']) self.usebranchnames = self.ui.configbool('hgsubversion', 'usebranchnames', True) - branchmap = self.ui.config('hgsubversion', 'branchmap') - tagmap = self.ui.config('hgsubversion', 'tagmap') - filemap = self.ui.config('hgsubversion', 'filemap') + branchmap = util.configpath(self.ui, 'branchmap') + tagmap = util.configpath(self.ui, 'tagmap') + filemap = util.configpath(self.ui, 'filemap') self.branches = {} if os.path.exists(self.branch_info_file): diff --git a/hgsubversion/util.py b/hgsubversion/util.py --- a/hgsubversion/util.py +++ b/hgsubversion/util.py @@ -32,6 +32,9 @@ def formatrev(rev): return '\t(working copy)' return '\t(revision %d)' % rev +def configpath(ui, name): + path = ui.config('hgsubversion', name) + return path and hgutil.expandpath(path) def filterdiff(diff, oldrev, newrev): diff = newfile_devnull_re.sub(r'--- \1\t(revision 0)' '\n'