mercurial/cmdutil.py
changeset 35400 8a0cac20a1ad
parent 35350 82ee401135dd
child 35454 786289423e97
equal deleted inserted replaced
35399:dffc35a5be9f 35400:8a0cac20a1ad
  3193                     if path in wctx.removed():
  3193                     if path in wctx.removed():
  3194                         return None
  3194                         return None
  3195 
  3195 
  3196                     fctx = wctx[path]
  3196                     fctx = wctx[path]
  3197                     flags = fctx.flags()
  3197                     flags = fctx.flags()
  3198                     mctx = context.memfilectx(repo,
  3198                     mctx = context.memfilectx(repo, ctx_,
  3199                                               fctx.path(), fctx.data(),
  3199                                               fctx.path(), fctx.data(),
  3200                                               islink='l' in flags,
  3200                                               islink='l' in flags,
  3201                                               isexec='x' in flags,
  3201                                               isexec='x' in flags,
  3202                                               copied=copied.get(path))
  3202                                               copied=copied.get(path))
  3203                     return mctx
  3203                     return mctx