facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

absorb: fix test

Browse Source 
Upstream e0fc50267c46 removed makememctx() function and requires filectxfn to
be an instance of patch.filestore.
This commit is contained in:
Stanislau Hlebik 2017-06-13 07:17:36 -07:00
parent 6ba65159c6
commit 300bc72abd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hgext3rd/absorb/__init__.py
View File

@ -191,7 +191,7 @@ def getfilestack(stack, path, seenfctxs=set()):
# remove uniq and find a different way to identify fctxs.
return uniq(fctxs), fctxmap
class overlaystore(object):
class overlaystore(patch.filestore):
"""read-only, hybrid store based on a dict and ctx.
memworkingcopy: {path: content}, overrides file contents.
"""
@ -226,8 +226,10 @@ def overlaycontext(memworkingcopy, ctx, parents=None, extra=None):
user = ctx.user()
files = set(ctx.files()).union(memworkingcopy.iterkeys())
store = overlaystore(ctx, memworkingcopy)
return context.makememctx(ctx.repo(), parents, desc, user, date, None,
files, store, extra=extra)
return context.memctx(
repo=ctx.repo(), parents=parents, text=desc,
files=files, filectxfn=store, user=user, date=date,
branch=None, extra=extra)
class filefixupstate(object):
"""state needed to apply fixups to a single file