597 |
597 |
598 def _commit(self, files, text, user, date, match, force, lock, wlock, |
598 def _commit(self, files, text, user, date, match, force, lock, wlock, |
599 force_editor, p1, p2, extra, empty_ok): |
599 force_editor, p1, p2, extra, empty_ok): |
600 '''Private commit wrapper for backwards compatibility.''' |
600 '''Private commit wrapper for backwards compatibility.''' |
601 try: |
601 try: |
602 return super(kwrepo, self).commit(files, text, user, date, |
602 return super(kwrepo, |
603 match, force, |
603 self).commit(files=files, text=text, |
604 lock=lock, wlock=wlock, |
604 user=user, date=date, match=match, |
605 force_editor=force_editor, |
605 force=force, lock=lock, wlock=wlock, |
606 p1=p1, p2=p2, extra=extra) |
606 force_editor=force_editor, |
|
607 p1=p1, p2=p2, extra=extra) |
607 except TypeError: |
608 except TypeError: |
608 try: |
609 try: |
609 return super(kwrepo, |
610 return super(kwrepo, |
610 self).commit(files, text, user, date, |
611 self).commit(files=files, text=text, |
611 match, force, |
612 user=user, date=date, |
|
613 match=match, force=force, |
612 force_editor=force_editor, |
614 force_editor=force_editor, |
613 p1=p1, p2=p2, extra=extra, |
615 p1=p1, p2=p2, extra=extra, |
614 empty_ok=empty_ok) |
616 empty_ok=empty_ok) |
615 except TypeError: |
617 except TypeError: |
616 return super(kwrepo, |
618 return super(kwrepo, |
617 self).commit(files, text, user, date, |
619 self).commit(files=files, text=text, |
618 match, force, |
620 user=user, date=date, |
|
621 match=match, force=force, |
619 force_editor=force_editor, |
622 force_editor=force_editor, |
620 p1=p1, p2=p2, extra=extra) |
623 p1=p1, p2=p2, extra=extra) |
621 |
624 |
622 def commit(self, files=None, text='', user=None, date=None, |
625 def commit(self, files=None, text='', user=None, date=None, |
623 match=_defmatch, force=False, lock=None, wlock=None, |
626 match=_defmatch, force=False, lock=None, wlock=None, |
692 if node2 is not None: |
695 if node2 is not None: |
693 kwt.matcher = util.never |
696 kwt.matcher = util.never |
694 elif node1 is not None and node1 != repo.dirstate.parents()[0]: |
697 elif node1 is not None and node1 != repo.dirstate.parents()[0]: |
695 kwt.restrict = True |
698 kwt.restrict = True |
696 try: |
699 try: |
697 patch_diff(repo, node1, node2, files, match, fp, changes, opts) |
700 patch_diff(repo, node1=node1, node2=node2, files=files, |
|
701 match=match, fp=fp, changes=changes, opts=opts) |
698 except TypeError: |
702 except TypeError: |
699 patch_diff(repo, node1, node2, match, fp, changes, opts) |
703 patch_diff(repo, node1=node1, node2=node2, match=match, fp=fp, |
|
704 changes=changes, opts=opts) |
700 |
705 |
701 patch_diff = patch.diff |
706 patch_diff = patch.diff |
702 patch.diff = kw_diff |
707 patch.diff = kw_diff |
703 |
708 |
704 try: |
709 try: |