Show More
@@ -2182,7 +2182,7 b' def cat(ui, repo, ctx, matcher, prefix, ' | |||||
2182 | try: |
|
2182 | try: | |
2183 | submatch = matchmod.narrowmatcher(subpath, matcher) |
|
2183 | submatch = matchmod.narrowmatcher(subpath, matcher) | |
2184 |
|
2184 | |||
2185 |
if not sub.cat( |
|
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: |
@@ -442,7 +442,7 b' class abstractsubrepo(object):' | |||||
442 | self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) |
|
442 | self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) | |
443 | return 1 |
|
443 | return 1 | |
444 |
|
444 | |||
445 |
def cat(self |
|
445 | def cat(self, match, prefix, **opts): | |
446 | return 1 |
|
446 | return 1 | |
447 |
|
447 | |||
448 | def status(self, rev2, **opts): |
|
448 | def status(self, rev2, **opts): | |
@@ -636,10 +636,10 b' class hgsubrepo(abstractsubrepo):' | |||||
636 | dry_run, similarity) |
|
636 | dry_run, similarity) | |
637 |
|
637 | |||
638 | @annotatesubrepoerror |
|
638 | @annotatesubrepoerror | |
639 |
def cat(self |
|
639 | def cat(self, match, prefix, **opts): | |
640 | rev = self._state[1] |
|
640 | rev = self._state[1] | |
641 | ctx = self._repo[rev] |
|
641 | ctx = self._repo[rev] | |
642 | return cmdutil.cat(ui, self._repo, ctx, match, prefix, **opts) |
|
642 | return cmdutil.cat(self.ui, self._repo, ctx, match, prefix, **opts) | |
643 |
|
643 | |||
644 | @annotatesubrepoerror |
|
644 | @annotatesubrepoerror | |
645 | def status(self, rev2, **opts): |
|
645 | def status(self, rev2, **opts): |
General Comments 0
You need to be logged in to leave comments.
Login now