##// END OF EJS Templates
log: do not use exact matcher for --patch --follow without file (issue4319)...
Yuya Nishihara -
r21966:be94ed4b stable
parent child Browse files
Show More
@@ -1629,7 +1629,7 b' def _makelogrevset(repo, pats, opts, rev'
1629
1629
1630 filematcher = None
1630 filematcher = None
1631 if opts.get('patch') or opts.get('stat'):
1631 if opts.get('patch') or opts.get('stat'):
1632 if follow:
1632 if follow and not match.always():
1633 # _makelogfilematcher expects its files argument to be relative to
1633 # _makelogfilematcher expects its files argument to be relative to
1634 # the repo root, so use match.files(), not pats.
1634 # the repo root, so use match.files(), not pats.
1635 filematcher = _makelogfilematcher(repo, match.files(), followfirst)
1635 filematcher = _makelogfilematcher(repo, match.files(), followfirst)
@@ -260,6 +260,98 b' log -pf b inside dir'
260 +a
260 +a
261
261
262
262
263 log -pf, but no args
264
265 $ hg log -pf
266 changeset: 3:2ca5ba701980
267 user: test
268 date: Thu Jan 01 00:00:04 1970 +0000
269 summary: d
270
271 diff -r f8954cd4dc1f -r 2ca5ba701980 a
272 --- a/a Thu Jan 01 00:00:03 1970 +0000
273 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
274 @@ -1,1 +0,0 @@
275 -a
276 diff -r f8954cd4dc1f -r 2ca5ba701980 b
277 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
278 +++ b/b Thu Jan 01 00:00:04 1970 +0000
279 @@ -0,0 +1,1 @@
280 +a
281 diff -r f8954cd4dc1f -r 2ca5ba701980 d
282 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
283 +++ b/d Thu Jan 01 00:00:04 1970 +0000
284 @@ -0,0 +1,1 @@
285 +a
286 diff -r f8954cd4dc1f -r 2ca5ba701980 g
287 --- a/g Thu Jan 01 00:00:03 1970 +0000
288 +++ b/g Thu Jan 01 00:00:04 1970 +0000
289 @@ -1,2 +1,2 @@
290 f
291 -g
292 +f
293
294 changeset: 2:f8954cd4dc1f
295 user: test
296 date: Thu Jan 01 00:00:03 1970 +0000
297 summary: c
298
299 diff -r d89b0a12d229 -r f8954cd4dc1f b
300 --- a/b Thu Jan 01 00:00:02 1970 +0000
301 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
302 @@ -1,1 +0,0 @@
303 -a
304 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
305 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
306 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
307 @@ -0,0 +1,1 @@
308 +a
309 diff -r d89b0a12d229 -r f8954cd4dc1f f
310 --- a/f Thu Jan 01 00:00:02 1970 +0000
311 +++ b/f Thu Jan 01 00:00:03 1970 +0000
312 @@ -1,1 +1,2 @@
313 f
314 +f
315 diff -r d89b0a12d229 -r f8954cd4dc1f g
316 --- a/g Thu Jan 01 00:00:02 1970 +0000
317 +++ b/g Thu Jan 01 00:00:03 1970 +0000
318 @@ -1,1 +1,2 @@
319 f
320 +g
321
322 changeset: 1:d89b0a12d229
323 user: test
324 date: Thu Jan 01 00:00:02 1970 +0000
325 summary: b
326
327 diff -r 9161b9aeaf16 -r d89b0a12d229 b
328 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
329 +++ b/b Thu Jan 01 00:00:02 1970 +0000
330 @@ -0,0 +1,1 @@
331 +a
332 diff -r 9161b9aeaf16 -r d89b0a12d229 g
333 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
334 +++ b/g Thu Jan 01 00:00:02 1970 +0000
335 @@ -0,0 +1,1 @@
336 +f
337
338 changeset: 0:9161b9aeaf16
339 user: test
340 date: Thu Jan 01 00:00:01 1970 +0000
341 summary: a
342
343 diff -r 000000000000 -r 9161b9aeaf16 a
344 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
345 +++ b/a Thu Jan 01 00:00:01 1970 +0000
346 @@ -0,0 +1,1 @@
347 +a
348 diff -r 000000000000 -r 9161b9aeaf16 f
349 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
350 +++ b/f Thu Jan 01 00:00:01 1970 +0000
351 @@ -0,0 +1,1 @@
352 +f
353
354
263 log -vf dir/b
355 log -vf dir/b
264
356
265 $ hg log -vf dir/b
357 $ hg log -vf dir/b
General Comments 0
You need to be logged in to leave comments. Login now