Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 8707:0550dfe4fca1
commit: editor reads file lists from provided context
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 01 Jun 2009 14:51:47 -0500 |
parents | 25e9c71b89de |
children | b9e0ddb04c5c |
comparison
equal
deleted
inserted
replaced
8706:25e9c71b89de | 8707:0550dfe4fca1 |
---|---|
807 "(see hg resolve)")) | 807 "(see hg resolve)")) |
808 | 808 |
809 wctx = context.workingctx(self, (p1, p2), text, user, date, | 809 wctx = context.workingctx(self, (p1, p2), text, user, date, |
810 extra, changes) | 810 extra, changes) |
811 if editor: | 811 if editor: |
812 wctx._text = editor(self, wctx, | 812 wctx._text = editor(self, wctx) |
813 changes[1], changes[0], changes[2]) | |
814 ret = self.commitctx(wctx, True) | 813 ret = self.commitctx(wctx, True) |
815 | 814 |
816 # update dirstate and mergestate | 815 # update dirstate and mergestate |
817 for f in changes[0] + changes[1]: | 816 for f in changes[0] + changes[1]: |
818 self.dirstate.normal(f) | 817 self.dirstate.normal(f) |