--- a/mercurial/subrepo.py Thu Feb 07 23:19:33 2019 -0800
+++ b/mercurial/subrepo.py Thu Feb 07 23:25:39 2019 -0800
@@ -290,7 +290,7 @@
def add(self, ui, match, prefix, uipathfn, explicitonly, **opts):
return []
- def addremove(self, matcher, prefix, opts):
+ def addremove(self, matcher, prefix, uipathfn, opts):
self.ui.warn("%s: %s" % (prefix, _("addremove is not supported")))
return 1
@@ -521,13 +521,13 @@
explicitonly, **opts)
@annotatesubrepoerror
- def addremove(self, m, prefix, opts):
+ def addremove(self, m, prefix, uipathfn, opts):
# In the same way as sub directories are processed, once in a subrepo,
# always entry any of its subrepos. Don't corrupt the options that will
# be used to process sibling subrepos however.
opts = copy.copy(opts)
opts['subrepos'] = True
- return scmutil.addremove(self._repo, m, prefix, opts)
+ return scmutil.addremove(self._repo, m, prefix, uipathfn, opts)
@annotatesubrepoerror
def cat(self, match, fm, fntemplate, prefix, **opts):