--- a/mercurial/cmdutil.py Tue Jan 26 22:44:29 2016 +0900
+++ b/mercurial/cmdutil.py Sun Mar 06 14:30:34 2016 -0500
@@ -2340,14 +2340,15 @@
for subpath in sorted(ctx.substate):
def matchessubrepo(subpath):
- return (m.always() or m.exact(subpath)
+ return (m.exact(subpath)
or any(f.startswith(subpath + '/') for f in m.files()))
if subrepos or matchessubrepo(subpath):
sub = ctx.sub(subpath)
try:
submatch = matchmod.narrowmatcher(subpath, m)
- if sub.printfiles(ui, submatch, fm, fmt, subrepos) == 0:
+ recurse = m.exact(subpath) or subrepos
+ if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0:
ret = 0
except error.LookupError:
ui.status(_("skipping missing subrepository: %s\n")