# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1271805511 -7200
# Node ID ca052b484e566383a9218e25f5db5fe845320abb
# Parent  7a0d096e221edb3d38e58cb813257c173365bf12
context: remove parents parameter to workingctx

it was needed before the refactor of commit, workingctx always uses the
dirstate now.

diff -r 7a0d096e221e -r ca052b484e56 mercurial/context.py
--- a/mercurial/context.py	Tue Apr 20 11:17:01 2010 +0200
+++ b/mercurial/context.py	Wed Apr 21 01:18:31 2010 +0200
@@ -539,15 +539,14 @@
 class workingctx(changectx):
     """A workingctx object makes access to data related to
     the current working directory convenient.
-    parents - a pair of parent nodeids, or None to use the dirstate.
     date - any valid date string or (unixtime, offset), or None.
     user - username string, or None.
     extra - a dictionary of extra values, or None.
     changes - a list of file lists as returned by localrepo.status()
                or None to use the repository status.
     """
-    def __init__(self, repo, parents=None, text="", user=None, date=None,
-                 extra=None, changes=None):
+    def __init__(self, repo, text="", user=None, date=None, extra=None,
+                 changes=None):
         self._repo = repo
         self._rev = None
         self._node = None
@@ -556,8 +555,6 @@
             self._date = util.parsedate(date)
         if user:
             self._user = user
-        if parents:
-            self._parents = [changectx(self._repo, p) for p in parents]
         if changes:
             self._status = list(changes)
 
diff -r 7a0d096e221e -r ca052b484e56 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Apr 20 11:17:01 2010 +0200
+++ b/mercurial/localrepo.py	Wed Apr 21 01:18:31 2010 +0200
@@ -852,8 +852,7 @@
                     raise util.Abort(_("unresolved merge conflicts "
                                                     "(see hg resolve)"))
 
-            cctx = context.workingctx(self, (p1, p2), text, user, date,
-                                      extra, changes)
+            cctx = context.workingctx(self, text, user, date, extra, changes)
             if editor:
                 cctx._text = editor(self, cctx, subs)
             edited = (text != cctx._text)