##// END OF EJS Templates
configitems: register the 'mq.git' config
Boris Feld -
r34182:62490b84 default
parent child Browse files
Show More
@@ -109,6 +109,13 b' command = registrar.command(cmdtable)'
109 # leave the attribute unspecified.
109 # leave the attribute unspecified.
110 testedwith = 'ships-with-hg-core'
110 testedwith = 'ships-with-hg-core'
111
111
112 configtable = {}
113 configitem = registrar.configitem(configtable)
114
115 configitem('mq', 'git',
116 default='auto',
117 )
118
112 # force load strip extension formerly included in mq and import some utility
119 # force load strip extension formerly included in mq and import some utility
113 try:
120 try:
114 stripext = extensions.find('strip')
121 stripext = extensions.find('strip')
@@ -444,17 +451,14 b' class queue(object):'
444 self.activeguards = None
451 self.activeguards = None
445 self.guardsdirty = False
452 self.guardsdirty = False
446 # Handle mq.git as a bool with extended values
453 # Handle mq.git as a bool with extended values
447 try:
454 gitmode = ui.config('mq', 'git').lower()
448 gitmode = ui.configbool('mq', 'git', None)
455 boolmode = util.parsebool(gitmode)
449 if gitmode is None:
456 if boolmode is not None:
450 raise error.ConfigError
457 if boolmode:
451 if gitmode:
458 gitmode = 'yes'
452 self.gitmode = 'yes'
453 else:
459 else:
454 self.gitmode = 'no'
460 gitmode = 'no'
455 except error.ConfigError:
461 self.gitmode = gitmode
456 # let's have check-config ignore the type mismatch
457 self.gitmode = ui.config(r'mq', 'git', 'auto').lower()
458 # deprecated config: mq.plain
462 # deprecated config: mq.plain
459 self.plainmode = ui.configbool('mq', 'plain', False)
463 self.plainmode = ui.configbool('mq', 'plain', False)
460 self.checkapplied = True
464 self.checkapplied = True
General Comments 0
You need to be logged in to leave comments. Login now