D5882: subrepo: adjust subrepo prefix before calling subrepo.removefiles() (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.
REVISION SUMMARY
That's what we do with the matcher so it seems more consistent.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5882
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
@@ -847,8 +847,7 @@
@annotatesubrepoerror
def removefiles(self, matcher, prefix, after, force, subrepos,
dryrun, warnings):
- return cmdutil.remove(self.ui, self._repo, matcher,
- self.wvfs.reljoin(prefix, self._path),
+ return cmdutil.remove(self.ui, self._repo, matcher, prefix,
after, force, subrepos, dryrun)
@annotatesubrepoerror
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2208,11 +2208,12 @@
unit=_('subrepos'))
for subpath in subs:
submatch = matchmod.subdirmatcher(subpath, m)
+ subprefix = repo.wvfs.reljoin(prefix, subpath)
if subrepos or m.exact(subpath) or any(submatch.files()):
progress.increment()
sub = wctx.sub(subpath)
try:
- if sub.removefiles(submatch, prefix, after, force, subrepos,
+ if sub.removefiles(submatch, subprefix, after, force, subrepos,
dryrun, warnings):
ret = 1
except error.LookupError:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list