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
 
 if git st >/dev/null 2>&1; then
     IMPORT="git apply"
 elif hg st >/dev/null 2>&1; then
     IMPORT="hg import --no-commit -"

[juliandoucette, 2017/08/25 12:07:12]

There is no --no-commit option for hg import?

(I'm using the latest version of mercurial provided by homebrew)

[Sebastian Noack, 2017/08/25 12:12:18]

There is, at least in Mercurial 4.0, which is included in Debian Stretch. But
IMO this script would be more useful if the changes get automatically committed
anyway.

[juliandoucette, 2017/08/25 12:21:28]

I'm using hg --version
Mercurial Distributed SCM (version 4.3.1)
(see https://mercurial-scm.org for more information)

Copyright (C) 2005-2017 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

I agree with you. But the import doesn't succeed because mercurial complains
about there being no --no-commit option.

[Sebastian Noack, 2017/08/25 13:49:53]

I'm still confused why the --no-commit option is causing problems for Julian,
since he is on an even newer version than me, and according to the documentation
that option hasn't been removed or even deprecated. But yeah, making the script
always commit seems preferable to me, anyway. 

 else
     echo "No repository found in `pwd`"
     exit 2
 fi
 
+BASEDIR=$(dirname "$0")
+if [ -f "$BASEDIR/patchconv.py" ]; then
+    alias patchconv="$BASEDIR/patchconv.py"
+fi
+
 if [ -f "$1" ]; then
     patchconv < "$1" | $IMPORT
 else
     curl "$1" | patchconv | $IMPORT
 fi