format: make the code follow pep8 rules

Author: charignon

hooklib.py

@@ -1,15 +1,16 @@
-"""Hook helpers library 
+"""Hook helpers library
 
-You can use this library to make it easier to write hooks that work with multiple
-source control system (git, svn, hg ...).
+You can use this library to make it easier to write hooks
+that work with multiple source control system (git, svn, hg ...).
 It currently only works for git.
 See https://github.com/charignon/hooklib for examples"""
 import threading
 import sys
 from Queue import Queue
-from hooklib_input import inputparser 
+from hooklib_input import inputparser
 
-def runhooks(phase, hooks, parallel = False):
+
+def runhooks(phase, hooks, parallel=False):
     if parallel:
         runner = parallelhookrunner(phase)
     else:
@@ -23,6 +24,7 @@ def runhooks(phase, hooks, parallel = False):
     if not ret:
         sys.exit(1)
 
+
 class hooklog(object):
     """Collect logs from running hooks"""
     def __init__(self):
@@ -43,6 +45,7 @@ def aggregate(logs):
         ret.msgs = msgs
         return ret
 
+
 class hookrunner(object):
     def __init__(self, phase=None, phases=None):
         self.runlist = []
@@ -65,9 +68,10 @@ def evaluate(self):
 
             if not hookpass:
                 success = False
-        
+
         return success
 
+
 class parallelhookrunner(hookrunner):
     def evaluateone(self, hook):
         log = hooklog()
@@ -84,7 +88,7 @@ def evaluate(self):
         for t in threads:
             t.join()
         res, logs = [], []
-        
+
         for h in range(len(self.runlist)):
             r, l = self.resultqueue.get()
             res.append(r)
@@ -93,7 +97,7 @@ def evaluate(self):
         self.log = hooklog.aggregate(logs)
         return all(res)
 
- 
+
 class basehook(object):
-    """A basehook is called for each rev that goes through, once with the revdata"""
+    """A basehook to be subclassed by user implemented hooks"""
     pass

hooklib_git.py

@@ -1,27 +1,35 @@
 """Package containing all the input parsers specific to git
-Their implementation match what is described at https://git-scm.com/docs/githooks"""
+
+Their implementation match what is described at
+https://git-scm.com/docs/githooks"""
 
 from mercurial import util
 import hooklib_input
 import sys
 import os
 
+
 class basegitinputparser(object):
     def scm(self):
         return 'git'
 
+
 class gitinforesolver(object):
     def __init__(self):
         self.reporoot = None
         if 'GIT_DIR' in os.environ:
-            self.reporoot = os.path.dirname(os.path.abspath(os.environ["GIT_DIR"]))
+            gitdir = os.environ["GIT_DIR"]
+            self.reporoot = os.path.dirname(os.path.abspath(gitdir))
         else:
-            self.reporoot = util.popen4("git rev-parse --show-toplevel")[1].read().strip()
+            self.reporoot = util.popen4("git rev-parse --show-toplevel")[1]\
+                                .read()\
+                                .strip()
 
         self._revs = None
 
     def commitmessagefor(self, rev):
-        return util.popen4("git cat-file commit %s | sed '1,/^$/d'" % rev)[1].read().strip()
+        return util.popen4("git cat-file commit %s | sed '1,/^$/d'" % rev)[1]\
+                    .read().strip()
 
     @property
     def head(self):
@@ -31,15 +39,18 @@ def head(self):
     def revs(self):
         if self._revs:
             return self._revs
-        raw = util.popen4('git rev-list %s..%s' %(self.old, self.new))[1].read().strip()
+        raw = util.popen4('git rev-list %s..%s' % (self.old, self.new))[1]\
+                  .read()\
+                  .strip()
         if raw != '':
             return raw.split("\n")
         else:
             return []
-    
+
     def setrevs(self, revs):
         self._revs = revs
 
+
 class gitpostupdateinputparser(basegitinputparser):
     """Input parser for the 'post-update' phase
 
@@ -53,6 +64,7 @@ def parse(self):
         resolver.setrevs(revs)
         return resolver
 
+
 class gitupdateinputparser(basegitinputparser):
     """Input parser for the 'update' phase
 
@@ -70,6 +82,7 @@ def parse(self):
         resolver.new = new
         return resolver
 
+
 class gitprecommitinputparser(basegitinputparser):
     """Input parser for the 'pre-commit' phase
 
@@ -80,6 +93,7 @@ def parse(self):
         resolver = gitinforesolver()
         return resolver
 
+
 class gitpreapplypatchinputparser(basegitinputparser):
     """Input parser for the 'pre-applypatch' phase
 
@@ -90,6 +104,7 @@ def parse(self):
         resolver = gitinforesolver()
         return resolver
 
+
 class gitpostapplypatchinputparser(basegitinputparser):
     """Input parser for the 'post-applypatch' phase
 
@@ -100,6 +115,7 @@ def parse(self):
         resolver = gitinforesolver()
         return resolver
 
+
 class gitpostcommitinputparser(basegitinputparser):
     """Input parser for the 'post-commit' phase
 
@@ -110,6 +126,7 @@ def parse(self):
         resolver = gitinforesolver()
         return resolver
 
+
 class gitpreautogcinputparser(basegitinputparser):
     """input parser for the 'pre-autogc' phase
 
@@ -120,6 +137,7 @@ def parse(self):
         resolver = gitinforesolver()
         return resolver
 
+
 class gitreceiveinputparser(basegitinputparser):
     def parse(self):
         resolver = gitinforesolver()
@@ -128,6 +146,7 @@ def parse(self):
         resolver.receivedrevs = revs
         return resolver
 
+
 class gitpostreceiveinputparser(gitreceiveinputparser):
     """input parser for the 'post-receive' phase
 
@@ -138,6 +157,7 @@ class gitpostreceiveinputparser(gitreceiveinputparser):
     - head (str) => sha1 of HEAD"""
     pass
 
+
 class gitprereceiveinputparser(gitreceiveinputparser):
     """input parser for the 'pre-receive' phase
 
@@ -148,6 +168,7 @@ class gitprereceiveinputparser(gitreceiveinputparser):
     - head (str) => sha1 of HEAD"""
     pass
 
+
 class gitprepushinputparser(basegitinputparser):
     """input parser for the 'pre-push' phase
 
@@ -163,6 +184,7 @@ def parse(self):
         resolver.revstobepushed = revs
         return resolver
 
+
 class gitapplypatchmsginputparser(basegitinputparser):
     """input parser for the 'applypatch-msg' phase
 
@@ -176,6 +198,7 @@ def parse(self):
         resolver.messagefile = messagefile
         return resolver
 
+
 class gitprerebaseinputparser(basegitinputparser):
     """input parser for the 'pre-rebase' phase
 
@@ -195,6 +218,7 @@ def parse(self):
         resolver.rebased = rebased
         return resolver
 
+
 class gitcommitmsginputparser(basegitinputparser):
     """input parser for the 'commit-msg' phase
 
@@ -208,25 +232,27 @@ def parse(self):
         resolver.messagefile = messagefile
         return resolver
 
+
 class gitpreparecommitmsginputparser(basegitinputparser):
     """input parser for the 'prepare-commit-msg' phase
 
     available fields:
     - reporoot (str) => root of the repo
     - messagefile (str) => filename of the file containing the commit message
-    - mode (str) =>  could be one of (None, 'message', 'template', 'merge', 'squash', 'commit')
-    - sha (str) =>  could be a sha1 or None, relevant only when mode is 'commit'
+    - mode (str) =>  could be one of
+                    (None, 'message', 'template', 'merge', 'squash', 'commit')
+    - sha (str) =>  a sha1 or None, not None only when mode == 'commit'
     - head (str) => sha1 of HEAD"""
     def parse(self):
+        allowedmodes = ('message', 'template', 'merge', 'squash', 'commit')
         messagefile = sys.argv[1]
         mode = None
         sha = None
         if len(sys.argv) > 2:
             mode = sys.argv[2]
         if len(sys.argv) > 3:
             sha = sys.argv[3]
-        if (mode is not None and 
-            mode not in ('message', 'template', 'merge', 'squash', 'commit')):
+        if mode is not None and mode not in allowedmodes:
             raise ValueError('Invalid Second Argument: mode')
         if mode != 'commit' and sha is not None:
             raise ValueError('Invalid Third Argument')
@@ -237,4 +263,3 @@ def parse(self):
         resolver.mode = mode
         resolver.sha = sha
         return resolver
-

hooklib_hg.py

@@ -1,14 +1,17 @@
 from mercurial import util
 import os
 
+
 class basehginputparser(object):
     def scm(self):
         return 'hg'
 
+
 class hginforesolver(basehginputparser):
     def commitmessagefor(self, rev):
         return util.popen4("hg log -r %s -T {desc}" % rev)[1].read()
 
+
 class hgupdateinputparser(basehginputparser):
     def parse(self):
         rev = os.environ['HG_NODE']