Show More
@@ -2075,8 +2075,7 b' def remove(ui, repo, m, prefix, after, f' | |||
|
2075 | 2075 | sub = wctx.sub(subpath) |
|
2076 | 2076 | try: |
|
2077 | 2077 | submatch = matchmod.narrowmatcher(subpath, m) |
|
2078 |
if sub.removefiles( |
|
|
2079 | subrepos): | |
|
2078 | if sub.removefiles(submatch, prefix, after, force, subrepos): | |
|
2080 | 2079 | ret = 1 |
|
2081 | 2080 | except error.LookupError: |
|
2082 | 2081 | ui.status(_("skipping missing subrepository: %s\n") |
@@ -499,7 +499,7 b' class abstractsubrepo(object):' | |||
|
499 | 499 | def forget(self, match, prefix): |
|
500 | 500 | return ([], []) |
|
501 | 501 | |
|
502 |
def removefiles(self |
|
|
502 | def removefiles(self, matcher, prefix, after, force, subrepos): | |
|
503 | 503 | """remove the matched files from the subrepository and the filesystem, |
|
504 | 504 | possibly by force and/or after the file has been removed from the |
|
505 | 505 | filesystem. Return 0 on success, 1 on any warning. |
@@ -855,8 +855,8 b' class hgsubrepo(abstractsubrepo):' | |||
|
855 | 855 | os.path.join(prefix, self._path), True) |
|
856 | 856 | |
|
857 | 857 | @annotatesubrepoerror |
|
858 |
def removefiles(self |
|
|
859 | return cmdutil.remove(ui, self._repo, matcher, | |
|
858 | def removefiles(self, matcher, prefix, after, force, subrepos): | |
|
859 | return cmdutil.remove(self.ui, self._repo, matcher, | |
|
860 | 860 | os.path.join(prefix, self._path), after, force, |
|
861 | 861 | subrepos) |
|
862 | 862 |
General Comments 0
You need to be logged in to leave comments.
Login now