Mercurial > hg
comparison mercurial/localrepo.py @ 8712:dd3ebf81af43
commit: rename wctx to cctx
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 03 Jun 2009 17:12:48 -0500 |
| parents | bcb6e5bebd93 |
| children | 8c667f4c482e |
comparison
equal
deleted
inserted
replaced
| 8711:1b95c6f13155 | 8712:dd3ebf81af43 |
|---|---|
| 835 for f in changes[0]: | 835 for f in changes[0]: |
| 836 if f in ms and ms[f] == 'u': | 836 if f in ms and ms[f] == 'u': |
| 837 raise util.Abort(_("unresolved merge conflicts " | 837 raise util.Abort(_("unresolved merge conflicts " |
| 838 "(see hg resolve)")) | 838 "(see hg resolve)")) |
| 839 | 839 |
| 840 wctx = context.workingctx(self, (p1, p2), text, user, date, | 840 cctx = context.workingctx(self, (p1, p2), text, user, date, |
| 841 extra, changes) | 841 extra, changes) |
| 842 if editor: | 842 if editor: |
| 843 wctx._text = editor(self, wctx) | 843 cctx._text = editor(self, cctx) |
| 844 ret = self.commitctx(wctx, True) | 844 ret = self.commitctx(cctx, True) |
| 845 | 845 |
| 846 # update dirstate and mergestate | 846 # update dirstate and mergestate |
| 847 for f in changes[0] + changes[1]: | 847 for f in changes[0] + changes[1]: |
| 848 self.dirstate.normal(f) | 848 self.dirstate.normal(f) |
| 849 for f in changes[2]: | 849 for f in changes[2]: |