[PATCH 04 of 27] configitems: register the 'convert.cvsps.mergeto' config

[Boris Feld]

# HG changeset patch
# User Boris Feld <boris.feld at octobus.net>
# Date 1498786405 -7200
#      ven. juin 30 03:33:25 2017 +0200
# Node ID cb42d350be7955d112360633b3feb6e124dc55ca
# Parent  9902b23bdb4e92e48b0ce69f95cedc6ea55d53ca
# EXP-Topic config.register.convert
configitems: register the 'convert.cvsps.mergeto' config

diff -r 9902b23bdb4e -r cb42d350be79 hgext/convert/__init__.py
--- a/hgext/convert/__init__.py	ven. juin 30 03:33:15 2017 +0200
+++ b/hgext/convert/__init__.py	ven. juin 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.
 
diff -r 9902b23bdb4e -r cb42d350be79 hgext/convert/cvs.py
--- a/hgext/convert/cvs.py	ven. juin 30 03:33:15 2017 +0200
+++ b/hgext/convert/cvs.py	ven. juin 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: