( )⚙ D10179 subrepo: handle unexpected file types from git gracefully

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10179

subrepo: handle unexpected file types from git gracefully
ClosedPublic

Authored by mharbison72 on Mar 12 2021, 1:09 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd6601547f22b: subrepo: handle unexpected file types from git gracefully
Summary

This was flagged by pytype because tar.extractfile(...) can return None if the
entry is not a file or symlink. I don't think that git supports other types,
but better safe than sorry.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (7 lines)

Diff 26276

mercurial/subrepo.py

if info.isdir(): if info.isdir():
continue continue
bname = pycompat.fsencode(info.name) bname = pycompat.fsencode(info.name)
if match and not match(bname): if match and not match(bname):
continue continue
if info.issym(): if info.issym():
data = info.linkname data = info.linkname
else: 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) archiver.addfile(prefix + bname, info.mode, info.issym(), data)
total += 1 total += 1
progress.increment() progress.increment()
progress.complete() progress.complete()
return total return total
@annotatesubrepoerror @annotatesubrepoerror
def cat(self, match, fm, fntemplate, prefix, **opts): def cat(self, match, fm, fntemplate, prefix, **opts):