diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -2627,6 +2627,9 @@ def getloglinerangerevs(repo, userrevs, # Two-levels map of "rev -> file ctx -> [line range]". linerangesbyrev = {} for fname, (fromline, toline) in _parselinerangelogopt(repo, opts): + if fname not in wctx: + raise error.Abort(_('cannot follow file not in parent ' + 'revision: "%s"') % fname) fctx = wctx.filectx(fname) for fctx, linerange in dagop.blockancestors(fctx, fromline, toline): rev = fctx.introrev() diff --git a/tests/test-log-linerange.t b/tests/test-log-linerange.t --- a/tests/test-log-linerange.t +++ b/tests/test-log-linerange.t @@ -842,6 +842,14 @@ Non-exact pattern kinds are not allowed. hg: parse error: line range pattern 'glob:*a*' must match exactly one file [255] +We get an error for removed files. + + $ hg rm dir/baz + $ hg ci -m 'remove baz' --quiet + $ hg log -f -L dir/baz,5:7 -p + abort: cannot follow file not in parent revision: "dir/baz" + [255] + Graph log does work yet. $ hg log -f -L dir/baz,5:7 --graph