Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: adjust subrepo prefix before calling subrepo.add() (API)
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 07 Feb 2019 09:59:27 -0800
changeset 41628 ed046348675c
parent 41627 f92844cb942c
child 41629 5ee3c49fc9cd
subrepo: adjust subrepo prefix before calling subrepo.add() (API) Differential Revision: https://phab.mercurial-scm.org/D5884
mercurial/cmdutil.py file | annotate | diff | comparison | revisions
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Thu Feb 07 09:52:22 2019 -0800
+++ b/mercurial/cmdutil.py	Thu Feb 07 09:59:27 2019 -0800
@@ -2059,10 +2059,11 @@
         sub = wctx.sub(subpath)
         try:
             submatch = matchmod.subdirmatcher(subpath, match)
+            subprefix = repo.wvfs.reljoin(prefix, subpath)
             if opts.get(r'subrepos'):
-                bad.extend(sub.add(ui, submatch, prefix, False, **opts))
+                bad.extend(sub.add(ui, submatch, subprefix, False, **opts))
             else:
-                bad.extend(sub.add(ui, submatch, prefix, True, **opts))
+                bad.extend(sub.add(ui, submatch, subprefix, True, **opts))
         except error.LookupError:
             ui.status(_("skipping missing subrepository: %s\n")
                            % join(subpath))
--- a/mercurial/subrepo.py	Thu Feb 07 09:52:22 2019 -0800
+++ b/mercurial/subrepo.py	Thu Feb 07 09:59:27 2019 -0800
@@ -518,9 +518,7 @@
 
     @annotatesubrepoerror
     def add(self, ui, match, prefix, explicitonly, **opts):
-        return cmdutil.add(ui, self._repo, match,
-                           self.wvfs.reljoin(prefix, self._path),
-                           explicitonly, **opts)
+        return cmdutil.add(ui, self._repo, match, prefix, explicitonly, **opts)
 
     @annotatesubrepoerror
     def addremove(self, m, prefix, opts):
Mercurial