[Intel-gfx] [maintainer-tools PATCH 13/30] qf: Move "wiggle-push" from case to new subcommand.

Rodrigo Vivi rodrigo.vivi at intel.com
Mon Aug 21 20:11:03 UTC 2017


No functional change. Only moving from the case
to its own function.

Cc: Jani Nikula <jani.nikula at intel.com>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 qf | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/qf b/qf
index 565c97f5de92..333ca7ca45fe 100755
--- a/qf
+++ b/qf
@@ -170,23 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	wiggle-push|wp)
-		cd_toplevel
-		repo_check 1
-
-		conflict_files=`quilt push -f | grep "saving rejects" | sed -e "s/.*saving rejects to file \(.*\)/\1/"`
-
-		if [[ $conflict_files != "" ]] ; then
-			echo conflicts found!
-		fi
-
-		for file in $conflict_files ; do
-			echo wiggling in ${file%.rej}:
-			#cat $file
-			rm -f ${file%.rej}.porig
-			wiggle -r ${file%.rej} $file || true
-		done
-		;;
 	resolved)
 		quilt refresh
 		quilt header -e
@@ -491,6 +474,26 @@ function qf_stage
 	echo All applied patches successfully staged
 }
 
+qf_alias_wp=wiggle_push
+function qf_wiggle_push
+{
+	cd_toplevel
+	repo_check 1
+
+	conflict_files=`quilt push -f | grep "saving rejects" | sed -e "s/.*saving rejects to file \(.*\)/\1/"`
+
+	if [[ $conflict_files != "" ]] ; then
+		echo conflicts found!
+	fi
+
+	for file in $conflict_files ; do
+		echo wiggling in ${file%.rej}:
+		#cat $file
+		rm -f ${file%.rej}.porig
+		wiggle -r ${file%.rej} $file || true
+	done
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2



More information about the Intel-gfx mailing list