equal
deleted
inserted
replaced
432 data = self._kwt.expand(filename, data, None) |
432 data = self._kwt.expand(filename, data, None) |
433 return super(kwrepo, self).wwritedata(filename, data) |
433 return super(kwrepo, self).wwritedata(filename, data) |
434 |
434 |
435 def commit(self, files=None, text='', user=None, date=None, |
435 def commit(self, files=None, text='', user=None, date=None, |
436 match=util.always, force=False, force_editor=False, |
436 match=util.always, force=False, force_editor=False, |
437 p1=None, p2=None, extra={}): |
437 p1=None, p2=None, extra={}, empty_ok=False): |
438 wlock = lock = None |
438 wlock = lock = None |
439 _p1 = _p2 = None |
439 _p1 = _p2 = None |
440 try: |
440 try: |
441 wlock = self.wlock() |
441 wlock = self.wlock() |
442 lock = self.lock() |
442 lock = self.lock() |
460 |
460 |
461 node = super(kwrepo, |
461 node = super(kwrepo, |
462 self).commit(files=files, text=text, user=user, |
462 self).commit(files=files, text=text, user=user, |
463 date=date, match=match, force=force, |
463 date=date, match=match, force=force, |
464 force_editor=force_editor, |
464 force_editor=force_editor, |
465 p1=p1, p2=p2, extra=extra) |
465 p1=p1, p2=p2, extra=extra, |
|
466 empty_ok=empty_ok) |
466 |
467 |
467 # restore commit hooks |
468 # restore commit hooks |
468 for name, cmd in commithooks.iteritems(): |
469 for name, cmd in commithooks.iteritems(): |
469 ui.setconfig('hooks', name, cmd) |
470 ui.setconfig('hooks', name, cmd) |
470 if node is not None: |
471 if node is not None: |