Mercurial > public > mercurial-scm > hg
comparison mercurial/subrepo.py @ 41629:5ee3c49fc9cd
subrepo: adjust subrepo prefix before calling subrepo.addremove() (API)
Differential Revision: https://phab.mercurial-scm.org/D5885
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 07 Feb 2019 10:01:55 -0800 |
parents | ed046348675c |
children | 3d094bfaf885 |
comparison
equal
deleted
inserted
replaced
41628:ed046348675c | 41629:5ee3c49fc9cd |
---|---|
525 # In the same way as sub directories are processed, once in a subrepo, | 525 # In the same way as sub directories are processed, once in a subrepo, |
526 # always entry any of its subrepos. Don't corrupt the options that will | 526 # always entry any of its subrepos. Don't corrupt the options that will |
527 # be used to process sibling subrepos however. | 527 # be used to process sibling subrepos however. |
528 opts = copy.copy(opts) | 528 opts = copy.copy(opts) |
529 opts['subrepos'] = True | 529 opts['subrepos'] = True |
530 return scmutil.addremove(self._repo, m, | 530 return scmutil.addremove(self._repo, m, prefix, opts) |
531 self.wvfs.reljoin(prefix, self._path), opts) | |
532 | 531 |
533 @annotatesubrepoerror | 532 @annotatesubrepoerror |
534 def cat(self, match, fm, fntemplate, prefix, **opts): | 533 def cat(self, match, fm, fntemplate, prefix, **opts): |
535 rev = self._state[1] | 534 rev = self._state[1] |
536 ctx = self._repo[rev] | 535 ctx = self._repo[rev] |