Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 46796:e2f7b2695ba1
merge with stable
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 18 Mar 2021 18:24:59 -0400 |
parents | a4c19a162615 d6601547f22b |
children | d4ba4d51f85f |
line wrap: on
line diff
--- a/mercurial/subrepo.py Tue Mar 02 00:05:22 2021 +0100 +++ b/mercurial/subrepo.py Thu Mar 18 18:24:59 2021 -0400 @@ -1891,7 +1891,12 @@ if info.issym(): data = info.linkname else: - data = tar.extractfile(info).read() + f = tar.extractfile(info) + if f: + data = f.read() + else: + self.ui.warn(_(b'skipping "%s" (unknown type)') % bname) + continue archiver.addfile(prefix + bname, info.mode, info.issym(), data) total += 1 progress.increment()