From patchwork Tue Feb 20 13:34:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D2358: convert: don't use type as a variable name From: phabricator X-Patchwork-Id: 28172 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Tue, 20 Feb 2018 13:34:08 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHGaefb75730ea3: convert: don't use type as a variable name (authored by pulkit, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2358?vs=5926&id=5935#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2358?vs=5926&id=5935 REVISION DETAIL https://phab.mercurial-scm.org/D2358 AFFECTED FILES hgext/convert/git.py CHANGE DETAILS To: pulkit, #hg-reviewers, yuja Cc: mercurial-devel diff --git a/hgext/convert/git.py b/hgext/convert/git.py --- a/hgext/convert/git.py +++ b/hgext/convert/git.py @@ -168,19 +168,19 @@ raise error.Abort(_('cannot retrieve git head "%s"') % rev) return heads - def catfile(self, rev, type): + def catfile(self, rev, ftype): if rev == nodemod.nullhex: raise IOError self.catfilepipe[0].write(rev+'\n') self.catfilepipe[0].flush() info = self.catfilepipe[1].readline().split() - if info[1] != type: - raise error.Abort(_('cannot read %r object at %s') % (type, rev)) + if info[1] != ftype: + raise error.Abort(_('cannot read %r object at %s') % (ftype, rev)) size = int(info[2]) data = self.catfilepipe[1].read(size) if len(data) < size: raise error.Abort(_('cannot read %r object at %s: unexpected size') - % (type, rev)) + % (ftype, rev)) # read the trailing newline self.catfilepipe[1].read(1) return data