diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -2182,7 +2182,7 @@ def cat(ui, repo, ctx, matcher, prefix, try: submatch = matchmod.narrowmatcher(subpath, matcher) - if not sub.cat(ui, submatch, os.path.join(prefix, sub._path), + if not sub.cat(submatch, os.path.join(prefix, sub._path), **opts): err = 0 except error.RepoLookupError: diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -442,7 +442,7 @@ class abstractsubrepo(object): self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) return 1 - def cat(self, ui, match, prefix, **opts): + def cat(self, match, prefix, **opts): return 1 def status(self, rev2, **opts): @@ -636,10 +636,10 @@ class hgsubrepo(abstractsubrepo): dry_run, similarity) @annotatesubrepoerror - def cat(self, ui, match, prefix, **opts): + def cat(self, match, prefix, **opts): rev = self._state[1] ctx = self._repo[rev] - return cmdutil.cat(ui, self._repo, ctx, match, prefix, **opts) + return cmdutil.cat(self.ui, self._repo, ctx, match, prefix, **opts) @annotatesubrepoerror def status(self, rev2, **opts):