Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-diff-ignore-whitespace.out @ 4878:372d93f03d3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: correctly handle combinations of whitespace options
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jul 2007 12:44:47 -0500
parents bdf9d809467c
children
comparison
equal deleted inserted replaced
4877:242026115e6a 4878:372d93f03d3a
1 adding foo 1 adding foo
2 >>> two diffs showing three added lines <<< 2 >>> two diffs showing three added lines <<<
3 diff -r 540c40a65b78 foo 3 hg diff
4 --- a/foo 4 diff -r 540c40a65b78 foo
5 +++ b/foo 5 --- a/foo
6 @@ -1,2 +1,5 @@ hello world 6 +++ b/foo
7 + 7 @@ -1,2 +1,5 @@ hello world
8 hello world 8 +
9 + 9 hello world
10 goodbye world 10 +
11 + 11 goodbye world
12 +
13 hg diff -b
12 diff -r 540c40a65b78 foo 14 diff -r 540c40a65b78 foo
13 --- a/foo 15 --- a/foo
14 +++ b/foo 16 +++ b/foo
15 @@ -1,2 +1,5 @@ hello world 17 @@ -1,2 +1,5 @@ hello world
16 + 18 +
17 hello world 19 hello world
18 + 20 +
19 goodbye world 21 goodbye world
20 + 22 +
21 >>> no diffs <<< 23 >>> no diffs <<<
24 hg diff -B
25 hg diff -Bb
22 >>> four diffs showing added space first on the first line <<< 26 >>> four diffs showing added space first on the first line <<<
23 diff -r 540c40a65b78 foo 27 hg diff
24 --- a/foo 28 diff -r 540c40a65b78 foo
25 +++ b/foo 29 --- a/foo
26 @@ -1,2 +1,2 @@ hello world 30 +++ b/foo
27 -hello world 31 @@ -1,2 +1,2 @@ hello world
28 + hello world 32 -hello world
29 goodbye world 33 + hello world
30 diff -r 540c40a65b78 foo 34 goodbye world
31 --- a/foo 35 hg diff -b
32 +++ b/foo 36 diff -r 540c40a65b78 foo
33 @@ -1,2 +1,2 @@ hello world 37 --- a/foo
34 -hello world 38 +++ b/foo
35 + hello world 39 @@ -1,2 +1,2 @@ hello world
36 goodbye world 40 -hello world
37 diff -r 540c40a65b78 foo 41 + hello world
38 --- a/foo 42 goodbye world
39 +++ b/foo 43 hg diff -B
40 @@ -1,2 +1,2 @@ hello world 44 diff -r 540c40a65b78 foo
41 -hello world 45 --- a/foo
42 + hello world 46 +++ b/foo
43 goodbye world 47 @@ -1,2 +1,2 @@ hello world
48 -hello world
49 + hello world
50 goodbye world
51 hg diff -Bb
44 diff -r 540c40a65b78 foo 52 diff -r 540c40a65b78 foo
45 --- a/foo 53 --- a/foo
46 +++ b/foo 54 +++ b/foo
47 @@ -1,2 +1,2 @@ hello world 55 @@ -1,2 +1,2 @@ hello world
48 -hello world 56 -hello world
49 + hello world 57 + hello world
50 goodbye world 58 goodbye world
51 >>> two diffs showing space appended to the first line <<< 59 >>> two diffs showing space appended to the first line <<<
60 hg diff
52 diff -r 540c40a65b78 foo 61 diff -r 540c40a65b78 foo
53 --- a/foo 62 --- a/foo
54 +++ b/foo 63 +++ b/foo
55 @@ -1,2 +1,2 @@ hello world 64 @@ -1,2 +1,2 @@ hello world
56 -hello world 65 -hello world
57 +hello world 66 +hello world
58 goodbye world 67 goodbye world
68 hg diff -B
59 diff -r 540c40a65b78 foo 69 diff -r 540c40a65b78 foo
60 --- a/foo 70 --- a/foo
61 +++ b/foo 71 +++ b/foo
62 @@ -1,2 +1,2 @@ hello world 72 @@ -1,2 +1,2 @@ hello world
63 -hello world 73 -hello world
64 +hello world 74 +hello world
65 goodbye world 75 goodbye world
66 >>> no diffs <<< 76 >>> no diffs <<<
77 hg diff -b
78 hg diff -Bb
67 >>> four diffs showing space inserted into "goodbye" <<< 79 >>> four diffs showing space inserted into "goodbye" <<<
68 diff -r 540c40a65b78 foo 80 hg diff
69 --- a/foo 81 diff -r 540c40a65b78 foo
70 +++ b/foo 82 --- a/foo
71 @@ -1,2 +1,2 @@ hello world 83 +++ b/foo
72 hello world 84 @@ -1,2 +1,2 @@ hello world
73 -goodbye world 85 hello world
74 +good bye world 86 -goodbye world
75 diff -r 540c40a65b78 foo 87 +good bye world
76 --- a/foo 88 hg diff -B
77 +++ b/foo 89 diff -r 540c40a65b78 foo
78 @@ -1,2 +1,2 @@ hello world 90 --- a/foo
79 hello world 91 +++ b/foo
80 -goodbye world 92 @@ -1,2 +1,2 @@ hello world
81 +good bye world 93 hello world
82 diff -r 540c40a65b78 foo 94 -goodbye world
83 --- a/foo 95 +good bye world
84 +++ b/foo 96 hg diff -b
85 @@ -1,2 +1,2 @@ hello world 97 diff -r 540c40a65b78 foo
86 hello world 98 --- a/foo
87 -goodbye world 99 +++ b/foo
88 +good bye world 100 @@ -1,2 +1,2 @@ hello world
101 hello world
102 -goodbye world
103 +good bye world
104 hg diff -Bb
89 diff -r 540c40a65b78 foo 105 diff -r 540c40a65b78 foo
90 --- a/foo 106 --- a/foo
91 +++ b/foo 107 +++ b/foo
92 @@ -1,2 +1,2 @@ hello world 108 @@ -1,2 +1,2 @@ hello world
93 hello world 109 hello world
94 -goodbye world 110 -goodbye world
95 +good bye world 111 +good bye world
96 >>> two diffs showing changed whitespace amount in the last line <<< 112 >>> two diffs showing changed whitespace amount in the last line <<<
113 hg diff
97 diff -r 540c40a65b78 foo 114 diff -r 540c40a65b78 foo
98 --- a/foo 115 --- a/foo
99 +++ b/foo 116 +++ b/foo
100 @@ -1,2 +1,2 @@ hello world 117 @@ -1,2 +1,2 @@ hello world
101 hello world 118 hello world
102 -goodbye world 119 -goodbye world
103 +goodbye world 120 +goodbye world
121 hg diff -B
104 diff -r 540c40a65b78 foo 122 diff -r 540c40a65b78 foo
105 --- a/foo 123 --- a/foo
106 +++ b/foo 124 +++ b/foo
107 @@ -1,2 +1,2 @@ hello world 125 @@ -1,2 +1,2 @@ hello world
108 hello world 126 hello world
109 -goodbye world 127 -goodbye world
110 +goodbye world 128 +goodbye world
111 >>> no diffs <<< 129 >>> no diffs <<<
130 hg diff -b
131 hg diff -Bb
112 >>> four diffs showing added blank line w/horizontal space <<< 132 >>> four diffs showing added blank line w/horizontal space <<<
113 diff -r 540c40a65b78 foo 133 hg diff
114 --- a/foo 134 diff -r 540c40a65b78 foo
115 +++ b/foo 135 --- a/foo
116 @@ -1,2 +1,3 @@ hello world 136 +++ b/foo
117 hello world 137 @@ -1,2 +1,3 @@ hello world
118 + 138 hello world
119 goodbye world 139 +
120 diff -r 540c40a65b78 foo 140 goodbye world
121 --- a/foo 141 hg diff -B
122 +++ b/foo 142 diff -r 540c40a65b78 foo
123 @@ -1,2 +1,3 @@ hello world 143 --- a/foo
124 hello world 144 +++ b/foo
125 + 145 @@ -1,2 +1,3 @@ hello world
126 goodbye world 146 hello world
127 diff -r 540c40a65b78 foo 147 +
128 --- a/foo 148 goodbye world
129 +++ b/foo 149 hg diff -b
130 @@ -1,2 +1,3 @@ hello world 150 diff -r 540c40a65b78 foo
131 hello world 151 --- a/foo
132 + 152 +++ b/foo
133 goodbye world 153 @@ -1,2 +1,3 @@ hello world
134 diff -r 540c40a65b78 foo 154 hello world
135 --- a/foo 155 +
136 +++ b/foo 156 goodbye world
137 @@ -1,2 +1,3 @@ hello world 157 hg diff -Bb
138 hello world 158 >>> three diffs showing added blank line w/other space <<<
139 + 159 hg diff
140 goodbye world 160 diff -r 540c40a65b78 foo
161 --- a/foo
162 +++ b/foo
163 @@ -1,2 +1,3 @@ hello world
164 -hello world
165 -goodbye world
166 +hello world
167 +
168 +goodbye world
169 hg diff -B
170 diff -r 540c40a65b78 foo
171 --- a/foo
172 +++ b/foo
173 @@ -1,2 +1,3 @@ hello world
174 -hello world
175 -goodbye world
176 +hello world
177 +
178 +goodbye world
179 hg diff -b
180 diff -r 540c40a65b78 foo
181 --- a/foo
182 +++ b/foo
183 @@ -1,2 +1,3 @@ hello world
184 -hello world
185 -goodbye world
186 +hello world
187 +
188 +goodbye world
189 hg diff -Bb
190 >>> four diffs showing changed whitespace <<<
191 hg diff
192 diff -r 540c40a65b78 foo
193 --- a/foo
194 +++ b/foo
195 @@ -1,2 +1,2 @@ hello world
196 -hello world
197 -goodbye world
198 +helloworld
199 +goodbye world
200 hg diff -B
201 diff -r 540c40a65b78 foo
202 --- a/foo
203 +++ b/foo
204 @@ -1,2 +1,2 @@ hello world
205 -hello world
206 -goodbye world
207 +helloworld
208 +goodbye world
209 hg diff -b
210 diff -r 540c40a65b78 foo
211 --- a/foo
212 +++ b/foo
213 @@ -1,2 +1,2 @@ hello world
214 -hello world
215 -goodbye world
216 +helloworld
217 +goodbye world
218 hg diff -Bb
219 diff -r 540c40a65b78 foo
220 --- a/foo
221 +++ b/foo
222 @@ -1,2 +1,2 @@ hello world
223 -hello world
224 -goodbye world
225 +helloworld
226 +goodbye world
227 hg diff -w
228 >>> five diffs showing changed whitespace <<<
229 hg diff
230 diff -r 540c40a65b78 foo
231 --- a/foo
232 +++ b/foo
233 @@ -1,2 +1,5 @@ hello world
234 -hello world
235 -goodbye world
236 +helloworld
237 +
238 +
239 +
240 +goodbye world
241 hg diff -B
242 diff -r 540c40a65b78 foo
243 --- a/foo
244 +++ b/foo
245 @@ -1,2 +1,5 @@ hello world
246 -hello world
247 -goodbye world
248 +helloworld
249 +
250 +
251 +
252 +goodbye world
253 hg diff -b
254 diff -r 540c40a65b78 foo
255 --- a/foo
256 +++ b/foo
257 @@ -1,2 +1,5 @@ hello world
258 -hello world
259 -goodbye world
260 +helloworld
261 +
262 +
263 +
264 +goodbye world
265 hg diff -Bb
266 diff -r 540c40a65b78 foo
267 --- a/foo
268 +++ b/foo
269 @@ -1,2 +1,5 @@ hello world
270 -hello world
271 -goodbye world
272 +helloworld
273 +
274 +
275 +
276 +goodbye world
277 hg diff -w
278 diff -r 540c40a65b78 foo
279 --- a/foo
280 +++ b/foo
281 @@ -1,2 +1,5 @@ hello world
282 -hello world
283 -goodbye world
284 +helloworld
285 +
286 +
287 +
288 +goodbye world
289 hg diff -wB