autopep8 dans un pré-commit git - comment recommitaliser automatiquement?

Question

J'ai un crochet git pré-commit qui exécute autopep8 sur les fichiers tactiles python. Mon problème est que: # If there are whitespace errors, il print s the offending file names and fail s . (voir ci-dessous.)

Question:

Comment puis-je faire ajouter à nouveau et réengager les fichiers que j'ai actuellement réparer manuellement?

Merci!

#!/bin/bash 


# 
# An example hook script to verify what is about to be committed. 
# Called by "git commit" with no arguments. The hook should 
# exit with non-zero status after issuing an appropriate message if 
# it wants to stop the commit. 
# 
# To enable this hook, rename this file to "pre-commit". 

if git rev-parse --verify HEAD >/dev/null 2>&1 
then 
    against=HEAD 
else 
    # Initial commit: diff against an empty tree object 
    against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 
fi 

# If you want to allow non-ascii filenames set this variable to true. 
allownonascii=$(git config hooks.allownonascii || echo false) 

# Redirect output to stderr. 
exec 1>&2 

# Cross platform projects tend to avoid non-ascii filenames; prevent 
# them from being added to the repository. We exploit the fact that the 
# printable range starts at the space character and ends with tilde. 
if [ "$allownonascii" != "true" ] && 
    # Note that the use of brackets around a tr range is ok here, (it's 
    # even required, for portability to Solaris 10's /usr/bin/tr), since 
    # the square bracket bytes happen to fall in the designated range. 
    test $(git diff --cached --name-only --diff-filter=A -z $against | 
     LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 
then 
    echo "Error: Attempt to add a non-ascii file name." 
    echo 
    echo "This can cause problems if you want to work" 
    echo "with people on other platforms." 
    echo 
    echo "To be portable it is advisable to rename the file ..." 
    echo 
    echo "If you know what you are doing you can disable this" 
    echo "check using:" 
    echo 
    echo " git config hooks.allownonascii true" 
    echo 
    exit 1 
fi 

# If there are whitespace errors, print the offending file names and fail. 
git diff-index --check --cached $against -- 

touched_python_files=`git diff --cached --name-only |egrep '\.py$' || true` 
if [ -n "$touched_python_files" ]; then 
    autopep8 \ 
     --ignore=E26 \ 
     --in-place \ 
     --jobs=0 \ 
     --max-line-length=150 \ 
     $touched_python_files 
fi 

Answer 1

Ceci est une version modifiée du script @ steven.

Si autopep8 modifie un fichier, la validation est arrêtée (vous pouvez donc valider des diffs partiels avec git add -p sans soucis). La validation est également arrêtée si autopep8 échoue pour une raison quelconque. Malheureusement, il n'y a aucun moyen de savoir à partir de l'état de sortie ou de la sortie si autopep8 a modifié quelque chose, il doit donc être exécuté deux fois (une fois pour le diff, une fois pour l'édition).

#!/bin/sh 

status=0 
touched_python_files=$(git diff --cached --name-only | grep -E '\.py$') 
if [ -n "$touched_python_files" ]; then 
    options="\ 
     --ignore=E26 \ 
     --max-line-length=150 \ 
    " 

    output=$(autopep8 -d $options "${touched_python_files[@]}") 
    status=$? 

    if [ -n "$output" ]; then 
     autopep8 -i -j 0 $options "${touched_python_files[@]}" 
     echo ">>> autopep8 edited some files <<<" 
     exit 1 
    fi 
fi 

exit $status