diff -r 7bfa1b199972 -r 746e12a767b3 mercurial/subrepo.py --- a/mercurial/subrepo.py Sat May 27 17:58:36 2017 +0900 +++ b/mercurial/subrepo.py Thu May 25 21:53:44 2017 +0900 @@ -538,7 +538,7 @@ self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) return 1 - def cat(self, match, fntemplate, prefix, **opts): + def cat(self, match, fm, fntemplate, prefix, **opts): return 1 def status(self, rev2, **opts): @@ -767,11 +767,11 @@ dry_run, similarity) @annotatesubrepoerror - def cat(self, match, fntemplate, prefix, **opts): + def cat(self, match, fm, fntemplate, prefix, **opts): rev = self._state[1] ctx = self._repo[rev] - return cmdutil.cat(self.ui, self._repo, ctx, match, fntemplate, prefix, - **opts) + return cmdutil.cat(self.ui, self._repo, ctx, match, fm, fntemplate, + prefix, **opts) @annotatesubrepoerror def status(self, rev2, **opts): @@ -1833,7 +1833,7 @@ @annotatesubrepoerror - def cat(self, match, fntemplate, prefix, **opts): + def cat(self, match, fm, fntemplate, prefix, **opts): rev = self._state[1] if match.anypats(): return 1 #No support for include/exclude yet @@ -1841,6 +1841,7 @@ if not match.files(): return 1 + # TODO: add support for non-plain formatter (see cmdutil.cat()) for f in match.files(): output = self._gitcommand(["show", "%s:%s" % (rev, f)]) fp = cmdutil.makefileobj(self._subparent, fntemplate,