Show More
@@ -340,7 +340,7 b' class basectx(object):' | |||||
340 |
|
340 | |||
341 |
|
341 | |||
342 | def makememctx(repo, parents, text, user, date, branch, files, store, |
|
342 | def makememctx(repo, parents, text, user, date, branch, files, store, | |
343 | editor=None): |
|
343 | editor=None, extra=None): | |
344 | def getfilectx(repo, memctx, path): |
|
344 | def getfilectx(repo, memctx, path): | |
345 | data, mode, copied = store.getfile(path) |
|
345 | data, mode, copied = store.getfile(path) | |
346 | if data is None: |
|
346 | if data is None: | |
@@ -348,7 +348,8 b' def makememctx(repo, parents, text, user' | |||||
348 | islink, isexec = mode |
|
348 | islink, isexec = mode | |
349 | return memfilectx(repo, path, data, islink=islink, isexec=isexec, |
|
349 | return memfilectx(repo, path, data, islink=islink, isexec=isexec, | |
350 | copied=copied, memctx=memctx) |
|
350 | copied=copied, memctx=memctx) | |
351 |
extra |
|
351 | if extra is None: | |
|
352 | extra = {} | |||
352 | if branch: |
|
353 | if branch: | |
353 | extra['branch'] = encoding.fromlocal(branch) |
|
354 | extra['branch'] = encoding.fromlocal(branch) | |
354 | ctx = memctx(repo, parents, text, files, getfilectx, user, |
|
355 | ctx = memctx(repo, parents, text, files, getfilectx, user, |
General Comments 0
You need to be logged in to leave comments.
Login now