[PATCH 03 of 27] configitems: register the 'convert.cvsps.mergefrom' config
Boris Feld
boris.feld at octobus.net
Wed Sep 13 02:59:13 EDT 2017
# HG changeset patch
# User Boris Feld <boris.feld at octobus.net>
# Date 1498786395 -7200
# ven. juin 30 03:33:15 2017 +0200
# Node ID 9902b23bdb4e92e48b0ce69f95cedc6ea55d53ca
# Parent b0b81a60d458a9b1be73a21d94268735a5409626
# EXP-Topic config.register.convert
configitems: register the 'convert.cvsps.mergefrom' config
diff -r b0b81a60d458 -r 9902b23bdb4e hgext/convert/__init__.py
--- a/hgext/convert/__init__.py ven. juin 30 03:33:06 2017 +0200
+++ b/hgext/convert/__init__.py ven. juin 30 03:33:15 2017 +0200
@@ -37,6 +37,9 @@
configitem('convert', 'cvsps.fuzz',
default=60,
)
+configitem('convert', 'cvsps.mergefrom',
+ default=None,
+)
# Commands definition was moved elsewhere to ease demandload job.
diff -r b0b81a60d458 -r 9902b23bdb4e hgext/convert/cvs.py
--- a/hgext/convert/cvs.py ven. juin 30 03:33:06 2017 +0200
+++ b/hgext/convert/cvs.py ven. juin 30 03:33:15 2017 +0200
@@ -82,7 +82,7 @@
db = cvsps.createchangeset(self.ui, db,
fuzz=int(self.ui.config('convert', 'cvsps.fuzz')),
mergeto=self.ui.config('convert', 'cvsps.mergeto', None),
- mergefrom=self.ui.config('convert', 'cvsps.mergefrom', None))
+ mergefrom=self.ui.config('convert', 'cvsps.mergefrom'))
for cs in db:
if maxrev and cs.id > maxrev:
More information about the Mercurial-devel
mailing list