Mercurial > hgsubversion
comparison hgsubversion/svnmeta.py @ 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 |
comparison
equal
deleted
inserted
replaced
| 1207:9fc3557ce85e | 1208:54d42e59b29c |
|---|---|
| 39 self._gen_cachedconfig('caseignoreauthors', False) | 39 self._gen_cachedconfig('caseignoreauthors', False) |
| 40 self._gen_cachedconfig('defaulthost', self.uuid) | 40 self._gen_cachedconfig('defaulthost', self.uuid) |
| 41 self._gen_cachedconfig('usebranchnames', True) | 41 self._gen_cachedconfig('usebranchnames', True) |
| 42 | 42 |
| 43 branchmap = util.configpath(self.ui, 'branchmap') | 43 branchmap = util.configpath(self.ui, 'branchmap') |
| 44 tagmap = util.configpath(self.ui, 'tagmap') | |
| 45 filemap = util.configpath(self.ui, 'filemap') | 44 filemap = util.configpath(self.ui, 'filemap') |
| 46 | 45 |
| 47 self.branches = util.load(self.branch_info_file) or {} | 46 self.branches = util.load(self.branch_info_file) or {} |
| 48 self.prevbranches = dict(self.branches) | 47 self.prevbranches = dict(self.branches) |
| 49 self._tags = None | 48 self._tags = None |
| 56 self.branchmap = maps.BranchMap(self.ui, self.branchmap_file) | 55 self.branchmap = maps.BranchMap(self.ui, self.branchmap_file) |
| 57 if branchmap: | 56 if branchmap: |
| 58 self.branchmap.load(branchmap) | 57 self.branchmap.load(branchmap) |
| 59 | 58 |
| 60 self.tagmap = maps.TagMap(self.ui, self.tagmap_file) | 59 self.tagmap = maps.TagMap(self.ui, self.tagmap_file) |
| 61 if tagmap: | |
| 62 self.tagmap.load(tagmap) | |
| 63 | 60 |
| 64 self.filemap = maps.FileMap(self.ui, self.filemap_file) | 61 self.filemap = maps.FileMap(self.ui, self.filemap_file) |
| 65 if filemap: | 62 if filemap: |
| 66 self.filemap.load(filemap) | 63 self.filemap.load(filemap) |
| 67 | 64 |