Mercurial > hg > hg-git
changeset 897:431d5121528d
overlay: flake8 cleanup
author | Sean Farley <sean@farley.io> |
---|---|
date | Wed, 22 Apr 2015 16:41:38 -0700 |
parents | a1e47539644e |
children | 8026c094173a |
files | hggit/overlay.py |
diffstat | 1 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/overlay.py +++ b/hggit/overlay.py @@ -8,7 +8,6 @@ from mercurial import manifest from mercurial import context from mercurial.node import bin, hex, nullid -from mercurial import localrepo def _maybehex(n): if len(n) == 20: @@ -155,7 +154,7 @@ def __init__(self, repo, sha): self.repo = repo if not isinstance(sha, basestring): - sha = sha.hex() + sha = sha.hex() self.commit = repo.handler.git.get_object(_maybehex(sha)) self._overlay = getattr(repo, 'gitoverlay', repo) self._rev = self._overlay.rev(bin(self.commit.id)) @@ -261,10 +260,10 @@ anode = self.repo.nodemap.get(a) bnode = self.repo.nodemap.get(b) if anode is None and bnode is None: - return self.base.ancestor(a, b) + return self.base.ancestor(a, b) ancs = ancestor.ancestors(self.parentrevs, a, b) if ancs: - return min(map(self.node, ancs)) + return min(map(self.node, ancs)) return nullid def parentrevs(self, rev): @@ -279,7 +278,7 @@ def rev(self, n): gitrev = self.repo.revmap.get(n) if gitrev is None: - return self.base.rev(n) + return self.base.rev(n) return gitrev def __len__(self): @@ -342,19 +341,19 @@ r.handler = self.handler r.gitoverlay = self try: - return getattr(r, method)(*args, **kwargs) + return getattr(r, method)(*args, **kwargs) finally: - if oldhandler is nothing: - del r.handler - else: - r.handler = oldhandler - if oldoverlay is nothing: - del r.gitoverlay - else: - r.gitoverlay = oldoverlay + if oldhandler is nothing: + del r.handler + else: + r.handler = oldhandler + if oldoverlay is nothing: + del r.gitoverlay + else: + r.gitoverlay = oldoverlay def status(self, *args, **kwargs): - return self._handlerhack('status', *args, **kwargs) + return self._handlerhack('status', *args, **kwargs) def node(self, n): """Returns an Hg or Git hash for the specified Git hash"""