diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -452,7 +452,7 @@ class workingctx(changectx): 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, + def __init__(self, repo, parents=None, text="", user=None, date=None, extra=None, changes=None): self._repo = repo self._rev = None @@ -688,7 +688,7 @@ class memctx(object): user - username string, or None. extra - a dictionary of extra values, or None. """ - def __init__(self, repo, parents, text, files, filectxfn, user=None, + def __init__(self, repo, parents, text, files, filectxfn, user=None, date=None, extra=None): self._repo = repo self._rev = None diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -791,9 +791,9 @@ class localrepository(repo.repository): update_dirstate = (self.dirstate.parents()[0] == p1) changes = [files, [], [], [], []] - wctx = context.workingctx(self, (p1, p2), text, user, date, + wctx = context.workingctx(self, (p1, p2), text, user, date, extra, changes) - return self._commitctx(wctx, force, force_editor, empty_ok, + return self._commitctx(wctx, force, force_editor, empty_ok, use_dirstate, update_dirstate) finally: del lock, wlock @@ -803,8 +803,8 @@ class localrepository(repo.repository): try: wlock = self.wlock() lock = self.lock() - return self._commitctx(ctx, force=True, force_editor=False, - empty_ok=True, use_dirstate=False, + return self._commitctx(ctx, force=True, force_editor=False, + empty_ok=True, use_dirstate=False, update_dirstate=False) finally: del lock, wlock