Mercurial > hg > mercurial-source

diff mercurial/localrepo.py @ 8712:dd3ebf81af43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: rename wctx to cctx
author Matt Mackall <mpm@selenic.com>
date Wed, 03 Jun 2009 17:12:48 -0500 (2009-06-03)
parents bcb6e5bebd93
children 8c667f4c482e
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -837,11 +837,11 @@
                     raise util.Abort(_("unresolved merge conflicts "
                                                     "(see hg resolve)"))
 
-            wctx = context.workingctx(self, (p1, p2), text, user, date,
+            cctx = context.workingctx(self, (p1, p2), text, user, date,
                                       extra, changes)
             if editor:
-                wctx._text = editor(self, wctx)
-            ret = self.commitctx(wctx, True)
+                cctx._text = editor(self, cctx)
+            ret = self.commitctx(cctx, True)
 
             # update dirstate and mergestate
             for f in changes[0] + changes[1]: