From 2909941bb0a497b98127cf8816626254ab288536 Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Fri, 25 Jul 2014 19:36:01 -0500 Subject: [PATCH] memctx: create a filectxfn if it is not callable This will allow future patches to construct a memctx based on another context or any other store-type object. --- mercurial/context.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mercurial/context.py b/mercurial/context.py index 4767736388..720a6c2ccf 100644 --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1596,6 +1596,20 @@ class memctx(committablectx): self._filectxfn = filectxfn self.substate = {} + # if store is not callable, wrap it in a function + if not callable(filectxfn): + def getfilectx(repo, memctx, path): + fctx = filectxfn[path] + # this is weird but apparently we only keep track of one parent + # (why not only store that instead of a tuple?) + copied = fctx.renamed() + if copied: + copied = copied[0] + return memfilectx(repo, path, fctx.data(), + islink=fctx.islink(), isexec=fctx.isexec(), + copied=copied, memctx=memctx) + self._filectxfn = getfilectx + self._extra = extra and extra.copy() or {} if self._extra.get('branch', '') == '': self._extra['branch'] = 'default'