This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7049

phabricator: add addremoved and addmodified functions
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc19b327017b9: phabricator: add addremoved and addmodified functions
Summary

These are relatively simple so add them together. As the name indicates, these
add phabchange objects for removed and modified files to the phabdiff.

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 17080.Oct 11 2019, 1:55 PM

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

indygreg accepted this revision.Oct 11 2019, 9:51 PM
This revision is now accepted and ready to land.Oct 11 2019, 9:51 PM
Kwan added a commit: rHGc19b327017b9: phabricator: add addremoved and addmodified functions.Oct 11 2019, 9:57 PM
Closed by commit rHGc19b327017b9: phabricator: add addremoved and addmodified functions (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (38 lines)

Diff 17097

hgext/phabricator.py

mimeguess, _enc = mimetypes.guess_type(encoding.unifromlocal(fctx.path())) mimeguess, _enc = mimetypes.guess_type(encoding.unifromlocal(fctx.path()))
if mimeguess: if mimeguess:
mimeguess = pycompat.bytestr(mimeguess) mimeguess = pycompat.bytestr(mimeguess)
pchange.metadata[b'new:file:mime-type'] = mimeguess pchange.metadata[b'new:file:mime-type'] = mimeguess
if mimeguess.startswith(b'image/'): if mimeguess.startswith(b'image/'):
pchange.fileType = DiffFileType.IMAGE pchange.fileType = DiffFileType.IMAGE
# Copied from mercurial/patch.py
gitmode = {b'l': b'120000', b'x': b'100755', b'': b'100644'}
def addremoved(pdiff, ctx, removed):
"""add removed files to the phabdiff. Shouldn't include moves"""
for fname in removed:
pchange = phabchange(
currentPath=fname, oldPath=fname, type=DiffChangeType.DELETE
)
pchange.addoldmode(gitmode[ctx.p1()[fname].flags()])
fctx = ctx.p1()[fname]
if not fctx.isbinary():
maketext(pchange, ctx, fname)
pdiff.addchange(pchange)
def addmodified(pdiff, ctx, modified):
"""add modified files to the phabdiff"""
for fname in modified:
fctx = ctx[fname]
pchange = phabchange(currentPath=fname, oldPath=fname)
filemode = gitmode[ctx[fname].flags()]
originalmode = gitmode[ctx.p1()[fname].flags()]
if filemode != originalmode:
pchange.addoldmode(originalmode)
pchange.addnewmode(filemode)
if fctx.isbinary():
makebinary(pchange, fctx)
addoldbinary(pchange, fctx, fname)
else:
maketext(pchange, ctx, fname)
pdiff.addchange(pchange)
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