This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1684

hgext3rd: make compatible with core change 8a0cac20a1ad
ClosedPublic

Authored by ikostia on Dec 14 2017, 1:36 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX8531cbf59d5f: hgext3rd: make compatible with core change 8a0cac20a1ad
Summary

Core change 8a0cac20a1ad made ctx argument required, so let's adhere.

Test Plan
  • rt

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Test Errors

Event Timeline

ikostia created this revision.Dec 14 2017, 1:36 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 14 2017, 1:36 PM
quark accepted this revision.Dec 14 2017, 1:43 PM
This revision is now accepted and ready to land.Dec 14 2017, 1:43 PM
Closed by commit rFBHGX8531cbf59d5f: hgext3rd: make compatible with core change 8a0cac20a1ad (authored by ikostia). · Explain WhyDec 15 2017, 2:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbamend/common.py (2 lines)
Mhgext3rd/pushrebase.py (2 lines)

Diff 4430

hgext3rd/fbamend/common.py

files = [f for f in files if not samefile(f)] files = [f for f in files if not samefile(f)]
# commit version of these files as defined by head # commit version of these files as defined by head
headmf = head.manifest() headmf = head.manifest()
def filectxfn(repo, ctx, path): def filectxfn(repo, ctx, path):
if path in headmf: if path in headmf:
fctx = head[path] fctx = head[path]
flags = fctx.flags() flags = fctx.flags()
mctx = context.memfilectx(repo, fctx.path(), fctx.data(), mctx = context.memfilectx(repo, ctx, fctx.path(), fctx.data(),
islink='l' in flags, islink='l' in flags,
isexec='x' in flags, isexec='x' in flags,
copied=copied.get(path)) copied=copied.get(path))
return mctx return mctx
return None return None
message = cmdutil.logmessage(repo.ui, commitopts) message = cmdutil.logmessage(repo.ui, commitopts)
if not message: if not message:

hgext3rd/pushrebase.py

if path in m: if path in m:
# We can't use the normal rev[path] accessor here since it will try # We can't use the normal rev[path] accessor here since it will try
# to go through the flat manifest, which may not exist. # to go through the flat manifest, which may not exist.
fctx = _getfilectx(rev, m, path) fctx = _getfilectx(rev, m, path)
flags = m.flags(path) flags = m.flags(path)
copied = fctx.renamed() copied = fctx.renamed()
if copied: if copied:
copied = copied[0] copied = copied[0]
return context.memfilectx(repo, fctx.path(), fctx.data(), return context.memfilectx(repo, memctx, fctx.path(), fctx.data(),
islink='l' in flags, islink='l' in flags,
isexec='x' in flags, isexec='x' in flags,
copied=copied) copied=copied)
else: else:
return None return None
# If the incoming commit has no parents, but requested a rebase, # If the incoming commit has no parents, but requested a rebase,