Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 41642:3d9d5e612e67
subrepo: adjust subrepo prefix before calling subrepo.archive() (API)
Differential Revision: https://phab.mercurial-scm.org/D5887
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 07 Feb 2019 10:20:57 -0800 |
| parents | 3d094bfaf885 |
| children | d8cdd5320f75 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Thu Feb 07 09:52:36 2019 -0800 +++ b/mercurial/subrepo.py Thu Feb 07 10:20:57 2019 -0800 @@ -343,8 +343,8 @@ flags = self.fileflags(name) mode = 'x' in flags and 0o755 or 0o644 symlink = 'l' in flags - archiver.addfile(prefix + self._path + '/' + name, - mode, symlink, self.filedata(name, decode)) + archiver.addfile(prefix + name, mode, symlink, + self.filedata(name, decode)) progress.increment() progress.complete() return total @@ -576,7 +576,8 @@ for subpath in ctx.substate: s = subrepo(ctx, subpath, True) submatch = matchmod.subdirmatcher(subpath, match) - total += s.archive(archiver, prefix + self._path + '/', submatch, + subprefix = prefix + subpath + '/' + total += s.archive(archiver, subprefix, submatch, decode) return total @@ -1673,8 +1674,7 @@ data = info.linkname else: data = tar.extractfile(info).read() - archiver.addfile(prefix + self._path + '/' + bname, - info.mode, info.issym(), data) + archiver.addfile(prefix + bname, info.mode, info.issym(), data) total += 1 progress.increment() progress.complete()