# HG changeset patch # User Sean Farley # Date 1429745471 25200 # Wed Apr 22 16:31:11 2015 -0700 # Node ID 54dd2b9bd68d1d33cd73752a37c87227eff6eca5 # Parent 29a0bf3e6d3bc648b575d20796358038a2525fad verify: flake8 cleanup diff --git a/hggit/verify.py b/hggit/verify.py --- a/hggit/verify.py +++ b/hggit/verify.py @@ -9,9 +9,7 @@ from mercurial import error from mercurial import util as hgutil -from mercurial.node import hex, bin, nullid from mercurial.i18n import _ -from mercurial import scmutil from dulwich import diff_tree from dulwich.objects import Commit, S_IFGITLINK @@ -30,7 +28,8 @@ if not gitsha: # TODO deal better with commits in the middle of octopus merges raise hgutil.Abort(_('no git commit found for rev %s') % hgctx, - hint=_('if this is an octopus merge, verify against the last rev')) + hint=_('if this is an octopus merge, ' + 'verify against the last rev')) try: gitcommit = handler.git.get_object(gitsha) @@ -60,8 +59,8 @@ if gitfile.mode == dirkind: continue # TODO deal with submodules - if (gitfile.mode == S_IFGITLINK or gitfile.path == '.hgsubstate' - or gitfile.path == '.hgsub'): + if (gitfile.mode == S_IFGITLINK or gitfile.path == '.hgsubstate' or + gitfile.path == '.hgsub'): continue ui.progress('verify', i, total=len(hgfiles)) i += 1