Mercurial > hg-stable

changeset 34169:a608b46a5ed0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: register the 'convert.git.committeractions' config
author Boris Feld <boris.feld@octobus.net>
date Fri, 30 Jun 2017 03:33:29 +0200
parents 698cccf1ad28
children 89e666798111
files hgext/convert/__init__.py hgext/convert/git.py
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/__init__.py	Fri Jun 30 03:33:25 2017 +0200
+++ b/hgext/convert/__init__.py	Fri Jun 30 03:33:29 2017 +0200
@@ -43,6 +43,9 @@
 configitem('convert', 'cvsps.mergeto',
     default=None,
 )
+configitem('convert', 'git.committeractions',
+    default=lambda: ['messagedifferent'],
+)
 
 # Commands definition was moved elsewhere to ease demandload job.
 
--- a/hgext/convert/git.py	Fri Jun 30 03:33:25 2017 +0200
+++ b/hgext/convert/git.py	Fri Jun 30 03:33:29 2017 +0200
@@ -110,8 +110,7 @@
             raise error.Abort(_('copying of extra key is forbidden: %s') %
                               _(', ').join(sorted(banned)))
 
-        committeractions = self.ui.configlist('convert', 'git.committeractions',
-                                              'messagedifferent')
+        committeractions = self.ui.configlist('convert', 'git.committeractions')
 
         messagedifferent = None
         messagealways = None