Mercurial > hgsubversion
changeset 1193:a55339d35066
maps: load commandline authormap 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:46 -0500 |
| parents | 23a845fbfc6a |
| children | 49791c40a8a5 |
| files | hgsubversion/maps.py hgsubversion/svnmeta.py |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgsubversion/maps.py +++ b/hgsubversion/maps.py @@ -39,6 +39,11 @@ class AuthorMap(dict): self.super.__init__() self.load(path) + # append authors specified from the commandline + clmap = util.configpath(self.ui, 'authormap') + if clmap: + self.load(clmap) + def load(self, path): ''' Load mappings from a file at the specified path. '''
--- a/hgsubversion/svnmeta.py +++ b/hgsubversion/svnmeta.py @@ -40,7 +40,6 @@ class SVNMeta(object): self._gen_cachedconfig('usebranchnames', True) author_host = self.ui.config('hgsubversion', 'defaulthost', uuid) - authors = util.configpath(self.ui, 'authormap') branchmap = util.configpath(self.ui, 'branchmap') tagmap = util.configpath(self.ui, 'tagmap') filemap = util.configpath(self.ui, 'filemap') @@ -53,8 +52,7 @@ class SVNMeta(object): self._layoutobj = None self.authors = maps.AuthorMap(self.ui, self.authors_file, - defaulthost=author_host) - if authors: self.authors.load(authors) + defaulthost=author_host) self.branchmap = maps.BranchMap(self.ui, self.branchmap_file) if branchmap: