Mercurial > public > mercurial-scm > hg
diff mercurial/cmdutil.py @ 29633:bc5148d0a446 stable
cmdutil: warnings not issued in cat if subrepopath overlaps
Previously a subrepository "sub" would cause no warnings to
be issued for a file "subnot/a", if it's not present in the
corresponding changeset when calling:
hg cat subnot/a
| author | Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> |
|---|---|
| date | Wed, 27 Jul 2016 08:38:54 +0000 |
| parents | 9c2cc107547f |
| children | a1082645d623 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Jul 25 17:00:42 2016 +0200 +++ b/mercurial/cmdutil.py Wed Jul 27 08:38:54 2016 +0000 @@ -2584,7 +2584,7 @@ # Don't warn about "missing" files that are really in subrepos def badfn(path, msg): for subpath in ctx.substate: - if path.startswith(subpath): + if path.startswith(subpath + '/'): return matcher.bad(path, msg)