This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8305

phabricator: eliminate a couple of duplicate filectx lookups
ClosedPublic

Authored by mharbison72 on Mar 20 2020, 5:23 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7b9aaec17126: phabricator: eliminate a couple of duplicate filectx lookups

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (12 lines)

Diff 20845

hgext/phabricator.py

def addremoved(pdiff, ctx, removed): def addremoved(pdiff, ctx, removed):
"""add removed files to the phabdiff. Shouldn't include moves""" """add removed files to the phabdiff. Shouldn't include moves"""
for fname in removed: for fname in removed:
pchange = phabchange( pchange = phabchange(
currentPath=fname, oldPath=fname, type=DiffChangeType.DELETE currentPath=fname, oldPath=fname, type=DiffChangeType.DELETE
) )
pchange.addoldmode(gitmode[ctx.p1()[fname].flags()])
oldfctx = ctx.p1()[fname] oldfctx = ctx.p1()[fname]
pchange.addoldmode(gitmode[oldfctx.flags()])
if not (oldfctx.isbinary() or notutf8(oldfctx)): if not (oldfctx.isbinary() or notutf8(oldfctx)):
maketext(pchange, ctx, fname) maketext(pchange, ctx, fname)
pdiff.addchange(pchange) pdiff.addchange(pchange)
def addmodified(pdiff, ctx, modified): def addmodified(pdiff, ctx, modified):
"""add modified files to the phabdiff""" """add modified files to the phabdiff"""
for fname in modified: for fname in modified:
fctx = ctx[fname] fctx = ctx[fname]
oldfctx = fctx.p1() oldfctx = ctx.p1()[fname]
pchange = phabchange(currentPath=fname, oldPath=fname) pchange = phabchange(currentPath=fname, oldPath=fname)
filemode = gitmode[ctx[fname].flags()] filemode = gitmode[fctx.flags()]
originalmode = gitmode[ctx.p1()[fname].flags()] originalmode = gitmode[oldfctx.flags()]
if filemode != originalmode: if filemode != originalmode:
pchange.addoldmode(originalmode) pchange.addoldmode(originalmode)
pchange.addnewmode(filemode) pchange.addnewmode(filemode)
if ( if (
fctx.isbinary() fctx.isbinary()
or notutf8(fctx) or notutf8(fctx)
or oldfctx.isbinary() or oldfctx.isbinary()
or notutf8(oldfctx) or notutf8(oldfctx)
): ):
makebinary(pchange, fctx) makebinary(pchange, fctx)
addoldbinary(pchange, fctx.p1(), fctx) addoldbinary(pchange, oldfctx, fctx)
else: else:
maketext(pchange, ctx, fname) maketext(pchange, ctx, fname)
pdiff.addchange(pchange) pdiff.addchange(pchange)
def addadded(pdiff, ctx, added, removed): def addadded(pdiff, ctx, added, removed):
"""add file adds to the phabdiff, both new files and copies/moves""" """add file adds to the phabdiff, both new files and copies/moves"""
# Keep track of files that've been recorded as moved/copied, so if there are # Keep track of files that've been recorded as moved/copied, so if there are
# additional copies we can mark them (moves get removed from removed) # additional copies we can mark them (moves get removed from removed)
copiedchanges = {} copiedchanges = {}
movedchanges = {} movedchanges = {}
for fname in added: for fname in added:
fctx = ctx[fname] fctx = ctx[fname]
oldfctx = None oldfctx = None
pchange = phabchange(currentPath=fname) pchange = phabchange(currentPath=fname)
filemode = gitmode[ctx[fname].flags()] filemode = gitmode[fctx.flags()]
renamed = fctx.renamed() renamed = fctx.renamed()
if renamed: if renamed:
originalfname = renamed[0] originalfname = renamed[0]
oldfctx = ctx.p1()[originalfname] oldfctx = ctx.p1()[originalfname]
originalmode = gitmode[oldfctx.flags()] originalmode = gitmode[oldfctx.flags()]
pchange.oldPath = originalfname pchange.oldPath = originalfname