configitems: register the 'convert.cvsps.mergeto' config
authorBoris Feld <boris.feld@octobus.net>
Fri, 30 Jun 2017 03:33:25 +0200
changeset 34168 698cccf1ad28
parent 34167 6ea92f1b7a87
child 34169 a608b46a5ed0
configitems: register the 'convert.cvsps.mergeto' config
hgext/convert/__init__.py
hgext/convert/cvs.py
--- a/hgext/convert/__init__.py	Fri Jun 30 03:33:15 2017 +0200
+++ b/hgext/convert/__init__.py	Fri Jun 30 03:33:25 2017 +0200
@@ -40,6 +40,9 @@
 configitem('convert', 'cvsps.mergefrom',
     default=None,
 )
+configitem('convert', 'cvsps.mergeto',
+    default=None,
+)
 
 # Commands definition was moved elsewhere to ease demandload job.
 
--- a/hgext/convert/cvs.py	Fri Jun 30 03:33:15 2017 +0200
+++ b/hgext/convert/cvs.py	Fri Jun 30 03:33:25 2017 +0200
@@ -81,7 +81,7 @@
             db = cvsps.createlog(self.ui, cache=cache)
             db = cvsps.createchangeset(self.ui, db,
                 fuzz=int(self.ui.config('convert', 'cvsps.fuzz')),
-                mergeto=self.ui.config('convert', 'cvsps.mergeto', None),
+                mergeto=self.ui.config('convert', 'cvsps.mergeto'),
                 mergefrom=self.ui.config('convert', 'cvsps.mergefrom'))
 
             for cs in db: