scripts/svn-diff-editor
author Tomas Zeman <tzeman@volny.cz>
Wed, 18 Dec 2013 22:16:35 +0100
changeset 40 7b691c3bba6c
parent 39 1fc1aab8014b
permissions -rwxr-xr-x
svn: open diff in second buffer
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
39
1fc1aab8014b svn commit helper (displays diff); diff must be manually deleted before committing the changes
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     1
#!/bin/sh
1fc1aab8014b svn commit helper (displays diff); diff must be manually deleted before committing the changes
Tomas Zeman <tzeman@volny.cz>
parents:
diff changeset
     2
40
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
     3
case "${EDITOR}" in
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
     4
    "")
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
     5
        EDITOR="vi"
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
     6
        ;;
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
     7
    emacs)
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
     8
        EDITOR="$EDITOR -nw"
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
     9
        ;;
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    10
    gvim|vim)
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    11
        EDITOR="$EDITOR -f -o"
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    12
        ;;
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    13
esac
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    14
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    15
SVNTMP="$1"
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    16
cleanup_exit() {
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    17
    rm -rf "$SVNTMP"
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    18
}
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    19
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    20
# Remove temporary files even if we get interrupted
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    21
trap "cleanup_exit" 0 # normal exit
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    22
trap "exit 255" HUP INT QUIT ABRT TERM
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    23
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    24
#echo >> "$2"
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    25
#cat "$1" >> "$2"
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    26
#rm "$1"
7b691c3bba6c svn: open diff in second buffer
Tomas Zeman <tzeman@volny.cz>
parents: 39
diff changeset
    27
$EDITOR "$2" "$1"