phabricator: pass old `fctx` to `addoldbinary()` instead of inferring it
Currently, removed binaries aren't marked as binaries on the left side, which
sends the raw file view to a bad URL in the web interface. (See D8009) In order
to handle marking the file as binary in the removed case, both contexts need to
be provided by the caller, since there is no current fctx in the removed case.
Having an explicit old fctx will also be useful to support a `--no-stack` option
that rolls up the commit stack into a single review.
The bug isn't fixed with this change- there's a missing call to it in
`addremoved()` as well. But instead of spamming the list with a bunch of test
diffs, all of the missing binary issues will be fixed at once later.
Differential Revision: https://phab.mercurial-scm.org/D8218
--- a/hgext/phabricator.py Wed Mar 04 10:25:07 2020 -0500
+++ b/hgext/phabricator.py Wed Feb 19 13:33:58 2020 -0500
@@ -747,12 +747,14 @@
return fphid
-def addoldbinary(pchange, fctx):
+def addoldbinary(pchange, oldfctx, fctx):
"""add the metadata for the previous version of a binary file to the
phabchange for the new version
+
+ ``oldfctx`` is the previous version of the file; ``fctx`` is the new
+ version of the file, or None if the file is being removed.
"""
- oldfctx = fctx.p1()
- if fctx.cmp(oldfctx):
+ if not fctx or fctx.cmp(oldfctx):
# Files differ, add the old one
pchange.metadata[b'old:file:size'] = oldfctx.size()
mimeguess, _enc = mimetypes.guess_type(
@@ -832,7 +834,7 @@
if fctx.isbinary() or notutf8(fctx):
makebinary(pchange, fctx)
- addoldbinary(pchange, fctx)
+ addoldbinary(pchange, fctx.p1(), fctx)
else:
maketext(pchange, ctx, fname)
@@ -892,7 +894,7 @@
if fctx.isbinary() or notutf8(fctx):
makebinary(pchange, fctx)
if renamed:
- addoldbinary(pchange, fctx)
+ addoldbinary(pchange, fctx.p1(), fctx)
else:
maketext(pchange, ctx, fname)