--- a/mercurial/localrepo.py	Wed Jul 01 00:41:14 2009 -0500
+++ b/mercurial/localrepo.py	Wed Jul 01 01:05:24 2009 -0500
@@ -872,7 +872,7 @@
             cctx = context.workingctx(self, (p1, p2), text, user, date,
                                       extra, changes)
             if editor:
-                cctx._text = editor(self, cctx)
+                cctx._text = editor(self, cctx, subs)
 
             # commit subs
             if subs: