equal
deleted
inserted
replaced
765 if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): |
765 if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): |
766 changelist.append(fname) |
766 changelist.append(fname) |
767 |
767 |
768 return fparent1 |
768 return fparent1 |
769 |
769 |
770 def commit(self, files=None, text="", user=None, date=None, |
770 def commit(self, files=None, text="", user=None, date=None, match=None, |
771 match=None, force=False, force_editor=False, |
771 force=False, force_editor=False, extra={}, empty_ok=False): |
772 p1=None, p2=None, extra={}, empty_ok=False): |
|
773 wlock = lock = None |
772 wlock = lock = None |
774 if extra.get("close"): |
773 if extra.get("close"): |
775 force = True |
774 force = True |
776 if files: |
775 if files: |
777 files = list(set(files)) |
776 files = list(set(files)) |