Patchwork D2358: convert: don't use type as a variable name

login
register
mail settings
Submitter phabricator
Date Feb. 19, 2018, 6:39 p.m.
Message ID <differential-rev-PHID-DREV-5n723u7ce74w3gazjmxt-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28164/
State Superseded
Headers show

Comments

phabricator - Feb. 19, 2018, 6:39 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2358

AFFECTED FILES
  hgext/convert/git.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

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