Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 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 | f1b06a8aad42 |
children | 597b071a0e0d |
comparison
equal
deleted
inserted
replaced
23575:a2f139d25845 | 23576:70a7478c33de |
---|---|
2180 for subpath in sorted(ctx.substate): | 2180 for subpath in sorted(ctx.substate): |
2181 sub = ctx.sub(subpath) | 2181 sub = ctx.sub(subpath) |
2182 try: | 2182 try: |
2183 submatch = matchmod.narrowmatcher(subpath, matcher) | 2183 submatch = matchmod.narrowmatcher(subpath, matcher) |
2184 | 2184 |
2185 if not sub.cat(ui, submatch, os.path.join(prefix, sub._path), | 2185 if not sub.cat(submatch, os.path.join(prefix, sub._path), |
2186 **opts): | 2186 **opts): |
2187 err = 0 | 2187 err = 0 |
2188 except error.RepoLookupError: | 2188 except error.RepoLookupError: |
2189 ui.status(_("skipping missing subrepository: %s\n") | 2189 ui.status(_("skipping missing subrepository: %s\n") |
2190 % os.path.join(prefix, subpath)) | 2190 % os.path.join(prefix, subpath)) |