src/cm/media/js/lib/flexible-js-formatting/.git/hooks/pre-commit
author gibus
Mon, 21 May 2012 16:50:42 +0200
changeset 439 8994d24e4b2f
parent 0 40c8f766c9b8
permissions -rw-r--r--
Reverts to changeset 435, and just add {% csrf_token %} to template forgot_pw.html, since CSRF protection seems to be only here (surely because of django.contrib.auth.views).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     1
#!/bin/sh
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     2
#
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     3
# An example hook script to verify what is about to be committed.
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     4
# Called by git-commit with no arguments.  The hook should
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     5
# exit with non-zero status after issuing an appropriate message if
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     6
# it wants to stop the commit.
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     7
#
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     8
# To enable this hook, make this file executable.
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
     9
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    10
# This is slightly modified from Andrew Morton's Perfect Patch.
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    11
# Lines you introduce should not have trailing whitespace.
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    12
# Also check for an indentation that has SP before a TAB.
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    13
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    14
if git-rev-parse --verify HEAD 2>/dev/null
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    15
then
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    16
	git-diff-index -p -M --cached HEAD --
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    17
else
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    18
	# NEEDSWORK: we should produce a diff with an empty tree here
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    19
	# if we want to do the same verification for the initial import.
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    20
	:
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    21
fi |
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    22
perl -e '
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    23
    my $found_bad = 0;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    24
    my $filename;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    25
    my $reported_filename = "";
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    26
    my $lineno;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    27
    sub bad_line {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    28
	my ($why, $line) = @_;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    29
	if (!$found_bad) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    30
	    print STDERR "*\n";
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    31
	    print STDERR "* You have some suspicious patch lines:\n";
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    32
	    print STDERR "*\n";
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    33
	    $found_bad = 1;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    34
	}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    35
	if ($reported_filename ne $filename) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    36
	    print STDERR "* In $filename\n";
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    37
	    $reported_filename = $filename;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    38
	}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    39
	print STDERR "* $why (line $lineno)\n";
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    40
	print STDERR "$filename:$lineno:$line\n";
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    41
    }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    42
    while (<>) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    43
	if (m|^diff --git a/(.*) b/\1$|) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    44
	    $filename = $1;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    45
	    next;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    46
	}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    47
	if (/^@@ -\S+ \+(\d+)/) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    48
	    $lineno = $1 - 1;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    49
	    next;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    50
	}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    51
	if (/^ /) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    52
	    $lineno++;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    53
	    next;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    54
	}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    55
	if (s/^\+//) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    56
	    $lineno++;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    57
	    chomp;
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    58
	    if (/\s$/) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    59
		bad_line("trailing whitespace", $_);
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    60
	    }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    61
	    if (/^\s* \t/) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    62
		bad_line("indent SP followed by a TAB", $_);
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    63
	    }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    64
	    if (/^([<>])\1{6} |^={7}$/) {
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    65
		bad_line("unresolved merge conflict", $_);
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    66
	    }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    67
	}
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    68
    }
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    69
    exit($found_bad);
40c8f766c9b8 import from internal svn r 4007
raph
parents:
diff changeset
    70
'