Mercurial > hg
comparison mercurial/subrepo.py @ 46794: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 |
comparison
equal
deleted
inserted
replaced
| 46782:6b52cffd8d0a | 46794:e2f7b2695ba1 |
|---|---|
| 1889 if match and not match(bname): | 1889 if match and not match(bname): |
| 1890 continue | 1890 continue |
| 1891 if info.issym(): | 1891 if info.issym(): |
| 1892 data = info.linkname | 1892 data = info.linkname |
| 1893 else: | 1893 else: |
| 1894 data = tar.extractfile(info).read() | 1894 f = tar.extractfile(info) |
| 1895 if f: | |
| 1896 data = f.read() | |
| 1897 else: | |
| 1898 self.ui.warn(_(b'skipping "%s" (unknown type)') % bname) | |
| 1899 continue | |
| 1895 archiver.addfile(prefix + bname, info.mode, info.issym(), data) | 1900 archiver.addfile(prefix + bname, info.mode, info.issym(), data) |
| 1896 total += 1 | 1901 total += 1 |
| 1897 progress.increment() | 1902 progress.increment() |
| 1898 progress.complete() | 1903 progress.complete() |
| 1899 return total | 1904 return total |