Noissue - Add helper script to import changes from Rietveld reviews

patchconv/rapply.sh

 #!/bin/sh
 #
 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 set -eu
 
 if [ $# -lt 1 ]; then
     echo "usage: rapply.sh PATCH"
     exit 1
 fi
 
-MESSAGE="rapply.sh $1"
 if git st >/dev/null 2>&1; then
-    alias IMPORT="git apply --index && git commit -m '$MESSAGE'"

[Sebastian Noack, 2017/08/25 16:40:38]

As per the discussion on IRC, sorry, for some reason I assumed we have the
metadata (including the commit message) in the converted patch. But of course,
we don't. Hence having rapply.sh commit the changes doesn't make much sense, in
the end. In fact it increases the risk that people push commits imported from
Rietveld with wrong commit message and author.

[Vasily Kuznetsov, 2017/08/25 18:52:14]

Done.

+    IMPORT="git apply"
 elif hg st >/dev/null 2>&1; then
-    alias IMPORT="hg import -m '$MESSAGE' -"
+    IMPORT="hg import --no-commit -"
 else
     echo "No repository found in `pwd`"
     exit 2
 fi
 
-BASEDIR=$(dirname $0)
+BASEDIR=$(dirname "$0")
 if [ -f "$BASEDIR/patchconv.py" ]; then
-    alias PATCHCONV="python $BASEDIR/patchconv.py"

[Sebastian Noack, 2017/08/25 16:40:38]

patchconv.py is executable. Specifying the interpreter is redundant.

[Vasily Kuznetsov, 2017/08/25 18:52:14]

Done.

-elif which -s patchconv; then
-    alias PATCHCONV=patchconv
-else
-    echo "Can't find patchconv in the PATH or in $BASEDIR."

[Sebastian Noack, 2017/08/25 16:40:38]

This error message and the `which ...` check above seems superfluous. Just fail
with the native error, you get when trying to call patchconv?

[Vasily Kuznetsov, 2017/08/25 18:52:14]

Done.

-    exit 4
+    alias patchconv="$BASEDIR/patchconv.py"
 fi
 
 if [ -f "$1" ]; then
-    PATCHCONV < "$1" | IMPORT
+    patchconv < "$1" | $IMPORT
 else
-    curl "$1" | PATCHCONV | IMPORT
+    curl "$1" | patchconv | $IMPORT
 fi