equal
deleted
inserted
replaced
829 originalmode = gitmode[ctx.p1()[fname].flags()] |
829 originalmode = gitmode[ctx.p1()[fname].flags()] |
830 if filemode != originalmode: |
830 if filemode != originalmode: |
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: |
838 maketext(pchange, ctx, fname) |
843 maketext(pchange, ctx, fname) |
839 |
844 |
890 pchange.addnewmode(filemode) |
895 pchange.addnewmode(filemode) |
891 else: # Brand-new file |
896 else: # Brand-new file |
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) |
899 else: |
908 else: |
900 maketext(pchange, ctx, fname) |
909 maketext(pchange, ctx, fname) |