Show More
@@ -491,10 +491,8 b' class localrepository(repo.repository):' | |||||
491 | def changectx(self, changeid=None): |
|
491 | def changectx(self, changeid=None): | |
492 | return context.changectx(self, changeid) |
|
492 | return context.changectx(self, changeid) | |
493 |
|
493 | |||
494 | def workingctx(self, parents=None, text="", user=None, date=None, |
|
494 | def workingctx(self): | |
495 | extra=None, changes=None): |
|
495 | return context.workingctx(self) | |
496 | return context.workingctx(self, parents, text, user, date, extra, |
|
|||
497 | changes) |
|
|||
498 |
|
496 | |||
499 | def parents(self, changeid=None): |
|
497 | def parents(self, changeid=None): | |
500 | ''' |
|
498 | ''' | |
@@ -793,7 +791,8 b' class localrepository(repo.repository):' | |||||
793 | update_dirstate = (self.dirstate.parents()[0] == p1) |
|
791 | update_dirstate = (self.dirstate.parents()[0] == p1) | |
794 | changes = [files, [], [], [], []] |
|
792 | changes = [files, [], [], [], []] | |
795 |
|
793 | |||
796 |
wctx = |
|
794 | wctx = context.workingctx(self, (p1, p2), text, user, date, | |
|
795 | extra, changes) | |||
797 | return self._commitctx(wctx, force, force_editor, empty_ok, |
|
796 | return self._commitctx(wctx, force, force_editor, empty_ok, | |
798 | use_dirstate, update_dirstate) |
|
797 | use_dirstate, update_dirstate) | |
799 | finally: |
|
798 | finally: |
General Comments 0
You need to be logged in to leave comments.
Login now