| hg-reviewers |
That's what we do with the matcher so it seems more consistent.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (3 lines) | |||
| M | mercurial/subrepo.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| else: | else: | ||||
| warn = False | warn = False | ||||
| subs = sorted(wctx.substate) | subs = sorted(wctx.substate) | ||||
| progress = ui.makeprogress(_('searching'), total=len(subs), | progress = ui.makeprogress(_('searching'), total=len(subs), | ||||
| unit=_('subrepos')) | unit=_('subrepos')) | ||||
| for subpath in subs: | for subpath in subs: | ||||
| submatch = matchmod.subdirmatcher(subpath, m) | submatch = matchmod.subdirmatcher(subpath, m) | ||||
| subprefix = repo.wvfs.reljoin(prefix, subpath) | |||||
| if subrepos or m.exact(subpath) or any(submatch.files()): | if subrepos or m.exact(subpath) or any(submatch.files()): | ||||
| progress.increment() | progress.increment() | ||||
| sub = wctx.sub(subpath) | sub = wctx.sub(subpath) | ||||
| try: | try: | ||||
| if sub.removefiles(submatch, prefix, after, force, subrepos, | if sub.removefiles(submatch, subprefix, after, force, subrepos, | ||||
| dryrun, warnings): | dryrun, warnings): | ||||
| ret = 1 | ret = 1 | ||||
| except error.LookupError: | except error.LookupError: | ||||
| warnings.append(_("skipping missing subrepository: %s\n") | warnings.append(_("skipping missing subrepository: %s\n") | ||||
| % join(subpath)) | % join(subpath)) | ||||
| progress.complete() | progress.complete() | ||||
| # warn about failure to delete explicit files/dirs | # warn about failure to delete explicit files/dirs | ||||
| def forget(self, match, prefix, dryrun, interactive): | def forget(self, match, prefix, dryrun, interactive): | ||||
| return cmdutil.forget(self.ui, self._repo, match, | return cmdutil.forget(self.ui, self._repo, match, | ||||
| self.wvfs.reljoin(prefix, self._path), | self.wvfs.reljoin(prefix, self._path), | ||||
| True, dryrun=dryrun, interactive=interactive) | True, dryrun=dryrun, interactive=interactive) | ||||
| @annotatesubrepoerror | @annotatesubrepoerror | ||||
| def removefiles(self, matcher, prefix, after, force, subrepos, | def removefiles(self, matcher, prefix, after, force, subrepos, | ||||
| dryrun, warnings): | dryrun, warnings): | ||||
| return cmdutil.remove(self.ui, self._repo, matcher, | return cmdutil.remove(self.ui, self._repo, matcher, prefix, | ||||
| self.wvfs.reljoin(prefix, self._path), | |||||
| after, force, subrepos, dryrun) | after, force, subrepos, dryrun) | ||||
| @annotatesubrepoerror | @annotatesubrepoerror | ||||
| def revert(self, substate, *pats, **opts): | def revert(self, substate, *pats, **opts): | ||||
| # reverting a subrepo is a 2 step process: | # reverting a subrepo is a 2 step process: | ||||
| # 1. if the no_backup is not set, revert all modified | # 1. if the no_backup is not set, revert all modified | ||||
| # files inside the subrepo | # files inside the subrepo | ||||
| # 2. update the subrepo to the revision specified in | # 2. update the subrepo to the revision specified in | ||||