Mercurial > hgsubversion

diff hgsubversion/maps.py @ 1211:56d6e0273733

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maps: load commandline branchmap 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 a0c6dbd9afbb
children 295d2f0cc275
line wrap: on
line diff
--- a/hgsubversion/maps.py
+++ b/hgsubversion/maps.py
@@ -375,6 +375,11 @@ class BranchMap(dict):
         self.super.__init__()
         self.load(path)
 
+        # append branch mapping specified from the commandline
+        clmap = util.configpath(self.ui, 'branchmap')
+        if clmap:
+            self.load(clmap)
+
     def load(self, path):
         '''Load mappings from a file at the specified path.'''
         if not os.path.exists(path):