equal
deleted
inserted
replaced
455 return _kwtemplater.shrink(data) |
455 return _kwtemplater.shrink(data) |
456 return data |
456 return data |
457 |
457 |
458 def commit(self, files=None, text='', user=None, date=None, |
458 def commit(self, files=None, text='', user=None, date=None, |
459 match=util.always, force=False, force_editor=False, |
459 match=util.always, force=False, force_editor=False, |
460 p1=None, p2=None, extra={}): |
460 p1=None, p2=None, extra={}, empty_ok=False): |
461 wlock = lock = None |
461 wlock = lock = None |
462 _p1 = _p2 = None |
462 _p1 = _p2 = None |
463 try: |
463 try: |
464 wlock = self.wlock() |
464 wlock = self.wlock() |
465 lock = self.lock() |
465 lock = self.lock() |
483 |
483 |
484 node = super(kwrepo, |
484 node = super(kwrepo, |
485 self).commit(files=files, text=text, user=user, |
485 self).commit(files=files, text=text, user=user, |
486 date=date, match=match, force=force, |
486 date=date, match=match, force=force, |
487 force_editor=force_editor, |
487 force_editor=force_editor, |
488 p1=p1, p2=p2, extra=extra) |
488 p1=p1, p2=p2, extra=extra, |
|
489 empty_ok=empty_ok) |
489 |
490 |
490 # restore commit hooks |
491 # restore commit hooks |
491 for name, cmd in commithooks.iteritems(): |
492 for name, cmd in commithooks.iteritems(): |
492 ui.setconfig('hooks', name, cmd) |
493 ui.setconfig('hooks', name, cmd) |
493 if node is not None: |
494 if node is not None: |