Mercurial > hgsubversion
changeset 1208:54d42e59b29c
maps: load commandline tagmap in __init__
Funcationally, this is the same as before but consolidates the logic to its own
object so we later refactor all the map objects to inherit from a common base
object.
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Mon, 24 Mar 2014 11:20:47 -0500 |
| parents | 9fc3557ce85e |
| children | 20c28c511551 |
| files | hgsubversion/maps.py hgsubversion/svnmeta.py |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgsubversion/maps.py +++ b/hgsubversion/maps.py @@ -437,6 +437,11 @@ class TagMap(dict): self.super.__init__() self.load(path) + # append tag mapping specified from the commandline + clmap = util.configpath(self.ui, 'tagmap') + if clmap: + self.load(clmap) + def load(self, path): '''Load mappings from a file at the specified path.''' if not os.path.exists(path):
--- a/hgsubversion/svnmeta.py +++ b/hgsubversion/svnmeta.py @@ -41,7 +41,6 @@ class SVNMeta(object): self._gen_cachedconfig('usebranchnames', True) branchmap = util.configpath(self.ui, 'branchmap') - tagmap = util.configpath(self.ui, 'tagmap') filemap = util.configpath(self.ui, 'filemap') self.branches = util.load(self.branch_info_file) or {} @@ -58,8 +57,6 @@ class SVNMeta(object): self.branchmap.load(branchmap) self.tagmap = maps.TagMap(self.ui, self.tagmap_file) - if tagmap: - self.tagmap.load(tagmap) self.filemap = maps.FileMap(self.ui, self.filemap_file) if filemap: