This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7050

phabricator: add addadded function
ClosedPublic

Authored by Kwan on Oct 10 2019, 5:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd5d1edf66091: phabricator: add addadded function
rHG1bc599b69354: phabricator: add addadded function
Summary

This is the most complicated part of the new code, and is responsible for
adding all added files, whether brand new, copied, or moved. This also
includes creating the phabchanges for the original files that have been moved
or copied from, since they might need their awayPaths and type updating if
multiple copies are involved.

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

Kwan created this revision.Oct 10 2019, 5:52 PM
Kwan updated this revision to Diff 17081.Oct 11 2019, 1:55 PM

Fix some test-check-code issues, and one test-check-pyflakes unused local.

Kwan added a commit: rHG1bc599b69354: phabricator: add addadded function.Oct 16 2019, 4:51 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1bc599b69354: phabricator: add addadded function (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (65 lines)

Diff 17254

hgext/phabricator.py

makebinary(pchange, fctx) makebinary(pchange, fctx)
addoldbinary(pchange, fctx, fname) addoldbinary(pchange, fctx, fname)
else: else:
maketext(pchange, ctx, fname) maketext(pchange, ctx, fname)
pdiff.addchange(pchange) pdiff.addchange(pchange)
def addadded(pdiff, ctx, added, removed):
"""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
# additional copies we can mark them (moves get removed from removed)
copiedchanges = {}
movedchanges = {}
for fname in added:
fctx = ctx[fname]
pchange = phabchange(currentPath=fname)
filemode = gitmode[ctx[fname].flags()]
renamed = fctx.renamed()
if renamed:
originalfname = renamed[0]
originalmode = gitmode[ctx.p1()[originalfname].flags()]
pchange.oldPath = originalfname
if originalfname in removed:
origpchange = phabchange(
currentPath=originalfname,
oldPath=originalfname,
type=DiffChangeType.MOVE_AWAY,
awayPaths=[fname],
)
movedchanges[originalfname] = origpchange
removed.remove(originalfname)
pchange.type = DiffChangeType.MOVE_HERE
elif originalfname in movedchanges:
movedchanges[originalfname].type = DiffChangeType.MULTICOPY
movedchanges[originalfname].awayPaths.append(fname)
pchange.type = DiffChangeType.COPY_HERE
else: # pure copy
if originalfname not in copiedchanges:
origpchange = phabchange(
currentPath=originalfname, type=DiffChangeType.COPY_AWAY
)
copiedchanges[originalfname] = origpchange
else:
origpchange = copiedchanges[originalfname]
origpchange.awayPaths.append(fname)
pchange.type = DiffChangeType.COPY_HERE
if filemode != originalmode:
pchange.addoldmode(originalmode)
pchange.addnewmode(filemode)
else: # Brand-new file
pchange.addnewmode(gitmode[fctx.flags()])
pchange.type = DiffChangeType.ADD
if fctx.isbinary():
makebinary(pchange, fctx)
if renamed:
addoldbinary(pchange, fctx, originalfname)
else:
maketext(pchange, ctx, fname)
pdiff.addchange(pchange)
for _path, copiedchange in copiedchanges.items():
pdiff.addchange(copiedchange)
for _path, movedchange in movedchanges.items():
pdiff.addchange(movedchange)
def creatediff(ctx): def creatediff(ctx):
"""create a Differential Diff""" """create a Differential Diff"""
repo = ctx.repo() repo = ctx.repo()
repophid = getrepophid(repo) repophid = getrepophid(repo)
# Create a "Differential Diff" via "differential.createrawdiff" API # Create a "Differential Diff" via "differential.createrawdiff" API
params = {b'diff': getdiff(ctx, mdiff.diffopts(git=True, context=32767))} params = {b'diff': getdiff(ctx, mdiff.diffopts(git=True, context=32767))}
if repophid: if repophid:
params[b'repositoryPHID'] = repophid params[b'repositoryPHID'] = repophid