Merge lp:~jr.allen/unifield-server/pre-commit into lp:unifield-server

[Jeff Allen]

[lp:~jr.allen/unifield-server/pre-commit]

4005. By Jeff Allen on 2017-05-19

Solve problems with the _ builtin used by gettext.

Unmerged revisions

4005. By Jeff Allen on 2017-05-19

Solve problems with the _ builtin used by gettext.

4004. By Jeff Allen on 2016-10-28

Can skip by setting SKIP_PRECOMMIT=1. Essential for merge commits.

4003. By Jeff Allen on 2016-10-28

Merge

4002. By Jeff Allen on 2016-10-25

Fixed for bzr 2.1

4001. By Jeff Allen on 2016-10-24

Fix for Python 2.6

4000. By Jeff Allen on 2016-10-24

Remove non-working exclude option.

3999. By Jeff Allen on 2016-10-24

Fixed a different typo.

3998. By Jeff Allen on 2016-10-24

Fixed a typo.

3997. By Jeff Allen on 2016-10-24

Changed name to reflect what it does
Added a bzr command to do a check before trying to commit: bzr precommit

3996. By Jeff Allen on 2016-10-21

More helpful error messages.

=== added directory 'tools/precommit'
=== added file 'tools/precommit/README'
--- tools/precommit/README	1970-01-01 00:00:00 +0000
+++ tools/precommit/README	2017-05-19 10:29:56 +0000
@@ -0,0 +1,4 @@
+To start using this bazaar pre-commit hook:
+
+	mkdir $HOME/.bazaar/plugins
+	ln -s `pwd`/tools/precommit $HOME/.bazaar/plugins

=== added file 'tools/precommit/__init__.py'
--- tools/precommit/__init__.py	1970-01-01 00:00:00 +0000
+++ tools/precommit/__init__.py	2017-05-19 10:29:56 +0000
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+import subprocess
+import os
+
+from bzrlib import branch, errors
+from bzrlib.commands import Command, register_command
+from bzrlib.workingtree import WorkingTree
+
+from distutils.spawn import find_executable
+
+def precommit(local_branch, master_branch, old_revision_number, old_revision_id, future_revision_number, future_revision_id, tree_delta, future_tree):
+    if 'SKIP_PRECOMMIT' in os.environ:
+        return
+
+    files_to_check = []
+    for i in tree_delta.added, tree_delta.modified:
+        for f in i:
+            if f[0].endswith('.py'):
+                files_to_check.append(f[0])
+
+    if len(files_to_check) == 0:
+        return
+
+    for exe in [ 'autopep8', 'pyflakes' ]:
+        if find_executable(exe) is None:
+            raise errors.BzrError("Required command %s is missing." % exe)
+
+    cmd = [ 'autopep8', '--select=E1', '--diff' ]
+    cmd.extend(files_to_check)
+    res = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
+
+    if res != '':
+        cmd[2] = '--in-place'
+        raise errors.BzrError("Fix autopep8 warnings before committing. You might want to use this command: %s" % " ".join(cmd))
+
+    cmd = [ 'pyflakes' ]
+    cmd.extend(files_to_check)
+    env = os.environ.copy()
+    env["PYFLAKES_BUILTINS"]="_"
+    result = subprocess.call(cmd, env=env)
+
+    if result != 0:
+        raise errors.BzrError("Fix pyflakes warnings before committing.")
+
+
+class cmd_precommit(Command):
+    __doc__ = """Check changes with autopep8 and pyflakes.
+    """
+    takes_args = ['selected*']
+
+    def run(self, message=None, selected_list=None):
+        if hasattr(WorkingTree, "open_containing_paths"):
+            tree, selected_list = WorkingTree.open_containing_paths(selected_list)
+        else:
+            # For bzr 2.1.x
+            from bzrlib.builtins import tree_files
+            tree, selected_list = tree_files(".")
+
+        precommit(None, None, None, None, None, None, tree.changes_from(tree.basis_tree()), None)
+        print "No problems found. Ready to commit."
+
+register_command(cmd_precommit)
+branch.Branch.hooks.install_named_hook('pre_commit', precommit, 'pyflakes warnings prevent check-in')