[darcs-users] resolve Issue832: quote all instances of "$DARCS", "$ACTUAL_DARCS", "$PWD", and "$HOME" in the sh tests and test harness

David Roundy droundy at darcs.net
Sat May 3 17:00:11 UTC 2008


On Fri, May 02, 2008 at 05:03:58PM -0600, zooko wrote:
> Fri May  2 17:01:11 MDT 2008  zooko at zooko.com
>   * resolve Issue832: quote all instances of "$DARCS",  
> "$ACTUAL_DARCS", "$PWD", and "$HOME" in the sh tests and test harness

It looks like you've made changes and then inverted them and made them
again:

> replace ./tests/add.pl [A-Za-z0-9_".$] $HOME "$HOME"
> replace ./tests/add.sh [A-Za-z0-9_".$] $ACTUAL_DARCS "$ACTUAL_DARCS"
> replace ./tests/add.sh [A-Za-z0-9_".$] $DARCS "$DARCS"
> hunk ./tests/add.sh 4
> -test "$DARCS" || DARCS=$PWD/../darcs
> +test $DARCS || DARCS=$PWD/../darcs
> hunk ./tests/add.sh 9
> -"$DARCS" init
> +$DARCS init
> hunk ./tests/add.sh 11
> -"$DARCS" add foo bar
> +$DARCS add foo bar
> hunk ./tests/add.sh 15
> -  "$DARCS" add file-$i
> +  $DARCS add file-$i
> replace ./tests/add.sh [A-Za-z0-9_".$] $DARCS "$DARCS"
> hunk ./tests/add.sh 4
> -test "$DARCS" || DARCS=$PWD/../darcs
> +test $DARCS || DARCS=$PWD/../darcs
> hunk ./tests/add.sh 9
> -"$DARCS" init
> +$DARCS init
> hunk ./tests/add.sh 11
> -"$DARCS" add foo bar
> +$DARCS add foo bar
> hunk ./tests/add.sh 15
> -  "$DARCS" add file-$i
> +  $DARCS add file-$i
> replace ./tests/add.sh [A-Za-z0-9_".$] $DARCS "$DARCS"
> replace ./tests/add.sh [A-Za-z0-9_".$] $HOME "$HOME"
> replace ./tests/add.sh [A-Za-z0-9_".$] $PWD "$PWD"

Could you resubmit with a cleaner patch, that only does the replaces once?
Thanks!

David


More information about the darcs-users mailing list