comparison mercurial/localrepo.py @ 22948:c136e26953aa

obsstore: fix defaultformat option passing The obsstore format passing was not actually being passed to the obsstore. This fixes it.
author Durham Goode <durham@fb.com>
date Wed, 15 Oct 2014 12:52:10 -0700
parents 03602f76deee
children bb8278b289ee
comparison
equal deleted inserted replaced
22947:c63a09b6b337 22948:c136e26953aa
403 # read default format for new obsstore. 403 # read default format for new obsstore.
404 defaultformat = self.ui.configint('format', 'obsstore-version', None) 404 defaultformat = self.ui.configint('format', 'obsstore-version', None)
405 # rely on obsstore class default when possible. 405 # rely on obsstore class default when possible.
406 kwargs = {} 406 kwargs = {}
407 if defaultformat is not None: 407 if defaultformat is not None:
408 defaultformat['defaultformat'] = defaultformat 408 kwargs['defaultformat'] = defaultformat
409 store = obsolete.obsstore(self.sopener, **kwargs) 409 store = obsolete.obsstore(self.sopener, **kwargs)
410 if store and not obsolete._enabled: 410 if store and not obsolete._enabled:
411 # message is rare enough to not be translated 411 # message is rare enough to not be translated
412 msg = 'obsolete feature not enabled but %i markers found!\n' 412 msg = 'obsolete feature not enabled but %i markers found!\n'
413 self.ui.warn(msg % len(list(store))) 413 self.ui.warn(msg % len(list(store)))