From 6522da77723f593ef854adfe077a486136b103d7 Mon Sep 17 00:00:00 2001

From: Yasuhiro Kimura <yasu@utahime.org>

Date: Fri, 12 Mar 2021 23:38:32 +0900

Subject: [PATCH] Use svnlite(1) as subversion command

---

 scripts/cmd_commit.in |  6 +++---

 scripts/cmd_submit.in |  2 +-

 scripts/util_diff.in  | 10 +++++-----

 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git scripts/cmd_commit.in scripts/cmd_commit.in

index 41e5e55..e68f16e 100644

--- scripts/cmd_commit.in

+++ scripts/cmd_commit.in

@@ -56,7 +56,7 @@ echo "===> Your username on freefall: ${FREEFALL_USERNAME}"

 # Determine if this is a new port

 MODE="update"

-svn status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:'

+svnlite status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:'

 if [ $? -eq 0 ]

 then

 	MODE="new"

@@ -92,7 +92,7 @@ then

 else

 	# Make sure we are working with up-to-date version

 	echo "===> Pre-commit SVN update"

-	svn update

+	svnlite update

 	if [ -e ${MSG} ]

 	then

@@ -111,7 +111,7 @@ else

 	fi

 	# Commit the port update

 	echo "===> Committing port update"

-	svn commit ${FLAGS}

+	svnlite commit ${FLAGS}

 fi

 # Remove SVN message file only if commit was successful

diff --git scripts/cmd_submit.in scripts/cmd_submit.in

index 2f3538b..64b1d06 100644

--- scripts/cmd_submit.in

+++ scripts/cmd_submit.in

@@ -131,7 +131,7 @@ done

 # Determine if this is a new port

 if [ "${MODE}" = "" ]

 then

-	svn status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:'

+	svnlite status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:'

 	[ $? -eq 0 ] || [ "`grep '\$FreeBSD: ' Makefile`" ] || MODE="new"

 fi

diff --git scripts/util_diff.in scripts/util_diff.in

index e522218..1dee186 100644

--- scripts/util_diff.in

+++ scripts/util_diff.in

@@ -11,7 +11,7 @@ fi

 # Determine if this is a new port

 if [ "${MODE}" = "" ]

 then

-	svn status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:'

+	svnlite status Makefile 2>&1 1>/dev/null | grep -qs 'svn: warning: W155007:'

 	[ $? -eq 0 ] || [ "`grep '\$FreeBSD: ' Makefile`" ] || MODE="new"

 fi

@@ -68,7 +68,7 @@ else

 	# Determine the default diff mode

 	if [ "${DIFF_MODE}" = "" ]

 	then

-		svn info > /dev/null 2>&1

+		svnlite info > /dev/null 2>&1

 		status=$?

 		if [ $status -eq 0 ];

 		then

@@ -88,7 +88,7 @@ else

 	then

 		# If `pwd` is not a svn working copy

 		# fallback to diffing against ${PORTSDIR} tree

-		svn info > /dev/null 2>&1

+		svnlite info > /dev/null 2>&1

 		status=$?

 		if [ $status -ne 0 ]

 		then

@@ -139,7 +139,7 @@ else

 		# Run 'svn update' first

 		echo "===> Updating from SVN"

-		svn update

+		svnlite update

 		status=$?

 		if [ $status -ne 0 ]

 		then

@@ -147,7 +147,7 @@ else

 			cleanup

 			exit 1

 		fi

-		DIFF_CMD="svn diff"

+		DIFF_CMD="svnlite diff"

 	elif [ "${DIFF_MODE}" = "GIT" ]

 	then

 		DIFF_TYPE=${DIFF_MODE}

-- 

2.30.2