--- a/mercurial/subrepo.py Sat Dec 13 19:23:30 2014 -0500
+++ b/mercurial/subrepo.py Sat Dec 13 19:36:50 2014 -0500
@@ -499,7 +499,7 @@
def forget(self, match, prefix):
return ([], [])
- def removefiles(self, ui, matcher, prefix, after, force, subrepos):
+ def removefiles(self, matcher, prefix, after, force, subrepos):
"""remove the matched files from the subrepository and the filesystem,
possibly by force and/or after the file has been removed from the
filesystem. Return 0 on success, 1 on any warning.
@@ -855,8 +855,8 @@
os.path.join(prefix, self._path), True)
@annotatesubrepoerror
- def removefiles(self, ui, matcher, prefix, after, force, subrepos):
- return cmdutil.remove(ui, self._repo, matcher,
+ def removefiles(self, matcher, prefix, after, force, subrepos):
+ return cmdutil.remove(self.ui, self._repo, matcher,
os.path.join(prefix, self._path), after, force,
subrepos)