Mercurial > hg-stable
changeset 34167:6ea92f1b7a87
configitems: register the 'convert.cvsps.mergefrom' config
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 30 Jun 2017 03:33:15 +0200 |
| parents | 50f1c2d98db0 |
| children | 698cccf1ad28 |
| files | hgext/convert/__init__.py hgext/convert/cvs.py |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: