Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'convert.cvsps.mergefrom' config
authorBoris Feld <boris.feld@octobus.net>
Fri, 30 Jun 2017 03:33:15 +0200
changeset 34155 6ea92f1b7a87
parent 34154 50f1c2d98db0
child 34156 698cccf1ad28
configitems: register the 'convert.cvsps.mergefrom' config
hgext/convert/__init__.py file | annotate | diff | comparison | revisions
hgext/convert/cvs.py file | annotate | diff | comparison | revisions 
--- a/hgext/convert/__init__.py	Fri Jun 30 03:33:06 2017 +0200
+++ b/hgext/convert/__init__.py	Fri Jun 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.
 
--- a/hgext/convert/cvs.py	Fri Jun 30 03:33:06 2017 +0200
+++ b/hgext/convert/cvs.py	Fri Jun 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:
Mercurial