author | Matt Harbison <matt_harbison@yahoo.com> |
Sat, 16 Dec 2017 11:32:10 -0500 | |
changeset 35450 | 991e4404e910 |
parent 32958 | 75be14993fda |
child 35987 | a36d3c8a0e41 |
permissions | -rw-r--r-- |
12151
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
1 |
$ hg init a |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
2 |
$ cd a |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
12151
diff
changeset
|
3 |
$ cp "$TESTDIR/binfile.bin" . |
12151
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
4 |
$ hg add binfile.bin |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
5 |
$ hg ci -m 'add binfile.bin' |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
6 |
|
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
7 |
$ echo >> binfile.bin |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
8 |
$ hg ci -m 'change binfile.bin' |
4104
0934fef871f3
add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 |
|
12151
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
10 |
$ hg revert -r 0 binfile.bin |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
11 |
$ hg ci -m 'revert binfile.bin' |
23924
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
12 |
$ hg cp binfile.bin nonbinfile |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
13 |
$ echo text > nonbinfile |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
14 |
$ hg ci -m 'make non-binary copy of binary file' |
4104
0934fef871f3
add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
15 |
|
12151
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
16 |
$ hg diff --nodates -r 0 -r 1 |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
17 |
diff -r 48b371597640 -r acea2ab458c8 binfile.bin |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
18 |
Binary file binfile.bin has changed |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
19 |
|
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
20 |
$ hg diff --nodates -r 0 -r 2 |
4104
0934fef871f3
add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
21 |
|
12151
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
22 |
$ hg diff --git -r 0 -r 1 |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
23 |
diff --git a/binfile.bin b/binfile.bin |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
24 |
index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356 |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
25 |
GIT binary patch |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
26 |
literal 594 |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
27 |
zc$@)J0<HatP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
28 |
z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
29 |
zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
30 |
z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
31 |
zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
32 |
ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<; |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
33 |
zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
34 |
z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W- |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
35 |
zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U; |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
36 |
z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
37 |
zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#= |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
38 |
gQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf3JwksH2?qr |
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
39 |
|
4104
0934fef871f3
add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
40 |
|
12151
cc5b71840148
tests: unify test-diff-binary-file
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
41 |
$ hg diff --git -r 0 -r 2 |
4104
0934fef871f3
add test for diffing identical binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
42 |
|
21790
3fbef7ac26f0
diff: add nobinary config to suppress git-style binary diffs
Stephen Lee <sphen.lee@gmail.com>
parents:
16913
diff
changeset
|
43 |
$ hg diff --config diff.nobinary=True --git -r 0 -r 1 |
3fbef7ac26f0
diff: add nobinary config to suppress git-style binary diffs
Stephen Lee <sphen.lee@gmail.com>
parents:
16913
diff
changeset
|
44 |
diff --git a/binfile.bin b/binfile.bin |
3fbef7ac26f0
diff: add nobinary config to suppress git-style binary diffs
Stephen Lee <sphen.lee@gmail.com>
parents:
16913
diff
changeset
|
45 |
Binary file binfile.bin has changed |
3fbef7ac26f0
diff: add nobinary config to suppress git-style binary diffs
Stephen Lee <sphen.lee@gmail.com>
parents:
16913
diff
changeset
|
46 |
|
27401
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
47 |
$ HGPLAIN=1 hg diff --config diff.nobinary=True --git -r 0 -r 1 |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
48 |
diff --git a/binfile.bin b/binfile.bin |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
49 |
index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..58dc31a9e2f40f74ff3b45903f7d620b8e5b7356 |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
50 |
GIT binary patch |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
51 |
literal 594 |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
52 |
zc$@)J0<HatP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00009a7bBm000XU |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
53 |
z000XU0RWnu7ytkO2XskIMF-Uh9TW;VpMjwv0005-Nkl<ZD9@FWPs=e;7{<>W$NUkd |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
54 |
zX$nnYLt$-$V!?uy+1V%`z&Eh=ah|duER<4|QWhju3gb^nF*8iYobxWG-qqXl=2~5M |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
55 |
z*IoDB)sG^CfNuoBmqLTVU^<;@nwHP!1wrWd`{(mHo6VNXWtyh{alzqmsH*yYzpvLT |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
56 |
zLdY<T=ks|woh-`&01!ej#(xbV1f|pI*=%;d-%F*E*X#ZH`4I%6SS+$EJDE&ct=8po |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
57 |
ziN#{?_j|kD%Cd|oiqds`xm@;oJ-^?NG3Gdqrs?5u*zI;{nogxsx~^|Fn^Y?Gdc6<; |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
58 |
zfMJ+iF1J`LMx&A2?dEwNW8ClebzPTbIh{@$hS6*`kH@1d%Lo7fA#}N1)oN7`gm$~V |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
59 |
z+wDx#)OFqMcE{s!JN0-xhG8ItAjVkJwEcb`3WWlJfU2r?;Pd%dmR+q@mSri5q9_W- |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
60 |
zaR2~ECX?B2w+zELozC0s*6Z~|QG^f{3I#<`?)Q7U-JZ|q5W;9Q8i_=pBuSzunx=U; |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
61 |
z9C)5jBoYw9^?EHyQl(M}1OlQcCX>lXB*ODN003Z&P17_@)3Pi=i0wb04<W?v-u}7K |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
62 |
zXmmQA+wDgE!qR9o8jr`%=ab_&uh(l?R=r;Tjiqon91I2-hIu?57~@*4h7h9uORK#= |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
63 |
gQItJW-{SoTm)8|5##k|m00000NkvXXu0mjf3JwksH2?qr |
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
64 |
|
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
65 |
|
186f2afe9919
patch: disable nobinary when HGPLAIN=1
Mateusz Kwapich <mitrandir@fb.com>
parents:
23924
diff
changeset
|
66 |
|
23924
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
67 |
$ hg diff --git -r 2 -r 3 |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
68 |
diff --git a/binfile.bin b/nonbinfile |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
69 |
copy from binfile.bin |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
70 |
copy to nonbinfile |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
71 |
index 37ba3d1c6f17137d9c5f5776fa040caf5fe73ff9..8e27be7d6154a1f68ea9160ef0e18691d20560dc |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
72 |
GIT binary patch |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
73 |
literal 5 |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
74 |
Mc$_OqttjCF00uV!&;S4c |
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
75 |
|
31821
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
76 |
$ cd .. |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
77 |
|
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
78 |
Test text mode with extended git-style diff format |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
79 |
$ hg init b |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
80 |
$ cd b |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
81 |
$ cat > writebin.py <<EOF |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
82 |
> import sys |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
83 |
> path = sys.argv[1] |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
84 |
> open(path, 'wb').write('\x00\x01\x02\x03') |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
85 |
> EOF |
32958
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
31822
diff
changeset
|
86 |
$ $PYTHON writebin.py binfile.bin |
31821
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
87 |
$ hg add binfile.bin |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
88 |
$ hg ci -m 'add binfile.bin' |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
89 |
|
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
90 |
$ echo >> binfile.bin |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
91 |
$ hg ci -m 'change binfile.bin' |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
92 |
|
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
93 |
$ hg diff --git -a -r 0 -r 1 |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
94 |
diff --git a/binfile.bin b/binfile.bin |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
95 |
--- a/binfile.bin |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
96 |
+++ b/binfile.bin |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
97 |
@@ -1,1 +1,1 @@ |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
98 |
-\x00\x01\x02\x03 (esc) |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
99 |
\ No newline at end of file |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
100 |
+\x00\x01\x02\x03 (esc) |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
101 |
|
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
102 |
$ HGPLAIN=1 hg diff --git -a -r 0 -r 1 |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
103 |
diff --git a/binfile.bin b/binfile.bin |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
104 |
--- a/binfile.bin |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
105 |
+++ b/binfile.bin |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
106 |
@@ -1,1 +1,1 @@ |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
107 |
-\x00\x01\x02\x03 (esc) |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
108 |
\ No newline at end of file |
66a9faadbc83
patch: make diff in git mode respect --text option (issue5510)
Alexander Fomin <afomin@fb.com>
parents:
27401
diff
changeset
|
109 |
+\x00\x01\x02\x03 (esc) |
23924
0db6810e84e8
diff: use binary diff when copy source is binary
Martin von Zweigbergk <martinvonz@google.com>
parents:
21790
diff
changeset
|
110 |
|
31822
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
111 |
Test binary mode with extended git-style diff format |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
112 |
$ hg diff --no-binary -r 0 -r 1 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
113 |
diff -r fb45f71337ad -r 9ca112d1a3c1 binfile.bin |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
114 |
Binary file binfile.bin has changed |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
115 |
|
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
116 |
$ hg diff --git --no-binary -r 0 -r 1 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
117 |
diff --git a/binfile.bin b/binfile.bin |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
118 |
Binary file binfile.bin has changed |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
119 |
|
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
120 |
$ hg diff --git --binary -r 0 -r 1 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
121 |
diff --git a/binfile.bin b/binfile.bin |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
122 |
index eaf36c1daccfdf325514461cd1a2ffbc139b5464..ba71a782e93f3fb63a428383706065e3ec2828e9 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
123 |
GIT binary patch |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
124 |
literal 5 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
125 |
Mc${NkWMbw50018V5dZ)H |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
126 |
|
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
127 |
$ hg diff --git --binary --config diff.nobinary=True -r 0 -r 1 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
128 |
diff --git a/binfile.bin b/binfile.bin |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
129 |
index eaf36c1daccfdf325514461cd1a2ffbc139b5464..ba71a782e93f3fb63a428383706065e3ec2828e9 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
130 |
GIT binary patch |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
131 |
literal 5 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
132 |
Mc${NkWMbw50018V5dZ)H |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
133 |
|
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
134 |
|
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
135 |
$ hg diff --git --binary --text -r 0 -r 1 |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
136 |
diff --git a/binfile.bin b/binfile.bin |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
137 |
--- a/binfile.bin |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
138 |
+++ b/binfile.bin |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
139 |
@@ -1,1 +1,1 @@ |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
140 |
-\x00\x01\x02\x03 (esc) |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
141 |
\ No newline at end of file |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
142 |
+\x00\x01\x02\x03 (esc) |
fde4822b0102
diff: add --binary option for git mode diffs
Alexander Fomin <afomin@fb.com>
parents:
31821
diff
changeset
|
143 |
|
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
144 |
$ cd .. |