##// END OF EJS Templates
patch: disable nobinary when HGPLAIN=1...
Mateusz Kwapich -
r27401:186f2afe default
parent child Browse files
Show More
@@ -2146,7 +2146,7 b' def difffeatureopts(ui, opts=None, untru'
2146 2146 'ignoreblanklines')
2147 2147 if formatchanging:
2148 2148 buildopts['text'] = opts and opts.get('text')
2149 buildopts['nobinary'] = get('nobinary')
2149 buildopts['nobinary'] = get('nobinary', forceplain=False)
2150 2150 buildopts['noprefix'] = get('noprefix', forceplain=False)
2151 2151
2152 2152 return mdiff.diffopts(**buildopts)
@@ -44,6 +44,26 b''
44 44 diff --git a/binfile.bin b/binfile.bin
45 45 Binary file binfile.bin has changed
46 46
47 $ HGPLAIN=1 hg diff --config diff.nobinary=True --git -r 0 -r 1
48 diff --git a/binfile.bin b/binfile.bin
49 index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356
50 GIT binary patch
51 literal 594
52 zc$@)J0<HatP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU
53 z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd
54 zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M
55 z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT
56 zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po
57 ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<;
58 zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V
59 z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W-
60 zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U;
61 z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K
62 zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#=
63 gQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf3JwksH2?qr
64
65
66
47 67 $ hg diff --git -r 2 -r 3
48 68 diff --git a/binfile.bin b/nonbinfile
49 69 copy from binfile.bin
General Comments 0
You need to be logged in to leave comments. Login now