gitask: make copy run test-only explicitly

bin/gitask

@@ -147,7 +147,19 @@ if [ "$1" = "acl" ] ; then
 		exit
 	fi
 	shift
-	BINARYREPO=$(set_if_matched $1 "Sisyphus [ptc][6-9] [ptc][6-9]\.[0-9]") && shift
+	if [ "$1" = "-h" ] || [ -z "$1" ] ; then
+		echo "Usage: gita acl [BRANCH] PACKAGE [COMMAND [USER]]"
+		echo "  BRANCH: Sisyphus (default), p10, p11, c10f2, etc."
+		echo "  COMMAND: show (default), add, del, leader"
+		echo "Examples:"
+		echo "  gita acl PACKAGE [show]       - show ACL for Sisyphus"
+		echo "  gita acl p10 PACKAGE [show]   - show ACL for p10"
+		echo "  gita acl PACKAGE add USER     - add user to ACL"
+		echo "  gita acl PACKAGE del USER     - remove user from ACL"
+		echo "  gita acl PACKAGE leader USER  - set package leader"
+		exit
+	fi
+	BINARYREPO=$(set_if_matched $1 "Sisyphus [ptc][0-9] [ptc][0-9][0-9] [ptc][0-9][0-9]f[0-9]") && shift
 	PROJECTNAME="$1"
 	COMMAND="$2"
 	[ -z "$COMMAND" ] && COMMAND="show"
@@ -286,7 +298,7 @@ if [ "$1" = "copy" ] ; then
 	for PACKAGE in $PACKAGELIST ; do
 		docmd ssh $GEARHOST task add $TASK copy $PACKAGE $FROMSTR || fatal
 	done
-	docmd ssh $GEARHOST task run $TASK
+	docmd ssh $GEARHOST task run --test-only $TASK
 	exit
 fi
 
@@ -478,7 +490,11 @@ if [ "$1" = "approve" ] ; then
 	[ -n "$SUBTASK" ] || fatal "Subtask number required"
 
 	showcmd ssh $GEARHOST task approve "$TASK" "$SUBTASK"
+	if [ -n "$MESSAGETEXT" ] ; then
 		echo "$MESSAGETEXT" | ssh $GEARHOST task approve "$TASK" "$SUBTASK"
+	else
+		ssh $GEARHOST task approve "$TASK" "$SUBTASK"
+	fi
 	exit
 fi
 
@@ -496,4 +512,3 @@ if [ "$1" = "task" ] ; then
 fi
 
 docmd ssh $GEARHOST task "$@"
-