equal
deleted
inserted
replaced
807 wctx = context.workingctx(self, (p1, p2), text, user, date, |
807 wctx = context.workingctx(self, (p1, p2), text, user, date, |
808 extra, changes) |
808 extra, changes) |
809 if editor: |
809 if editor: |
810 wctx._text = editor(self, wctx, |
810 wctx._text = editor(self, wctx, |
811 changes[1], changes[0], changes[2]) |
811 changes[1], changes[0], changes[2]) |
812 |
|
813 ret = self.commitctx(wctx, True) |
812 ret = self.commitctx(wctx, True) |
814 ms.reset() |
813 |
815 |
814 # update dirstate and mergestate |
816 # update dirstate |
|
817 for f in changes[0] + changes[1]: |
815 for f in changes[0] + changes[1]: |
818 self.dirstate.normal(f) |
816 self.dirstate.normal(f) |
819 for f in changes[2]: |
817 for f in changes[2]: |
820 self.dirstate.forget(f) |
818 self.dirstate.forget(f) |
821 self.dirstate.setparents(ret) |
819 self.dirstate.setparents(ret) |
|
820 ms.reset() |
822 |
821 |
823 return ret |
822 return ret |
824 |
823 |
825 finally: |
824 finally: |
826 wlock.release() |
825 wlock.release() |