This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6018

absorb: migrate to new method for getting copy info
ClosedPublic

Authored by martinvonz on Feb 23 2019, 12:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8843bc1fc14d: absorb: migrate to new method for getting copy info

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 23 2019, 12:16 PM
Closed by commit rHG8843bc1fc14d: absorb: migrate to new method for getting copy info (authored by martinvonz). · Explain WhyFeb 24 2019, 3:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (10 lines)

Diff 14221

hgext/absorb.py

pctx = ctx pctx = ctx
break break
fctx = ctx[path] fctx = ctx[path]
fctxs.append(fctx) fctxs.append(fctx)
if fctx in seenfctxs: # treat fctx as the immutable one if fctx in seenfctxs: # treat fctx as the immutable one
pctx = None # do not add another immutable fctx pctx = None # do not add another immutable fctx
break break
fctxmap[ctx] = fctx # only for mutable fctxs fctxmap[ctx] = fctx # only for mutable fctxs
renamed = fctx.renamed() copy = fctx.copysource()
if renamed: if copy:
path = renamed[0] # follow rename path = copy # follow rename
if path in ctx: # but do not follow copy if path in ctx: # but do not follow copy
pctx = ctx.p1() pctx = ctx.p1()
break break
if pctx is not None: # need an extra immutable fctx if pctx is not None: # need an extra immutable fctx
if path in pctx: if path in pctx:
fctxs.append(pctx[path]) fctxs.append(pctx[path])
else: else:
if path not in self.basectx: if path not in self.basectx:
return None, None, None return None, None, None
fctx = self.basectx[path] fctx = self.basectx[path]
if path in self.memworkingcopy: if path in self.memworkingcopy:
content = self.memworkingcopy[path] content = self.memworkingcopy[path]
else: else:
content = fctx.data() content = fctx.data()
mode = (fctx.islink(), fctx.isexec()) mode = (fctx.islink(), fctx.isexec())
renamed = fctx.renamed() # False or (path, node) copy = fctx.copysource()
return content, mode, (renamed and renamed[0]) return content, mode, copy
def overlaycontext(memworkingcopy, ctx, parents=None, extra=None): def overlaycontext(memworkingcopy, ctx, parents=None, extra=None):
"""({path: content}, ctx, (p1node, p2node)?, {}?) -> memctx """({path: content}, ctx, (p1node, p2node)?, {}?) -> memctx
memworkingcopy overrides file contents. memworkingcopy overrides file contents.
""" """
# parents must contain 2 items: (node1, node2) # parents must contain 2 items: (node1, node2)
if parents is None: if parents is None:
parents = ctx.repo().changelog.parents(ctx.node()) parents = ctx.repo().changelog.parents(ctx.node())