Mercurial > hg
diff hgext/convert/git.py @ 10282:08a0f04b56bd
many, many trivial check-code fixups
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 25 Jan 2010 00:05:27 -0600 |
parents | 25e572394f5c |
children | 02d6149a480b |
line wrap: on
line diff
--- a/hgext/convert/git.py Mon Jan 25 00:05:22 2010 -0600 +++ b/hgext/convert/git.py Mon Jan 25 00:05:27 2010 -0600 @@ -43,13 +43,15 @@ def getheads(self): if not self.rev: - return self.gitcmd('git rev-parse --branches --remotes').read().splitlines() + fh = self.gitcmd('git rev-parse --branches --remotes') + return fh.read().splitlines() else: fh = self.gitcmd("git rev-parse --verify %s" % self.rev) return [fh.read()[:-1]] def catfile(self, rev, type): - if rev == "0" * 40: raise IOError() + if rev == "0" * 40: + raise IOError() fh = self.gitcmd("git cat-file %s %s" % (type, rev)) return fh.read() @@ -86,7 +88,7 @@ def getcommit(self, version): c = self.catfile(version, "commit") # read the commit hash end = c.find("\n\n") - message = c[end+2:] + message = c[end + 2:] message = self.recode(message) l = c[:end].splitlines() parents = [] @@ -105,7 +107,8 @@ committer = " ".join(p[:-2]) if committer[0] == "<": committer = committer[1:-1] committer = self.recode(committer) - if n == "parent": parents.append(v) + if n == "parent": + parents.append(v) if committer and committer != author: message += "\ncommitter: %s\n" % committer @@ -145,7 +148,7 @@ fh.close() else: fh = self.gitcmd('git diff-tree --name-only --root -r %s "%s^%s" --' - % (version, version, i+1)) + % (version, version, i + 1)) changes = [f.rstrip('\n') for f in fh] fh.close()