Commit graph

160 commits

Author SHA1 Message Date
William Ting
c92b46587d Add diff3 conflictstyle support for git merge conflicts. 2016-04-30 20:35:33 -07:00
Anthony Sottile
03bf17f2b0 Add a --remove option to fix-encoding-pragma 2016-04-27 11:18:14 -07:00
Anthony Sottile
ea867c2e68 Merge pull request #109 from mattclegg/no-sort-keys
Adding no-sort-keys to pretty_format_json
2016-04-14 08:11:26 -07:00
mattclegg
bd4e37c366 Add test for '--no-sort-keys' 2016-04-14 10:41:39 +01:00
Anthony Sottile
fe9c404019 Forbid files with a UTF-8 BOM 2016-03-18 10:59:31 -07:00
Anthony Sottile
d444ab821d Improve error message when credentials file is not provided 2016-02-08 17:18:56 -08:00
Anthony Sottile
da882286e3 Skip the symlink tests on windows 2016-01-14 19:03:11 -08:00
Benjamin Chess
896c0cfdc0 new hook tests for broken symlinks 2016-01-14 15:25:46 -08:00
Anthony Sottile
3f6f23d73f Teach check-large-files-added about git-lfs. Reslves #82. 2015-12-28 05:38:06 -08:00
Anthony Sottile
7376a29d69 Write to temp directories in such a way that files get cleaned up 2015-12-26 10:58:33 -08:00
Anthony Sottile
3a3a7a153a Run pre-commit during test 2015-12-25 09:42:17 -08:00
phoxelua
58edfc8af6 Fixed regex matching 2015-11-19 00:39:29 -08:00
Anthony Sottile
aa2ba6f94f Add encoding pragma hook. Resolves pre-commit/pre-commit#15 2015-11-13 12:39:43 -08:00
Chris Kuehl
a1b0104f3d Sort requirements.txt case-insensitively 2015-08-17 12:43:13 -07:00
Anthony Sottile
8a8aaf5a60 Add a hook to verify python ast. 2015-08-04 13:48:30 -07:00
Chris Kuehl
ca2be345a1 detect_private_key: print *filenames*, not the key 2015-08-01 17:02:29 -07:00
Anthony Sottile
99574324eb Merge pull request #60 from arahayrabedian/master
AWS credential checking
2015-06-17 11:46:15 -07:00
Ara Hayrabedian
02e8bdc9d8 add tests, test sample files and minor refactor of exit codes in actual hook in order to facilitate testing 2015-06-12 19:20:56 +04:00
Anthony Sottile
07c938e1b1 Allow arbitrary binary to pass the private key hook check. Resolves #64 2015-06-11 13:28:10 -07:00
Léo Cavaillé
55bf22dc4a Add new hook pretty-format-json
This new hook allows to standardize one's JSON files (sorted key/4
spaces indent).
By default it just fails if any file is not complying with the standard,
but you can also pass the arg `--autofix` and the hook will
pretty-format the file itself.

Good in use combined with the `check-json` hook.
2015-06-11 00:08:03 -04:00
Anthony Sottile
f138e3451b Update hooks 2015-05-31 13:51:02 -07:00
Alexander Dupuy
a6023ac0d7 Implement Markdown trailing space line break preservation
Markdown uses two or more trailing spaces on a line to indicate a forced
line break `<br/>` - these will be preserved for files with a markdown
extension (default = `.md` or `.markdown`).

Add `--markdown-linebreak-ext=X,Y` to add extensions (`*` matches any),
and `--no-markdown-linebreak-ext` to disable this feature.

If you want to set specific extension `foo` only (and not md/markdown),
use `--no-markdown-linebreak-ext --markdown-linebreak-ext=foo`

Tries to prevent --markdown-linebreak-ext from eating filenames as if they were
extensions by rejecting any with '.' or '/' (or even Windows-style '\' or ':')

Update README.md to include information on these arguments as well as
arguments added to other hooks

Add extensive tests using pytest.mark.parametrize

test that `txt` file is not considered as 'txt' extension
test that `.txt` file is not considered as 'txt' extension

The latter is the (correct) behavior of os.path.splitext(), and an example
of why it is better to use the libraries than to mangle strings yourself.
2015-05-11 08:52:32 +02:00
Alexander Dupuy
5c752935fd Refactor check-merge-conflicts tests
Do a straight test of detecting a real merge conflict as generated by git.
Test artificial conflict detection while pending merge without a real conflict.
Test artificial non-conflict non-detection in a resolved merge conflict.
Rename test_does_not_care... function to reflect what we want to care about.
Rename is_in_merge_conflict to is_in_merge since that is what it checks.
2015-05-09 04:29:38 +02:00
Alexander Dupuy
eefc46f901 Don't report markup titles as merge conflicts
Several markup formats, such as Markdown or Re(Structured)Text
can format titles as text with '=' characters as double underlining,
like this:
```
My Page Title
=============

Lorem ipsum...
```

Rather that considering any line starting with seven '=' as a conflict marker,
require a space (or line-ending newline) after the equals.
This could still create a false positive for a seven character title,
like "Problem", but the markup formats generally allow extra '=' characters,
so by formatting the text like this:
```
Problem
========

Not...
```
these pre-commit warnings can be avoided.

Also updates the tests to add newlines for more realistic conflict files
(while a file might not end with a newline, conflict markers will).
Prevent false negative on test_does_not_care_when_not_in_a_conflict()
by making sure that README.md contains a line identical to a conflict string
(exactly seven '=' followed by a newline).
2015-05-09 04:20:38 +02:00
Anthony Sottile
635fa7dd9d Only check merge conflicts on conflict commits 2015-03-20 16:21:02 -07:00
Anthony Sottile
713fab4bc7 Remove dependency on plumbum 2015-03-20 14:15:30 -07:00
Guy Kisel
779a42919a Add check-merge-conflict hook 2015-03-13 16:30:14 -07:00
Guy Kisel
db4b8f02f3 Add --django flag to test name checker 2015-03-11 17:44:59 -07:00
Cameron Paul
68a7729327 Detect OpenSSH private keys 2015-03-07 09:35:30 -08:00
Anthony Sottile
d96cef92c9 Respect autopep8 config. Resolves #38. 2015-02-26 18:23:52 -08:00
Anthony Sottile
151d485a81 More naturally sort requirements. 2015-02-12 09:30:17 -08:00
Anthony Sottile
2983d4478f Use the tokenizer for great success 2015-02-10 08:17:35 -08:00
Ken Struys
12f02dfeb8 implemented a basic double quote string fixer 2015-02-08 21:05:12 -08:00
Anthony Sottile
a8b89150ff Add test for readme 2015-01-18 09:48:14 -08:00
Anthony Sottile
ddc9208a5f Add check-xml hook. 2015-01-17 10:30:58 -08:00
gkisel
c682b50749 Add check_case_conflict hook #21 2015-01-12 15:38:22 -08:00
Anthony Sottile
b08f834d65 Update pre-commit hooks 2015-01-04 16:05:54 -08:00
Anthony Sottile
53f1dc0163 Add check-docstring-first hook. 2015-01-04 13:06:21 -08:00
Anthony Sottile
2f1d2bbe5b Remove @entry decorator (and misc cleanup) 2015-01-04 11:08:53 -08:00
Anthony Sottile
e0a6e66528 Add check-added-large-files hook 2014-12-31 12:21:21 -08:00
Cameron Paul
b83ea591b5 Added requirements.txt hook 2014-12-16 12:39:03 -08:00
Anthony Sottile
86b1c9da8e Add autopep8-wrapper hook. 2014-08-22 11:00:43 -07:00
Anthony Sottile
243fe50bc1 Add a hook for checking parseable json. 2014-08-19 16:03:48 -07:00
Anthony Sottile
830ea6d8c8 Give a better message when ast is not parseable. 2014-06-19 17:44:40 -07:00
Anthony Sottile
00d5904b80 Fix pylint. 2014-06-01 16:08:31 -07:00
Anthony Sottile
ba80c884f8 Fix PyPy 2014-04-13 22:53:54 -07:00
Anthony Sottile
8328f8f518 Fix Python2.6 coverage. 2014-04-13 22:31:47 -07:00
Anthony Sottile
8270d81308 Improve test coverage. 2014-04-13 22:21:42 -07:00
Anthony Sottile
b80ca9e84a Update project setup. 2014-04-13 22:09:26 -07:00
Anthony Sottile
203256bcb3 Remove meta test as hooks are now skipped with no files. 2014-04-13 17:49:52 -07:00