Mercurial > hg
changeset 23576:70a7478c33de
subrepo: drop the 'ui' parameter to cat()
This no longer needs to be explicitly passed because the subrepo object tracks
a 'ui' reference since fcbc66b5da6a. See the change to 'archive' for details
about the differences between the output level in the root repo and subrepo 'ui'
object.
The only use for 'ui' in cat is to emit a status message when a subrepo is
missing. The bad() method on the matcher still uses the root repo's ui, because
narrowing the matcher doesn't change the ui object.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 13 Dec 2014 14:26:38 -0500 |
| parents | a2f139d25845 |
| children | 597b071a0e0d |
| files | mercurial/cmdutil.py mercurial/subrepo.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Dec 13 14:53:46 2014 -0500 +++ b/mercurial/cmdutil.py Sat Dec 13 14:26:38 2014 -0500 @@ -2182,7 +2182,7 @@ 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:
--- a/mercurial/subrepo.py Sat Dec 13 14:53:46 2014 -0500 +++ b/mercurial/subrepo.py Sat Dec 13 14:26:38 2014 -0500 @@ -442,7 +442,7 @@ 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 @@ 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):