##// END OF EJS Templates
context: remove parents parameter to workingctx...
Benoit Boissinot -
r10969:ca052b48 default
parent child Browse files
Show More
@@ -539,15 +539,14 b' class filectx(object):'
539 class workingctx(changectx):
539 class workingctx(changectx):
540 """A workingctx object makes access to data related to
540 """A workingctx object makes access to data related to
541 the current working directory convenient.
541 the current working directory convenient.
542 parents - a pair of parent nodeids, or None to use the dirstate.
543 date - any valid date string or (unixtime, offset), or None.
542 date - any valid date string or (unixtime, offset), or None.
544 user - username string, or None.
543 user - username string, or None.
545 extra - a dictionary of extra values, or None.
544 extra - a dictionary of extra values, or None.
546 changes - a list of file lists as returned by localrepo.status()
545 changes - a list of file lists as returned by localrepo.status()
547 or None to use the repository status.
546 or None to use the repository status.
548 """
547 """
549 def __init__(self, repo, parents=None, text="", user=None, date=None,
548 def __init__(self, repo, text="", user=None, date=None, extra=None,
550 extra=None, changes=None):
549 changes=None):
551 self._repo = repo
550 self._repo = repo
552 self._rev = None
551 self._rev = None
553 self._node = None
552 self._node = None
@@ -556,8 +555,6 b' class workingctx(changectx):'
556 self._date = util.parsedate(date)
555 self._date = util.parsedate(date)
557 if user:
556 if user:
558 self._user = user
557 self._user = user
559 if parents:
560 self._parents = [changectx(self._repo, p) for p in parents]
561 if changes:
558 if changes:
562 self._status = list(changes)
559 self._status = list(changes)
563
560
@@ -852,8 +852,7 b' class localrepository(repo.repository):'
852 raise util.Abort(_("unresolved merge conflicts "
852 raise util.Abort(_("unresolved merge conflicts "
853 "(see hg resolve)"))
853 "(see hg resolve)"))
854
854
855 cctx = context.workingctx(self, (p1, p2), text, user, date,
855 cctx = context.workingctx(self, text, user, date, extra, changes)
856 extra, changes)
857 if editor:
856 if editor:
858 cctx._text = editor(self, cctx, subs)
857 cctx._text = editor(self, cctx, subs)
859 edited = (text != cctx._text)
858 edited = (text != cctx._text)
General Comments 0
You need to be logged in to leave comments. Login now