436 if not kwwlock: |
436 if not kwwlock: |
437 kwwlock = self.wlock() |
437 kwwlock = self.wlock() |
438 if not kwlock: |
438 if not kwlock: |
439 kwlock = self.lock() |
439 kwlock = self.lock() |
440 try: |
440 try: |
441 removed = self.status(node1=p1, node2=p2, files=files, |
|
442 match=match, wlock=kwwlock)[2] |
|
443 node = super(kwrepo, |
441 node = super(kwrepo, |
444 self).commit(files=files, text=text, |
442 self).commit(files=files, text=text, |
445 user=user, date=date, |
443 user=user, date=date, |
446 match=match, force=force, |
444 match=match, force=force, |
447 lock=kwlock, wlock=kwwlock, |
445 lock=kwlock, wlock=kwwlock, |
448 force_editor=force_editor, |
446 force_editor=force_editor, |
449 p1=p1, p2=p2, extra=extra) |
447 p1=p1, p2=p2, extra=extra) |
450 except TypeError: |
448 except TypeError: |
451 removed = self.status(node1=p1, node2=p2, |
|
452 files=files, match=match)[2] |
|
453 node = super(kwrepo, |
449 node = super(kwrepo, |
454 self).commit(files=files, text=text, |
450 self).commit(files=files, text=text, |
455 user=user, date=date, |
451 user=user, date=date, |
456 match=match, force=force, |
452 match=match, force=force, |
457 force_editor=force_editor, |
453 force_editor=force_editor, |