pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-06 12:06:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup some pep8 and flake issues

Browse source
This commit is contained in:
Evan J. Felix 2017-03-17 13:54:34 -07:00
parent 5abcaee46d
commit 6ff7af19ee
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pre_commit_hooks/no_commit_to_branch.py
View file

@ -1,9 +1,10 @@
from __future__ import print_function from __future__ import print_function
import argparse import argparse
import sys
import util import util
def is_on_branch(protected): def is_on_branch(protected):
retval = False retval = False
branch = util.cmd_output('git', 'symbolic-ref', 'HEAD') branch = util.cmd_output('git', 'symbolic-ref', 'HEAD')
@ -12,9 +13,11 @@ def is_on_branch(protected):
retval = True retval = True
return retval return retval
def main(argv=None): def main(argv=None):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-b', default='master', help='branch to disallow commits to') parser.add_argument(
'-b', default='master', help='branch to disallow commits to')
parser.add_argument('filenames', nargs='*', help='filenames to check.') parser.add_argument('filenames', nargs='*', help='filenames to check.')
args = parser.parse_args(argv) args = parser.parse_args(argv)

5
tests/check_no_commit_to_branch_test.py
View file

@ -11,14 +11,17 @@ def test_other_branch(temp_git_dir):
cmd_output('git', 'checkout', '-b', 'anotherbranch') cmd_output('git', 'checkout', '-b', 'anotherbranch')
assert is_on_branch('master') is False assert is_on_branch('master') is False
def test_master_branch(temp_git_dir): def test_master_branch(temp_git_dir):
with temp_git_dir.as_cwd(): with temp_git_dir.as_cwd():
assert is_on_branch('master') is True assert is_on_branch('master') is True
def test_main_other_call(temp_git_dir): def test_main_other_call(temp_git_dir):
with temp_git_dir.as_cwd(): with temp_git_dir.as_cwd():
cmd_output('git', 'checkout', '-b', 'other') cmd_output('git', 'checkout', '-b', 'other')
assert main(['-b','other']) == 1 assert main(['-b', 'other']) == 1
def test_main_default_call(temp_git_dir): def test_main_default_call(temp_git_dir):
with temp_git_dir.as_cwd(): with temp_git_dir.as_cwd():