Mercurial > hg > hg-git

changeset 893:54dd2b9bd68d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
verify: flake8 cleanup
author Sean Farley <sean@farley.io>
date Wed, 22 Apr 2015 16:31:11 -0700
parents 29a0bf3e6d3b
children 0d258c2d0e91
files hggit/verify.py
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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