This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8221

phabricator: also check parent fctx for binary where it is checked for UTF-8
ClosedPublic

Authored by mharbison72 on Mar 4 2020, 11:56 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4ce2330f2d0b: phabricator: also check parent fctx for binary where it is checked for UTF-8
Summary

I don't know that this is necessary, but it seems obvious from the code checking
both the current and parent file for UTF-8 content that this was the intent.

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

mharbison72 created this revision.Mar 4 2020, 11:56 AM
mharbison72 added a commit: rHG4ce2330f2d0b: phabricator: also check parent fctx for binary where it is checked for UTF-8.Mar 4 2020, 2:07 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4ce2330f2d0b: phabricator: also check parent fctx for binary where it is checked for UTF-8 (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (13 lines)

Diff 20483

hgext/phabricator.py

oldfctx = fctx.p1() oldfctx = fctx.p1()
pchange = phabchange(currentPath=fname, oldPath=fname) pchange = phabchange(currentPath=fname, oldPath=fname)
filemode = gitmode[ctx[fname].flags()] filemode = gitmode[ctx[fname].flags()]
originalmode = gitmode[ctx.p1()[fname].flags()] originalmode = gitmode[ctx.p1()[fname].flags()]
if filemode != originalmode: if filemode != originalmode:
pchange.addoldmode(originalmode) pchange.addoldmode(originalmode)
pchange.addnewmode(filemode) pchange.addnewmode(filemode)
if fctx.isbinary() or notutf8(fctx) or notutf8(oldfctx): if (
fctx.isbinary()
or notutf8(fctx)
or oldfctx.isbinary()
or notutf8(oldfctx)
):
makebinary(pchange, fctx) makebinary(pchange, fctx)
addoldbinary(pchange, fctx.p1(), fctx) addoldbinary(pchange, fctx.p1(), fctx)
else: else:
maketext(pchange, ctx, fname) maketext(pchange, ctx, fname)
pdiff.addchange(pchange) pdiff.addchange(pchange)
if filemode != originalmode: if filemode != originalmode:
pchange.addoldmode(originalmode) pchange.addoldmode(originalmode)
pchange.addnewmode(filemode) pchange.addnewmode(filemode)
else: # Brand-new file else: # Brand-new file
pchange.addnewmode(gitmode[fctx.flags()]) pchange.addnewmode(gitmode[fctx.flags()])
pchange.type = DiffChangeType.ADD pchange.type = DiffChangeType.ADD
if fctx.isbinary() or notutf8(fctx) or (oldfctx and notutf8(oldfctx)): if (
fctx.isbinary()
or notutf8(fctx)
or (oldfctx and (oldfctx.isbinary() or notutf8(oldfctx)))
):
makebinary(pchange, fctx) makebinary(pchange, fctx)
if renamed: if renamed:
addoldbinary(pchange, oldfctx, fctx) addoldbinary(pchange, oldfctx, fctx)
else: else:
maketext(pchange, ctx, fname) maketext(pchange, ctx, fname)
pdiff.addchange(pchange) pdiff.addchange(pchange)