##// END OF EJS Templates
log: handle removed files with --line-range patterns...
Denis Laxalde -
r34908:0ccfc468 default
parent child Browse files
Show More
@@ -2627,6 +2627,9 b' def getloglinerangerevs(repo, userrevs, '
2627 # Two-levels map of "rev -> file ctx -> [line range]".
2627 # Two-levels map of "rev -> file ctx -> [line range]".
2628 linerangesbyrev = {}
2628 linerangesbyrev = {}
2629 for fname, (fromline, toline) in _parselinerangelogopt(repo, opts):
2629 for fname, (fromline, toline) in _parselinerangelogopt(repo, opts):
2630 if fname not in wctx:
2631 raise error.Abort(_('cannot follow file not in parent '
2632 'revision: "%s"') % fname)
2630 fctx = wctx.filectx(fname)
2633 fctx = wctx.filectx(fname)
2631 for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
2634 for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
2632 rev = fctx.introrev()
2635 rev = fctx.introrev()
@@ -842,6 +842,14 b' Non-exact pattern kinds are not allowed.'
842 hg: parse error: line range pattern 'glob:*a*' must match exactly one file
842 hg: parse error: line range pattern 'glob:*a*' must match exactly one file
843 [255]
843 [255]
844
844
845 We get an error for removed files.
846
847 $ hg rm dir/baz
848 $ hg ci -m 'remove baz' --quiet
849 $ hg log -f -L dir/baz,5:7 -p
850 abort: cannot follow file not in parent revision: "dir/baz"
851 [255]
852
845 Graph log does work yet.
853 Graph log does work yet.
846
854
847 $ hg log -f -L dir/baz,5:7 --graph
855 $ hg log -f -L dir/baz,5:7 --graph
General Comments 0
You need to be logged in to leave comments. Login now