Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 21689:503bb3af70fe
memfilectx: call super.__init__ instead of duplicating code
This patch changes the calling signature of memfilectx's __init__ to fall in
line with the other file contexts.
Calling code and tests have been updated accordingly.
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Thu, 15 Aug 2013 16:49:27 -0500 |
| parents | 652e07debf10 |
| children | 51035af2c0bf |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Aug 15 15:23:36 2013 -0500 +++ b/mercurial/commands.py Thu Aug 15 16:49:27 2013 -0500 @@ -1681,17 +1681,17 @@ ml[id * linesperrev] += " r%i" % id mergedtext = "\n".join(ml) files.append(fn) - fctxs[fn] = context.memfilectx(fn, mergedtext) + fctxs[fn] = context.memfilectx(repo, fn, mergedtext) if overwritten_file: fn = "of" files.append(fn) - fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) + fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id) if new_file: fn = "nf%i" % id files.append(fn) - fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) + fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id) if len(ps) > 1: if not p2: p2 = repo[ps[1]]