D5883: subrepo: adjust subrepo prefix before calling subrepo.forget() (API)
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Feb 7 18:46:38 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5883
AFFECTED FILES
mercurial/cmdutil.py
mercurial/subrepo.py
CHANGE DETAILS
diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -840,8 +840,7 @@
@annotatesubrepoerror
def forget(self, match, prefix, dryrun, interactive):
- return cmdutil.forget(self.ui, self._repo, match,
- self.wvfs.reljoin(prefix, self._path),
+ return cmdutil.forget(self.ui, self._repo, match, prefix,
True, dryrun=dryrun, interactive=interactive)
@annotatesubrepoerror
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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])
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list