hgkw/keyword.py
branchstable
changeset 543 72477fcc575b
parent 542 057f4a64df03
child 549 9084fb1593e6
equal deleted inserted replaced
542:057f4a64df03 543:72477fcc575b
   450         def wread(self, filename):
   450         def wread(self, filename):
   451             data = super(kwrepo, self).wread(filename)
   451             data = super(kwrepo, self).wread(filename)
   452             return kwt.wread(filename, data)
   452             return kwt.wread(filename, data)
   453 
   453 
   454         def commit(self, files=None, text='', user=None, date=None,
   454         def commit(self, files=None, text='', user=None, date=None,
   455                    match=None, force=False, force_editor=False,
   455                    match=None, force=False, editor=None, extra={}):
   456                    extra={}, empty_ok=False):
       
   457             wlock = lock = None
   456             wlock = lock = None
   458             _p1 = _p2 = None
   457             _p1 = _p2 = None
   459             try:
   458             try:
   460                 wlock = self.wlock()
   459                 wlock = self.wlock()
   461                 lock = self.lock()
   460                 lock = self.lock()
   473                         _p2 = ''
   472                         _p2 = ''
   474                     else:
   473                     else:
   475                         _p2 = hex(_p2)
   474                         _p2 = hex(_p2)
   476 
   475 
   477                 n = super(kwrepo, self).commit(files, text, user, date, match,
   476                 n = super(kwrepo, self).commit(files, text, user, date, match,
   478                                                force, force_editor,
   477                                                force, editor, extra)
   479                                                extra, empty_ok)
       
   480 
   478 
   481                 # restore commit hooks
   479                 # restore commit hooks
   482                 for name, cmd in commithooks.iteritems():
   480                 for name, cmd in commithooks.iteritems():
   483                     ui.setconfig('hooks', name, cmd)
   481                     ui.setconfig('hooks', name, cmd)
   484                 if n is not None:
   482                 if n is not None: