##// END OF EJS Templates
phabricator: also check parent fctx for binary where it is checked for UTF-8...
Matt Harbison -
r44914:4ce2330f default
parent child Browse files
Show More
@@ -831,7 +831,12 b' def addmodified(pdiff, ctx, modified):'
831 pchange.addoldmode(originalmode)
831 pchange.addoldmode(originalmode)
832 pchange.addnewmode(filemode)
832 pchange.addnewmode(filemode)
833
833
834 if fctx.isbinary() or notutf8(fctx) or notutf8(oldfctx):
834 if (
835 fctx.isbinary()
836 or notutf8(fctx)
837 or oldfctx.isbinary()
838 or notutf8(oldfctx)
839 ):
835 makebinary(pchange, fctx)
840 makebinary(pchange, fctx)
836 addoldbinary(pchange, fctx.p1(), fctx)
841 addoldbinary(pchange, fctx.p1(), fctx)
837 else:
842 else:
@@ -892,7 +897,11 b' def addadded(pdiff, ctx, added, removed)'
892 pchange.addnewmode(gitmode[fctx.flags()])
897 pchange.addnewmode(gitmode[fctx.flags()])
893 pchange.type = DiffChangeType.ADD
898 pchange.type = DiffChangeType.ADD
894
899
895 if fctx.isbinary() or notutf8(fctx) or (oldfctx and notutf8(oldfctx)):
900 if (
901 fctx.isbinary()
902 or notutf8(fctx)
903 or (oldfctx and (oldfctx.isbinary() or notutf8(oldfctx)))
904 ):
896 makebinary(pchange, fctx)
905 makebinary(pchange, fctx)
897 if renamed:
906 if renamed:
898 addoldbinary(pchange, oldfctx, fctx)
907 addoldbinary(pchange, oldfctx, fctx)
General Comments 0
You need to be logged in to leave comments. Login now