Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 41638:f92844cb942c
subrepo: adjust subrepo prefix before calling subrepo.forget() (API)
Differential Revision: https://phab.mercurial-scm.org/D5883
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 07 Feb 2019 09:52:22 -0800 |
| parents | 2c549abc6b85 |
| children | ed046348675c |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu Feb 07 09:40:37 2019 -0800 +++ b/mercurial/cmdutil.py Thu Feb 07 09:52:22 2019 -0800 @@ -2097,9 +2097,10 @@ for subpath in sorted(wctx.substate): sub = wctx.sub(subpath) + submatch = matchmod.subdirmatcher(subpath, match) + subprefix = repo.wvfs.reljoin(prefix, subpath) try: - submatch = matchmod.subdirmatcher(subpath, match) - subbad, subforgot = sub.forget(submatch, prefix, dryrun=dryrun, + subbad, subforgot = sub.forget(submatch, subprefix, dryrun=dryrun, interactive=interactive) bad.extend([subpath + '/' + f for f in subbad]) forgot.extend([subpath + '/' + f for f in subforgot])