Mercurial > hg
changeset 6721:521c6c6f3b9b
kill some trailing spaces
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 23 Jun 2008 13:12:32 +0200 |
| parents | 084c9f1ef2bd |
| children | 197d54d82f8d |
| files | mercurial/context.py mercurial/localrepo.py |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Mon Jun 23 12:54:27 2008 +0200 +++ b/mercurial/context.py Mon Jun 23 13:12:32 2008 +0200 @@ -452,7 +452,7 @@ 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 @@ 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
--- a/mercurial/localrepo.py Mon Jun 23 12:54:27 2008 +0200 +++ b/mercurial/localrepo.py Mon Jun 23 13:12:32 2008 +0200 @@ -791,9 +791,9 @@ 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 @@ 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