[maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand.

[maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand.

[Rodrigo Vivi]

These sequences here are already covered by `qf git` subcommand.
I double checked and confirmed that our continuously rebasing
bot does not use this qf directly here and I'm not aware
of anyone else using it. So let's remove it so we can start
handling everything with subcommands (dim style).

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 qf     | 7 +------
 qf.rst | 7 -------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/qf b/qf
index 1f056f90ef70..d1c331023230 100755
--- a/qf
+++ b/qf
@@ -480,12 +480,7 @@ case "$1" in
 		shift
 		gitk "$@"
 		;;
-	help)
-		qf_help
-		;;
 	*)
-		cd_toplevel
-		cd patches
-		git "$@"
+		qf_help
 		;;
 esac
diff --git a/qf.rst b/qf.rst
index 902b0d377f41..f0019d76c53d 100644
--- a/qf.rst
+++ b/qf.rst
@@ -233,13 +233,6 @@ help
 ----
 This help text here
 
-all other subcommands - IMPORTANT
----------------------------------
-Any other subcommands are executed directly in the quilt patches
-directory as git commans. When using quilt flow in scripts it is
-import to use the explicit forwarding to avoid clashes with
-furture extensions.
-
 CONTRIBUTING
 ============
 
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 02/30] qf: Introduce subcommand and aliases

[Rodrigo Vivi]

Let's start refreshing qf a bit by introducing
subcommand and aliases like dim.

The goal is to have an standardized qf and dim
where both have same style, documentation and
also that is in a format that we can easily
introduce to make check.

Actually all new code here is a simple copy
from dim directly with s/dim/qf.

This patch also introduce qf_usage,
qf_list_commands qf_list_aliases and already
 move qf_help from the case parse $1 to a
subcommand.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 Makefile |   5 ++++
 qf       | 102 +++++++++++++++++++++++++++++++++++++++++++++++----------------
 qf.rst   |  14 +++++++++
 3 files changed, 96 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index adf26126e27c..7cb22d2b1e06 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,11 @@ mancheck:
 			echo "$@: $$cmd not documented"; \
 		fi \
 	done
+	@for cmd in $$(./qf list-commands); do \
+		if ! grep -q "^$$cmd" qf.rst; then \
+			echo "$@: $$cmd not documented"; \
+		fi \
+	done
 	rst2man --strict --no-raw dim.rst >/dev/null
 	rst2man --strict --no-raw qf.rst >/dev/null
 
diff --git a/qf b/qf
index d1c331023230..c02fb75a4e3a 100755
--- a/qf
+++ b/qf
@@ -169,28 +169,6 @@ function quilt_clean_check
 	fi
 }
 
-function qf_help
-{
-	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-	if [ ! -e "$manpage" ]; then
-		manpage=$(dirname $(readlink -f $0))/qf.rst
-		if [ ! -e "$manpage" ]; then
-			echo "Can't find the man page."
-			exit 1
-		fi
-	fi
-
-	if hash rst2man 2>/dev/null; then
-		renderer=rst2man
-		pager="man -l -"
-	else
-		renderer=cat
-		pager=${PAGER:-cat}
-	fi
-
-	$renderer < $manpage | $pager
-}
-
 case "$1" in
 	setup)
 		cd `git rev-parse --show-toplevel`
@@ -480,7 +458,81 @@ case "$1" in
 		shift
 		gitk "$@"
 		;;
-	*)
-		qf_help
-		;;
 esac
+
+qf=$(basename $0)
+
+# first positional argument is the subcommand
+if [ -n "$HELP" ] || [ "$#" = "0" ]; then
+    subcommand="usage"
+else
+    subcommand="$1"
+    shift
+fi
+
+function qf_help
+{
+	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
+	if [ ! -e "$manpage" ]; then
+		manpage=$(dirname $(readlink -f $0))/qf.rst
+		if [ ! -e "$manpage" ]; then
+			echo "Can't find the man page."
+			exit 1
+		fi
+	fi
+
+	if hash rst2man 2>/dev/null; then
+		renderer=rst2man
+		pager="man -l -"
+	else
+		renderer=cat
+		pager=${PAGER:-cat}
+	fi
+
+	$renderer < $manpage | $pager
+}
+
+function qf_list_commands
+{
+	declare -F | grep -o " qf_[a-zA-Z_]*" | sed 's/^ qf_//;s/_/-/g'
+}
+
+function qf_list_aliases
+{
+	# use posix mode to omit functions in set output
+	( set -o posix; set ) | grep "^qf_alias_[a-zA-Z0-9_]*=" |\
+		sed 's/^qf_alias_//;s/=/\t/;s/_/-/g'
+}
+
+function qf_usage
+{
+	echo "usage: $qf SUBCOMMAND [ARGUMENTS]"
+	echo
+	echo "The available subcommands are:"
+	if hash column 2>/dev/null; then
+		qf_list_commands | column -c 72 | sed 's/^/\t/'
+	else
+		qf_list_commands | sed 's/^/\t/'
+	fi
+	echo
+	echo "See '$qf help' for more information."
+}
+
+# qf subcommand aliases (with bash 4.3+)
+if ! declare -n subcmd=qf_alias_${subcommand//-/_} &> /dev/null || \
+		test -z "${subcmd:-}"; then
+	subcmd="$subcommand"
+fi
+
+# look up the function by the subcommand name
+subcmd_func=qf_${subcmd//-/_}
+if ! declare -f $subcmd_func >/dev/null; then
+	echo "'$subcommand' is not a qf command."
+	qf_usage
+	exit 1
+fi
+
+# throw away to not confuse list-aliases
+unset subcmd
+
+$subcmd_func "$@"
diff --git a/qf.rst b/qf.rst
index f0019d76c53d..ed5c199baff4 100644
--- a/qf.rst
+++ b/qf.rst
@@ -95,6 +95,16 @@ $ qf git bisect new|old
 COMMANDS
 ========
 
+list-aliases
+------------
+List all aliases for the subcommand names.
+
+See \$qf_alias_<alias> under ENVIRONMENT below on how to define aliases.
+
+list-commands
+-------------
+List all subcommand names, including aliases.
+
 setup [*branch-name*]
 ---------------------
 Sets up a git repository for this quilt worflow script by
@@ -233,6 +243,10 @@ help
 ----
 This help text here
 
+usage
+-----
+Short form usage help listing all subcommands.
+
 CONTRIBUTING
 ============
 
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 03/30] qf: Move "setup" from case to new subcommand.

[Rodrigo Vivi]

No functional change, only moving from the
case to its own function, with the arguments now shifted.

It seems that the argument for branch_init is useles,
but I will keep it for now to avoid any change
that is not related to the new subcommand scheme.

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

diff --git a/qf b/qf
index c02fb75a4e3a..0f8c706763f8 100755
--- a/qf
+++ b/qf
@@ -170,36 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	setup)
-		cd `git rev-parse --show-toplevel`
-
-		if [[ -d patches ]] ; then
-			if [[ ! -d patches/.git ]] ; then
-				echo patches/ directory exists, but not initialized.
-				echo Please fix manually.
-				exit 11
-			fi
-
-			echo Quilt repo already set up.
-		else
-			repo_init
-		fi
-
-
-		if [[ -n $2 ]] ; then
-			if ! git branch | grep $2 &> /dev/null ; then
-				echo $2 is not a branch in the main repo, aborting.
-				exit 13
-			fi
-
-			branch=$2
-			quilt_branch=$QUILT_PREFIX$branch
-			baseline=`git rev-parse $2`
-			remote=`git config branch.$branch.remote`
-
-			branch_init $3
-		fi
-		;;
 	checkout|co)
 		cd_toplevel
 
@@ -470,6 +440,37 @@ else
     shift
 fi
 
+function qf_setup
+{
+	cd `git rev-parse --show-toplevel`
+
+	if [[ -d patches ]] ; then
+		if [[ ! -d patches/.git ]] ; then
+			echo patches/ directory exists, but not initialized.
+			echo Please fix manually.
+			exit 11
+		fi
+
+		echo Quilt repo already set up.
+	else
+		repo_init
+	fi
+
+	if [[ -n $1 ]] ; then
+		if ! git branch | grep $1 &> /dev/null ; then
+			echo $1 is not a branch in the main repo, aborting.
+			exit 13
+		fi
+
+		branch=$1
+		quilt_branch=$QUILT_PREFIX$branch
+		baseline=`git rev-parse $1`
+		remote=`git config branch.$branch.remote`
+
+		branch_init $2
+	fi
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 04/30] qf: Move "checkout" from case to new subcommand.

[Rodrigo Vivi]

No functional change. Only moving from the
case to its own function, with the arguments now shifted.

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

diff --git a/qf b/qf
index 0f8c706763f8..cc8bd9023365 100755
--- a/qf
+++ b/qf
@@ -170,28 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	checkout|co)
-		cd_toplevel
-
-		cd patches
-		# -q to avoid status checks - the strange remote situation
-		# confuses git and takes forever to analyze
-		if git rev-parse $2 &> /dev/null ; then
-			# raw mode
-			quilt_branch=$2
-		else
-			# quilt branch mode
-			quilt_branch=$QUILT_PREFIX$2
-		fi
-		git checkout $quilt_branch -q
-		cd ..
-		# error code 2 means no patches removed, which is ok
-		quiet_pop_all -f
-		baseline=`source patches/config ; echo $BASELINE`
-		checkout_baseline
-		quilt push -a -q > /dev/null
-		echo Now at `quilt top`
-		;;
 	rebase)
 		cd_toplevel
 		repo_check 0
@@ -471,6 +449,31 @@ function qf_setup
 	fi
 }
 
+qf_alias_co=checkout
+function qf_checkout
+{
+	cd_toplevel
+
+	cd patches
+	# -q to avoid status checks - the strange remote situation
+	# confuses git and takes forever to analyze
+	if git rev-parse $1 &> /dev/null ; then
+		# raw mode
+		quilt_branch=$1
+	else
+		# quilt branch mode
+		quilt_branch=$QUILT_PREFIX$1
+	fi
+	git checkout $quilt_branch -q
+	cd ..
+	# error code 2 means no patches removed, which is ok
+	quiet_pop_all -f
+	baseline=`source patches/config ; echo $BASELINE`
+	checkout_baseline
+	quilt push -a -q > /dev/null
+	echo Now at `quilt top`
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 05/30] qf: Move "rebase" from case to new subcommand.

[Rodrigo Vivi]

No functional change. Only moving from the case
to its own function, with the arguments now shifted.

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

diff --git a/qf b/qf
index cc8bd9023365..f858d6e67dba 100755
--- a/qf
+++ b/qf
@@ -170,27 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	rebase)
-		cd_toplevel
-		repo_check 0
-
-		if [[ -z $2 ]] ; then
-			echo No commit given
-			exit 4
-		fi
-
-		new_baseline=`git rev-parse $2`
-
-		current_top=`quilt top`
-		quiet_pop_all
-		echo Resetting baseline to $new_baseline
-		git reset --hard $new_baseline
-		sed -e "s/BASELINE=.*$/BASELINE=$new_baseline/" -i patches/config
-		git update-ref refs/baselines/$branch/$new_baseline $new_baseline
-
-		quilt push $current_top -q
-
-		;;
 	refresh)
 		cd_toplevel
 		repo_check 0
@@ -474,6 +453,28 @@ function qf_checkout
 	echo Now at `quilt top`
 }
 
+function qf_rebase
+{
+	cd_toplevel
+	repo_check 0
+
+	if [[ -z $1 ]] ; then
+		echo No commit given
+		exit 4
+	fi
+
+	new_baseline=`git rev-parse $1`
+
+	current_top=`quilt top`
+	quiet_pop_all
+	echo Resetting baseline to $new_baseline
+	git reset --hard $new_baseline
+	sed -e "s/BASELINE=.*$/BASELINE=$new_baseline/" -i patches/config
+	git update-ref refs/baselines/$branch/$new_baseline $new_baseline
+
+	quilt push $current_top -q
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 06/30] qf: Move "refresh" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index f858d6e67dba..9b7917e214a4 100755
--- a/qf
+++ b/qf
@@ -170,26 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	refresh)
-		cd_toplevel
-		repo_check 0
-
-		changed_files=`qf git status --porcelain | wc -l`
-
-		if [[ $changed_files -gt 0 ]] ; then
-			echo Quilt patch dir not clean, aborting
-			exit
-		fi
-
-		quiet_pop_all
-
-		while quilt push ; do
-			quilt refresh
-		done
-
-		# ignore "nothing to commit"
-		qf git commit -a -m "Refreshing all patches." || true
-		;;
 	clean-patches)
 		cd_toplevel
 		repo_check 0
@@ -475,6 +455,28 @@ function qf_rebase
 	quilt push $current_top -q
 }
 
+function qf_refresh
+{
+	cd_toplevel
+	repo_check 0
+
+	changed_files=`qf git status --porcelain | wc -l`
+
+	if [[ $changed_files -gt 0 ]] ; then
+		echo Quilt patch dir not clean, aborting
+		exit
+	fi
+
+	quiet_pop_all
+
+	while quilt push ; do
+		quilt refresh
+	done
+
+	# ignore "nothing to commit"
+	qf git commit -a -m "Refreshing all patches." || true
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 07/30] qf: Move "export" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index 9b7917e214a4..9ee0a051142e 100755
--- a/qf
+++ b/qf
@@ -170,60 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	clean-patches)
-		cd_toplevel
-		repo_check 0
-
-		for patch in patches/*.patch ; do
-			if grep "^${patch##patches/}$" patches/series &> /dev/null ; then
-				continue
-			fi
-			echo No reference to $patch, deleting it.
-			rm $patch
-		done
-		;;
-	export)
-		cd_toplevel
-		repo_check 0
-		quilt_clean_check
-
-		username=$GIT_COMMMITTER_NAME
-		username=${username:-`git config user.name || true`}
-		username=${username:-`getent passwd $USER | cut -d: -f 5 | cut -d, -f 1 || true`}
-		useremail=$GIT_COMMMITTER_EMAIL
-		useremail=${useremail:-`git config user.email || true`}
-		useremail=${useremail:-$EMAIL}
-
-		if [[ -z $useremail || -z $username ]] ; then
-			echo User name/email not found, please fix your config
-			exit 17
-		fi
-
-		echo Exporting quilt pile $branch
-
-		quiet_pop_all
-
-		git reset --hard
-		if [[ $quilt_branch = HEAD ]] ; then
-			git checkout --detach
-		else
-			git checkout -B $branch
-		fi
-
-		git quiltimport --author "$username <$useremail>"
-
-		quilt_ref=`cd patches ; git rev-parse --abbrev-ref HEAD`
-		quilt_sha_abbrev=`cd patches ; git rev-parse --short HEAD`
-		quilt_sha=`cd patches ; git rev-parse HEAD`
-
-		git update-ref -m "export $quilt_ref:$quilt_sha_abbrev to $branch" refs/QUILT_EXPORT `git rev-parse HEAD`
-		git notes --ref quilt add -m "Quilt-Commit: $quilt_sha" $branch
-
-		checkout_baseline
-
-		quilt push -a -q
-
-		;;
 	export-visualize|ev)
 		cd_toplevel
 		repo_check 1
@@ -477,6 +423,63 @@ function qf_refresh
 	qf git commit -a -m "Refreshing all patches." || true
 }
 
+function qf_clean_patches
+{
+	cd_toplevel
+	repo_check 0
+
+	for patch in patches/*.patch ; do
+		if grep "^${patch##patches/}$" patches/series &> /dev/null ; then
+			continue
+		fi
+		echo No reference to $patch, deleting it.
+		rm $patch
+	done
+}
+
+function qf_export
+{
+	cd_toplevel
+	repo_check 0
+	quilt_clean_check
+
+	username=$GIT_COMMMITTER_NAME
+	username=${username:-`git config user.name || true`}
+	username=${username:-`getent passwd $USER | cut -d: -f 5 | cut -d, -f 1 || true`}
+	useremail=$GIT_COMMMITTER_EMAIL
+	useremail=${useremail:-`git config user.email || true`}
+	useremail=${useremail:-$EMAIL}
+
+	if [[ -z $useremail || -z $username ]] ; then
+		echo User name/email not found, please fix your config
+		exit 17
+	fi
+
+	echo Exporting quilt pile $branch
+
+	quiet_pop_all
+
+	git reset --hard
+	if [[ $quilt_branch = HEAD ]] ; then
+		git checkout --detach
+	else
+		git checkout -B $branch
+	fi
+
+	git quiltimport --author "$username <$useremail>"
+
+	quilt_ref=`cd patches ; git rev-parse --abbrev-ref HEAD`
+	quilt_sha_abbrev=`cd patches ; git rev-parse --short HEAD`
+	quilt_sha=`cd patches ; git rev-parse HEAD`
+
+	git update-ref -m "export $quilt_ref:$quilt_sha_abbrev to $branch" refs/QUILT_EXPORT `git rev-parse HEAD`
+	git notes --ref quilt add -m "Quilt-Commit: $quilt_sha" $branch
+
+	checkout_baseline
+
+	quilt push -a -q
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 08/30] qf: Move "export-visualize" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index 9ee0a051142e..d9650f44e370 100755
--- a/qf
+++ b/qf
@@ -170,12 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	export-visualize|ev)
-		cd_toplevel
-		repo_check 1
-
-		gitk QUILT_EXPORT ^$baseline
-		;;
 	push)
 		cd_toplevel
 		repo_check 0
@@ -480,6 +474,15 @@ function qf_export
 	quilt push -a -q
 }
 
+qf_alias_ev=export-visualize
+function qf_export_visualize
+{
+	cd_toplevel
+	repo_check 1
+
+	gitk QUILT_EXPORT ^$baseline
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 09/30] qf: Move "push" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index d9650f44e370..1e5594eaf223 100755
--- a/qf
+++ b/qf
@@ -170,33 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	push)
-		cd_toplevel
-		repo_check 0
-		quilt_clean_check
-
-		remote=`git config branch.$branch.remote`
-
-		export_quilt_sha=`git notes --ref=quilt show $branch | grep Quilt-Commit | cut -d ' ' -f 2`
-		quilt_sha=`cd patches ; git rev-parse $quilt_branch`
-
-		if [[ $export_quilt_sha != $quilt_sha ]] ; then
-			echo Quilt export is out of date, aborting
-			echo $export_quilt_sha
-			echo $quilt_sha
-			exit 18
-		fi
-
-		cd patches
-		git push $remote $quilt_branch:refs/quilts/$branch
-		cd ..
-
-		# The exported branch is a rebasing one, so force the push.
-		# Everything else shouldn't ever need a force-push.
-		git push $remote $branch -f
-
-		git push $remote refs/baselines/$branch/*:refs/baselines/$branch/*
-		;;
 	fetch)
 		cd_toplevel
 		repo_check 0
@@ -483,6 +456,35 @@ function qf_export_visualize
 	gitk QUILT_EXPORT ^$baseline
 }
 
+function qf_push
+{
+	cd_toplevel
+	repo_check 0
+	quilt_clean_check
+
+	remote=`git config branch.$branch.remote`
+
+	export_quilt_sha=`git notes --ref=quilt show $branch | grep Quilt-Commit | cut -d ' ' -f 2`
+	quilt_sha=`cd patches ; git rev-parse $quilt_branch`
+
+	if [[ $export_quilt_sha != $quilt_sha ]] ; then
+		echo Quilt export is out of date, aborting
+		echo $export_quilt_sha
+		echo $quilt_sha
+		exit 18
+	fi
+
+	cd patches
+	git push $remote $quilt_branch:refs/quilts/$branch
+	cd ..
+
+	# The exported branch is a rebasing one, so force the push.
+	# Everything else shouldn't ever need a force-push.
+	git push $remote $branch -f
+
+	git push $remote refs/baselines/$branch/*:refs/baselines/$branch/*
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 10/30] qf: Move "fetch" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index 1e5594eaf223..6413c2dd4732 100755
--- a/qf
+++ b/qf
@@ -170,20 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	fetch)
-		cd_toplevel
-		repo_check 0
-
-		remote=`git config branch.$branch.remote`
-
-		cd patches
-		git fetch $remote
-		cd ..
-
-		git fetch $remote
-
-		git fetch $remote
-		;;
 	pull)
 		cd_toplevel
 		repo_check 0
@@ -485,6 +471,22 @@ function qf_push
 	git push $remote refs/baselines/$branch/*:refs/baselines/$branch/*
 }
 
+function qf_fetch
+{
+	cd_toplevel
+	repo_check 0
+
+	remote=`git config branch.$branch.remote`
+
+	cd patches
+	git fetch $remote
+	cd ..
+
+	git fetch $remote
+
+	git fetch $remote
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 11/30] qf: Move "pull" from case to new subcommand.

[Rodrigo Vivi]

No functional change. Only moving from the case
to its own function, with the arguments now shifted.

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

diff --git a/qf b/qf
index 6413c2dd4732..534338dc5f01 100755
--- a/qf
+++ b/qf
@@ -170,21 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	pull)
-		cd_toplevel
-		repo_check 0
-
-		qf fetch
-		cd patches
-
-		if [[ $2 == "--rebase" ]] ; then
-			git rebase @{upstream}
-		else
-			git merge @{upstream}
-		fi
-
-		qf co
-		;;
 	stage)
 		cd_toplevel
 		repo_check 1
@@ -487,6 +472,23 @@ function qf_fetch
 	git fetch $remote
 }
 
+function qf_pull
+{
+	cd_toplevel
+	repo_check 0
+
+	qf fetch
+	cd patches
+
+	if [[ $1 == "--rebase" ]] ; then
+		git rebase @{upstream}
+	else
+		git merge @{upstream}
+	fi
+
+	qf co
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 12/30] qf: Move "stage" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index 534338dc5f01..565c97f5de92 100755
--- a/qf
+++ b/qf
@@ -170,14 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	stage)
-		cd_toplevel
-		repo_check 1
-
-		git reset --mixed &> /dev/null
-		quilt applied 2> /dev/null | xargs git apply --cached
-		echo All applied patches successfully staged
-		;;
 	wiggle-push|wp)
 		cd_toplevel
 		repo_check 1
@@ -489,6 +481,16 @@ function qf_pull
 	qf co
 }
 
+function qf_stage
+{
+	cd_toplevel
+	repo_check 1
+
+	git reset --mixed &> /dev/null
+	quilt applied 2> /dev/null | xargs git apply --cached
+	echo All applied patches successfully staged
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Rodrigo Vivi]

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

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 14/30] qf: Move "resolved" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index 333ca7ca45fe..ac320d81945f 100755
--- a/qf
+++ b/qf
@@ -170,10 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	resolved)
-		quilt refresh
-		quilt header -e
-		;;
 	apply)
 		if [[ "$2" == "" ]] ; then
 			echo No patch name given, aborting.
@@ -494,6 +490,12 @@ function qf_wiggle_push
 	done
 }
 
+function qf_resolved
+{
+	quilt refresh
+	quilt header -e
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 15/30] qf: Move "apply" from case to new subcommand.

[Rodrigo Vivi]

No functional change. Only moving from the case
to its own function, with the arguments now shifted.

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

diff --git a/qf b/qf
index ac320d81945f..dff560c2a1cf 100755
--- a/qf
+++ b/qf
@@ -170,17 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	apply)
-		if [[ "$2" == "" ]] ; then
-			echo No patch name given, aborting.
-			exit
-		fi
-		patch_name=$2.patch
-		quilt import -P $patch_name /proc/self/fd/0
-		quilt push
-		qf git add $patch_name
-		qf patch-amend
-		;;
 	patch-amend|pa)
 		cd_toplevel
 		repo_check 1
@@ -496,6 +485,19 @@ function qf_resolved
 	quilt header -e
 }
 
+function qf_apply
+{
+	if [[ "$1" == "" ]] ; then
+		echo No patch name given, aborting.
+		exit
+	fi
+	patch_name=$1.patch
+	quilt import -P $patch_name /proc/self/fd/0
+	quilt push
+	qf git add $patch_name
+	qf patch-amend
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 16/30] qf: Move "patch-amend" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index dff560c2a1cf..85ef2a8f4f3c 100755
--- a/qf
+++ b/qf
@@ -170,12 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	patch-amend|pa)
-		cd_toplevel
-		repo_check 1
-
-		gvim `quilt top`
-		;;
 	list-unused-patches)
 		cd_toplevel
 		repo_check 1
@@ -498,6 +492,15 @@ function qf_apply
 	qf patch-amend
 }
 
+qf_alias_pa=patch_amend
+function qf_patch_amend
+{
+	cd_toplevel
+	repo_check 1
+
+	gvim `quilt top`
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 17/30] qf: Move "list-unused-patches" from case to new subcommand.

[Rodrigo Vivi]

No functional change. Only moving from the case
to its own function, with the arguments now shifted.

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

diff --git a/qf b/qf
index 85ef2a8f4f3c..fe19204de461 100755
--- a/qf
+++ b/qf
@@ -170,21 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	list-unused-patches)
-		cd_toplevel
-		repo_check 1
-
-		for patch in patches/*.patch ; do
-			if ! grep "^${patch#patches/}$" patches/series > /dev/null ; then
-				if [[ "$2" != --purge ]] ; then
-					echo $patch
-				else
-					echo deleting $patch
-					rm $patch
-				fi
-			fi
-		done
-		;;
 	baseline)
 		cd_toplevel
 		repo_check 1
@@ -501,6 +486,23 @@ function qf_patch_amend
 	gvim `quilt top`
 }
 
+function qf_list_unused_patches
+{
+	cd_toplevel
+	repo_check 1
+
+	for patch in patches/*.patch ; do
+		if ! grep "^${patch#patches/}$" patches/series > /dev/null ; then
+			if [[ "$1" != --purge ]] ; then
+				echo $patch
+			else
+				echo deleting $patch
+				rm $patch
+			fi
+		fi
+	done
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 18/30] qf: Move "baseline" from case to new subcommand.

[Rodrigo Vivi]

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

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

diff --git a/qf b/qf
index fe19204de461..b7f6c116f341 100755
--- a/qf
+++ b/qf
@@ -170,12 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	baseline)
-		cd_toplevel
-		repo_check 1
-
-		echo $baseline
-		;;
 	git|g)
 		cd_toplevel
 		cd patches
@@ -503,6 +497,14 @@ function qf_list_unused_patches
 	done
 }
 
+function qf_baseline
+{
+	cd_toplevel
+	repo_check 1
+
+	echo $baseline
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 19/30] qf: Move "git" from case to new subcommand.

[Rodrigo Vivi]

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

Notice that "shift" is not needed anymore since it is
getting shifted by default for all subcommands.

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

diff --git a/qf b/qf
index b7f6c116f341..c1db7231474b 100755
--- a/qf
+++ b/qf
@@ -170,12 +170,6 @@ function quilt_clean_check
 }
 
 case "$1" in
-	git|g)
-		cd_toplevel
-		cd patches
-		shift
-		git "$@"
-		;;
 	gitk|k)
 		cd_toplevel
 		cd patches
@@ -505,6 +499,14 @@ function qf_baseline
 	echo $baseline
 }
 
+qf_alias_g=git
+function qf_git
+{
+	cd_toplevel
+	cd patches
+	git "$@"
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 20/30] qf: Move "gitk" from case to new subcommand.

[Rodrigo Vivi]

No functional change. Only moving from the case
to its own function, with the arguments now shifted.

Notice that "shift" is not needed anymore since it is
getting shifted by default for all subcommands.

Also this is the last command to move from the case
block to its own function. So case block is not entirely
removed.

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

diff --git a/qf b/qf
index c1db7231474b..bd85992faa62 100755
--- a/qf
+++ b/qf
@@ -169,15 +169,6 @@ function quilt_clean_check
 	fi
 }
 
-case "$1" in
-	gitk|k)
-		cd_toplevel
-		cd patches
-		shift
-		gitk "$@"
-		;;
-esac
-
 qf=$(basename $0)
 
 # first positional argument is the subcommand
@@ -507,6 +498,14 @@ function qf_git
 	git "$@"
 }
 
+qf_alias_k=gitk
+function qf_gitk
+{
+	cd_toplevel
+	cd patches
+	gitk "$@"
+}
+
 function qf_help
 {
 	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 21/30] qf: SC2006 - Fix one of shellcheck complains on qf.

[Rodrigo Vivi]

^-- SC2006: Use $(..) instead of legacy `..`.

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

diff --git a/qf b/qf
index bd85992faa62..30feec1b75e1 100755
--- a/qf
+++ b/qf
@@ -34,19 +34,19 @@ set -e
 
 function cd_toplevel
 {
-	cd `git rev-parse --show-toplevel`
+	cd $(git rev-parse --show-toplevel)
 
 	if [ -f series ] ; then
 		cd ..
 
-		if [[ $PWD != `git rev-parse --show-toplevel` ]] ; then
+		if [[ $PWD != $(git rev-parse --show-toplevel) ]] ; then
 			echo No git repo in parent directory of series file
 			exit 1
 		fi
 	fi
 
 	if [[ -f patches/series ]] ; then
-		if [[ $PWD/patches != `cd patches ; git rev-parse --show-toplevel` ]] ; then
+		if [[ $PWD/patches != $(cd patches ; git rev-parse --show-toplevel) ]] ; then
 			echo No git repo found in quilt series directory
 			exit 2
 		fi
@@ -65,7 +65,7 @@ function quiet_pop_all
 function repo_check # allow-detached
 {
 	cd patches
-	quilt_branch=`git rev-parse --abbrev-ref HEAD`
+	quilt_branch=$(git rev-parse --abbrev-ref HEAD)
 	branch=${quilt_branch#$QUILT_PREFIX}
 
 	if [[ ! $1 ]] ; then
@@ -84,9 +84,9 @@ function repo_check # allow-detached
 		cd ..
 	fi
 
-	baseline=`source patches/config ; echo $BASELINE`
+	baseline=$(source patches/config ; echo $BASELINE)
 
-	if [[ `git rev-parse HEAD` != $baseline ]] ; then
+	if [[ $(git rev-parse HEAD) != $baseline ]] ; then
 		echo Baseline commit doesn\'t match with quilt config
 		exit 7
 	fi
@@ -154,14 +154,14 @@ function branch_init
 
 function quilt_clean_check
 {
-	local current_top=`quilt top`
+	local current_top=$(quilt top)
 
-	if [[ -n `quilt unapplied $current_top` ]] ; then
+	if [[ -n $(quilt unapplied $current_top) ]] ; then
 		echo Unapplied quilt patches, aborting.
 		exit 9
 	fi
 
-	local quilt_changes=`cd patches ; git status --porcelain`
+	local quilt_changes=$(cd patches ; git status --porcelain)
 
 	if [[ -n $quilt_changes ]] ; then
 		echo Uncommitted changes in the quilt patch repo, aborting.
@@ -181,7 +181,7 @@ fi
 
 function qf_setup
 {
-	cd `git rev-parse --show-toplevel`
+	cd $(git rev-parse --show-toplevel)
 
 	if [[ -d patches ]] ; then
 		if [[ ! -d patches/.git ]] ; then
@@ -203,8 +203,8 @@ function qf_setup
 
 		branch=$1
 		quilt_branch=$QUILT_PREFIX$branch
-		baseline=`git rev-parse $1`
-		remote=`git config branch.$branch.remote`
+		baseline=$(git rev-parse $1)
+		remote=$(git config branch.$branch.remote)
 
 		branch_init $2
 	fi
@@ -229,10 +229,10 @@ function qf_checkout
 	cd ..
 	# error code 2 means no patches removed, which is ok
 	quiet_pop_all -f
-	baseline=`source patches/config ; echo $BASELINE`
+	baseline=$(source patches/config ; echo $BASELINE)
 	checkout_baseline
 	quilt push -a -q > /dev/null
-	echo Now at `quilt top`
+	echo Now at $(quilt top)
 }
 
 function qf_rebase
@@ -245,9 +245,9 @@ function qf_rebase
 		exit 4
 	fi
 
-	new_baseline=`git rev-parse $1`
+	new_baseline=$(git rev-parse $1)
 
-	current_top=`quilt top`
+	current_top=$(quilt top)
 	quiet_pop_all
 	echo Resetting baseline to $new_baseline
 	git reset --hard $new_baseline
@@ -262,7 +262,7 @@ function qf_refresh
 	cd_toplevel
 	repo_check 0
 
-	changed_files=`qf git status --porcelain | wc -l`
+	changed_files=$(qf git status --porcelain | wc -l)
 
 	if [[ $changed_files -gt 0 ]] ; then
 		echo Quilt patch dir not clean, aborting
@@ -300,10 +300,10 @@ function qf_export
 	quilt_clean_check
 
 	username=$GIT_COMMMITTER_NAME
-	username=${username:-`git config user.name || true`}
-	username=${username:-`getent passwd $USER | cut -d: -f 5 | cut -d, -f 1 || true`}
+	username=${username:-$(git config user.name || true)}
+	username=${username:-$(getent passwd $USER | cut -d: -f 5 | cut -d, -f 1 || true)}
 	useremail=$GIT_COMMMITTER_EMAIL
-	useremail=${useremail:-`git config user.email || true`}
+	useremail=${useremail:-$(git config user.email || true)}
 	useremail=${useremail:-$EMAIL}
 
 	if [[ -z $useremail || -z $username ]] ; then
@@ -324,11 +324,11 @@ function qf_export
 
 	git quiltimport --author "$username <$useremail>"
 
-	quilt_ref=`cd patches ; git rev-parse --abbrev-ref HEAD`
-	quilt_sha_abbrev=`cd patches ; git rev-parse --short HEAD`
-	quilt_sha=`cd patches ; git rev-parse HEAD`
+	quilt_ref=$(cd patches ; git rev-parse --abbrev-ref HEAD)
+	quilt_sha_abbrev=$(cd patches ; git rev-parse --short HEAD)
+	quilt_sha=$(cd patches ; git rev-parse HEAD)
 
-	git update-ref -m "export $quilt_ref:$quilt_sha_abbrev to $branch" refs/QUILT_EXPORT `git rev-parse HEAD`
+	git update-ref -m "export $quilt_ref:$quilt_sha_abbrev to $branch" refs/QUILT_EXPORT $(git rev-parse HEAD)
 	git notes --ref quilt add -m "Quilt-Commit: $quilt_sha" $branch
 
 	checkout_baseline
@@ -351,10 +351,10 @@ function qf_push
 	repo_check 0
 	quilt_clean_check
 
-	remote=`git config branch.$branch.remote`
+	remote=$(git config branch.$branch.remote)
 
-	export_quilt_sha=`git notes --ref=quilt show $branch | grep Quilt-Commit | cut -d ' ' -f 2`
-	quilt_sha=`cd patches ; git rev-parse $quilt_branch`
+	export_quilt_sha=$(git notes --ref=quilt show $branch | grep Quilt-Commit | cut -d ' ' -f 2)
+	quilt_sha=$(cd patches ; git rev-parse $quilt_branch)
 
 	if [[ $export_quilt_sha != $quilt_sha ]] ; then
 		echo Quilt export is out of date, aborting
@@ -379,7 +379,7 @@ function qf_fetch
 	cd_toplevel
 	repo_check 0
 
-	remote=`git config branch.$branch.remote`
+	remote=$(git config branch.$branch.remote)
 
 	cd patches
 	git fetch $remote
@@ -423,7 +423,7 @@ 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/"`
+	conflict_files=$(quilt push -f | grep "saving rejects" | sed -e "s/.*saving rejects to file \(.*\)/\1/")
 
 	if [[ $conflict_files != "" ]] ; then
 		echo conflicts found!
@@ -462,7 +462,7 @@ function qf_patch_amend
 	cd_toplevel
 	repo_check 1
 
-	gvim `quilt top`
+	gvim $(quilt top)
 }
 
 function qf_list_unused_patches
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 22/30] qf: SC2068 - Fix another shellcheck complain.

[Rodrigo Vivi]

^-- SC2068: Double quote array expansions to avoid re-splitting elements.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 qf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qf b/qf
index 30feec1b75e1..48dfe20b1693 100755
--- a/qf
+++ b/qf
@@ -59,7 +59,7 @@ function cd_toplevel
 function quiet_pop_all
 {
 	echo Popping patches ...
-	quilt pop -a -q $@ > /dev/null || test $? = 2
+	quilt pop -a -q "$@" > /dev/null || test $? = 2
 }
 
 function repo_check # allow-detached
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 23/30] qf: SC2053 - Fix another shellcheck complain:

[Rodrigo Vivi]

^-- SC2053: Quote the rhs of != in [[ ]] to prevent glob matching.

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

diff --git a/qf b/qf
index 48dfe20b1693..cbe8a69e1a83 100755
--- a/qf
+++ b/qf
@@ -86,7 +86,7 @@ function repo_check # allow-detached
 
 	baseline=$(source patches/config ; echo $BASELINE)
 
-	if [[ $(git rev-parse HEAD) != $baseline ]] ; then
+	if [[ $(git rev-parse HEAD) != "$baseline" ]] ; then
 		echo Baseline commit doesn\'t match with quilt config
 		exit 7
 	fi
@@ -356,7 +356,7 @@ function qf_push
 	export_quilt_sha=$(git notes --ref=quilt show $branch | grep Quilt-Commit | cut -d ' ' -f 2)
 	quilt_sha=$(cd patches ; git rev-parse $quilt_branch)
 
-	if [[ $export_quilt_sha != $quilt_sha ]] ; then
+	if [[ $export_quilt_sha != "$quilt_sha" ]] ; then
 		echo Quilt export is out of date, aborting
 		echo $export_quilt_sha
 		echo $quilt_sha
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 24/30] qf: SC2155 - Fix another shellcheck complain

[Rodrigo Vivi]

 ^-- SC2155: Declare and assign separately to avoid masking return values.

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

diff --git a/qf b/qf
index cbe8a69e1a83..0bd6ebf1370d 100755
--- a/qf
+++ b/qf
@@ -154,14 +154,16 @@ function branch_init
 
 function quilt_clean_check
 {
-	local current_top=$(quilt top)
+	local current_top quilt_changes
+
+	current_top=$(quilt top)
 
 	if [[ -n $(quilt unapplied $current_top) ]] ; then
 		echo Unapplied quilt patches, aborting.
 		exit 9
 	fi
 
-	local quilt_changes=$(cd patches ; git status --porcelain)
+	quilt_changes=$(cd patches ; git status --porcelain)
 
 	if [[ -n $quilt_changes ]] ; then
 		echo Uncommitted changes in the quilt patch repo, aborting.
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 25/30] qf: SC2035 - Fix another shellcheck complain

[Rodrigo Vivi]

^-- SC2035: Use ./*glob* or -- *glob* so names with dashes won't become options.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 qf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qf b/qf
index 0bd6ebf1370d..dbda415d4dbc 100755
--- a/qf
+++ b/qf
@@ -135,7 +135,7 @@ function branch_init
 		echo Creating new quilt branch $quilt_branch
 		# big trickery to get an empty commit
 		git checkout -q --orphan $quilt_branch > /dev/null
-		git rm -rf * > /dev/null
+		git rm -rf ./* > /dev/null
 		git ls-files | xargs git rm -rf > /dev/null
 		touch series
 		echo BASELINE=$baseline > config
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 26/30] qf: SC1091 - Fix another shellcheck complain

[Rodrigo Vivi]

^-- SC1091: Not following: patches/config was not specified as input (see shellcheck -x).

It is expected this path doesn't exist yet.

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

diff --git a/qf b/qf
index dbda415d4dbc..059c8e5afe1d 100755
--- a/qf
+++ b/qf
@@ -84,6 +84,7 @@ function repo_check # allow-detached
 		cd ..
 	fi
 
+	# shellcheck source=/dev/null
 	baseline=$(source patches/config ; echo $BASELINE)
 
 	if [[ $(git rev-parse HEAD) != "$baseline" ]] ; then
@@ -231,6 +232,7 @@ function qf_checkout
 	cd ..
 	# error code 2 means no patches removed, which is ok
 	quiet_pop_all -f
+	# shellcheck source=/dev/null
 	baseline=$(source patches/config ; echo $BASELINE)
 	checkout_baseline
 	quilt push -a -q > /dev/null
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 27/30] qf: SC2153 - Fix another shellcheck complain.

[Rodrigo Vivi]

^-- SC2153: Possible misspelling: BASELINE may not be assigned, but baseline is.

BASELINE is defined inside patches/config, but this confuses shellcheck.
According to https://github.com/koalaman/shellcheck/wiki/SC2153
the message doesn't appear for guarded references where if variable
is defined a default is used.

Maybe we should pick a better default like the git HEAD ?!

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

diff --git a/qf b/qf
index 059c8e5afe1d..a42ef4779cab 100755
--- a/qf
+++ b/qf
@@ -85,7 +85,7 @@ function repo_check # allow-detached
 	fi
 
 	# shellcheck source=/dev/null
-	baseline=$(source patches/config ; echo $BASELINE)
+	baseline=$(source patches/config ; echo ${BASELINE:-})
 
 	if [[ $(git rev-parse HEAD) != "$baseline" ]] ; then
 		echo Baseline commit doesn\'t match with quilt config
@@ -233,7 +233,7 @@ function qf_checkout
 	# error code 2 means no patches removed, which is ok
 	quiet_pop_all -f
 	# shellcheck source=/dev/null
-	baseline=$(source patches/config ; echo $BASELINE)
+	baseline=$(source patches/config ; echo ${BASELINE:-})
 	checkout_baseline
 	quilt push -a -q > /dev/null
 	echo Now at $(quilt top)
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 28/30] qf: SC1083 - Fix another shellcheck complain.

[Rodrigo Vivi]

^-- SC1083: This { is literal. Check expression (missing ;/\n?) or quote it.^

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

diff --git a/qf b/qf
index a42ef4779cab..be234e72fa15 100755
--- a/qf
+++ b/qf
@@ -403,9 +403,9 @@ function qf_pull
 	cd patches
 
 	if [[ $1 == "--rebase" ]] ; then
-		git rebase @{upstream}
+		git rebase "@{upstream}"
 	else
-		git merge @{upstream}
+		git merge "@{upstream}"
 	fi
 
 	qf co
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 29/30] qf: Add it to shellcheck part of make check.

[Rodrigo Vivi]

Now that all of our issues caught by shellcheck are fixed
let's add qf to shellcheck part of make check so any
further change is protected by this cool shell scan tool.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7cb22d2b1e06..10ec80f0a85f 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ SC_EXCLUDE := \
 	-e SC2143
 
 shellcheck:
-	shellcheck $(SC_EXCLUDE) dim bash_completion
+	shellcheck $(SC_EXCLUDE) dim bash_completion qf
 
 mancheck:
 	@for cmd in $$(./dim list-commands); do \
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf.

[Rodrigo Vivi]

Soon we will need to extend qf for very specific
usages of our internal maintenance and rebase bot.

So instead of creating yet another config file
let's use the existent one.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 dimrc.sample |  9 ++++++++-
 qf           | 18 +++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/dimrc.sample b/dimrc.sample
index be7b99cb6b76..bbddecabd519 100644
--- a/dimrc.sample
+++ b/dimrc.sample
@@ -1,4 +1,4 @@
-# Sample configuration file for dim. Place this at $HOME/.dimrc or point
+# Sample configuration file for dim and qf. Place this at $HOME/.dimrc or point
 # DIM_CONFIG environment variable to it.
 #
 # Defaults are in the comments below.
@@ -20,3 +20,10 @@
 
 # Command to run after dim apply
 #DIM_POST_APPLY_ACTION=
+
+#
+# qf
+#
+
+# Quilt branch prefix
+#QUILT_PREFIX=
\ No newline at end of file
diff --git a/qf b/qf
index be234e72fa15..befdb2c15b5f 100755
--- a/qf
+++ b/qf
@@ -26,12 +26,24 @@
 
 # quilt git flow script
 
-# config
-QUILT_PREFIX=quilt/
-
 # fail on any goof-up
 set -e
 
+#
+# User configuration. Set in environment or configuration file. See
+# dimrc.sample for an example.
+#
+
+# dim configuration file
+DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
+if [ -r $DIM_CONFIG ]; then
+	# shellcheck source=/dev/null
+	. $DIM_CONFIG
+fi
+
+# prefix for quilt branch
+QUILT_PREFIX=${QUILT_PREFIX:-quilt/}
+
 function cd_toplevel
 {
 	cd $(git rev-parse --show-toplevel)
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf.

[Daniel Vetter]

On Mon, Aug 21, 2017 at 01:11:20PM -0700, Rodrigo Vivi wrote:
> Soon we will need to extend qf for very specific
> usages of our internal maintenance and rebase bot.
> 
> So instead of creating yet another config file
> let's use the existent one.
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Now that qf list-aliases/cmds works, can we perhaps also rework the bash
completion to use that, like for dim?
-Daniel
> ---
>  dimrc.sample |  9 ++++++++-
>  qf           | 18 +++++++++++++++---
>  2 files changed, 23 insertions(+), 4 deletions(-)
> 
> diff --git a/dimrc.sample b/dimrc.sample
> index be7b99cb6b76..bbddecabd519 100644
> --- a/dimrc.sample
> +++ b/dimrc.sample
> @@ -1,4 +1,4 @@
> -# Sample configuration file for dim. Place this at $HOME/.dimrc or point
> +# Sample configuration file for dim and qf. Place this at $HOME/.dimrc or point
>  # DIM_CONFIG environment variable to it.
>  #
>  # Defaults are in the comments below.
> @@ -20,3 +20,10 @@
>  
>  # Command to run after dim apply
>  #DIM_POST_APPLY_ACTION=
> +
> +#
> +# qf
> +#
> +
> +# Quilt branch prefix
> +#QUILT_PREFIX=
> \ No newline at end of file
> diff --git a/qf b/qf
> index be234e72fa15..befdb2c15b5f 100755
> --- a/qf
> +++ b/qf
> @@ -26,12 +26,24 @@
>  
>  # quilt git flow script
>  
> -# config
> -QUILT_PREFIX=quilt/
> -
>  # fail on any goof-up
>  set -e
>  
> +#
> +# User configuration. Set in environment or configuration file. See
> +# dimrc.sample for an example.
> +#
> +
> +# dim configuration file
> +DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
> +if [ -r $DIM_CONFIG ]; then
> +	# shellcheck source=/dev/null
> +	. $DIM_CONFIG
> +fi
> +
> +# prefix for quilt branch
> +QUILT_PREFIX=${QUILT_PREFIX:-quilt/}
> +
>  function cd_toplevel
>  {
>  	cd $(git rev-parse --show-toplevel)
> -- 
> 2.13.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf.

[Daniel Vetter]

On Tue, Aug 22, 2017 at 09:06:36AM +0200, Daniel Vetter wrote:
> On Mon, Aug 21, 2017 at 01:11:20PM -0700, Rodrigo Vivi wrote:
> > Soon we will need to extend qf for very specific
> > usages of our internal maintenance and rebase bot.
> > 
> > So instead of creating yet another config file
> > let's use the existent one.
> > 
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 
> Now that qf list-aliases/cmds works, can we perhaps also rework the bash
> completion to use that, like for dim?

Another follow-up task would be to extract the qf help into qf.rst and add
it to the sphinx build. For even more qf/dim consistency.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf.

[Jani Nikula]

On Tue, 22 Aug 2017, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Aug 22, 2017 at 09:06:36AM +0200, Daniel Vetter wrote:
>> On Mon, Aug 21, 2017 at 01:11:20PM -0700, Rodrigo Vivi wrote:
>> > Soon we will need to extend qf for very specific
>> > usages of our internal maintenance and rebase bot.
>> > 
>> > So instead of creating yet another config file
>> > let's use the existent one.
>> > 
>> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> > Cc: Jani Nikula <jani.nikula@intel.com>
>> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> 
>> Now that qf list-aliases/cmds works, can we perhaps also rework the bash
>> completion to use that, like for dim?
>
> Another follow-up task would be to extract the qf help into qf.rst and add
> it to the sphinx build. For even more qf/dim consistency.

That's already done and pushed.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf.

[Jani Nikula]

On Mon, 21 Aug 2017, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> Soon we will need to extend qf for very specific
> usages of our internal maintenance and rebase bot.
>
> So instead of creating yet another config file
> let's use the existent one.

I think I'd prefer a separate config file for qf.

BR,
Jani.

>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  dimrc.sample |  9 ++++++++-
>  qf           | 18 +++++++++++++++---
>  2 files changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/dimrc.sample b/dimrc.sample
> index be7b99cb6b76..bbddecabd519 100644
> --- a/dimrc.sample
> +++ b/dimrc.sample
> @@ -1,4 +1,4 @@
> -# Sample configuration file for dim. Place this at $HOME/.dimrc or point
> +# Sample configuration file for dim and qf. Place this at $HOME/.dimrc or point
>  # DIM_CONFIG environment variable to it.
>  #
>  # Defaults are in the comments below.
> @@ -20,3 +20,10 @@
>  
>  # Command to run after dim apply
>  #DIM_POST_APPLY_ACTION=
> +
> +#
> +# qf
> +#
> +
> +# Quilt branch prefix
> +#QUILT_PREFIX=
> \ No newline at end of file
> diff --git a/qf b/qf
> index be234e72fa15..befdb2c15b5f 100755
> --- a/qf
> +++ b/qf
> @@ -26,12 +26,24 @@
>  
>  # quilt git flow script
>  
> -# config
> -QUILT_PREFIX=quilt/
> -
>  # fail on any goof-up
>  set -e
>  
> +#
> +# User configuration. Set in environment or configuration file. See
> +# dimrc.sample for an example.
> +#
> +
> +# dim configuration file
> +DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
> +if [ -r $DIM_CONFIG ]; then
> +	# shellcheck source=/dev/null
> +	. $DIM_CONFIG
> +fi
> +
> +# prefix for quilt branch
> +QUILT_PREFIX=${QUILT_PREFIX:-quilt/}
> +
>  function cd_toplevel
>  {
>  	cd $(git rev-parse --show-toplevel)

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf.

[Rodrigo Vivi]

On Tue, Aug 22, 2017 at 12:33 AM, Jani Nikula <jani.nikula@intel.com> wrote:
> On Mon, 21 Aug 2017, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
>> Soon we will need to extend qf for very specific
>> usages of our internal maintenance and rebase bot.
>>
>> So instead of creating yet another config file
>> let's use the existent one.
>
> I think I'd prefer a separate config file for qf.

hm.. I was here accepting this suggestion, but then I noticed our qf_help
already referrence $DIM_PREFIX

so, if we change to .qfrc we will have to redefine this prefix while re-using
dimrc we don't need any duplication.

what do you think?

>
> BR,
> Jani.
>
>>
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> ---
>>  dimrc.sample |  9 ++++++++-
>>  qf           | 18 +++++++++++++++---
>>  2 files changed, 23 insertions(+), 4 deletions(-)
>>
>> diff --git a/dimrc.sample b/dimrc.sample
>> index be7b99cb6b76..bbddecabd519 100644
>> --- a/dimrc.sample
>> +++ b/dimrc.sample
>> @@ -1,4 +1,4 @@
>> -# Sample configuration file for dim. Place this at $HOME/.dimrc or point
>> +# Sample configuration file for dim and qf. Place this at $HOME/.dimrc or point
>>  # DIM_CONFIG environment variable to it.
>>  #
>>  # Defaults are in the comments below.
>> @@ -20,3 +20,10 @@
>>
>>  # Command to run after dim apply
>>  #DIM_POST_APPLY_ACTION=
>> +
>> +#
>> +# qf
>> +#
>> +
>> +# Quilt branch prefix
>> +#QUILT_PREFIX=
>> \ No newline at end of file
>> diff --git a/qf b/qf
>> index be234e72fa15..befdb2c15b5f 100755
>> --- a/qf
>> +++ b/qf
>> @@ -26,12 +26,24 @@
>>
>>  # quilt git flow script
>>
>> -# config
>> -QUILT_PREFIX=quilt/
>> -
>>  # fail on any goof-up
>>  set -e
>>
>> +#
>> +# User configuration. Set in environment or configuration file. See
>> +# dimrc.sample for an example.
>> +#
>> +
>> +# dim configuration file
>> +DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
>> +if [ -r $DIM_CONFIG ]; then
>> +     # shellcheck source=/dev/null
>> +     . $DIM_CONFIG
>> +fi
>> +
>> +# prefix for quilt branch
>> +QUILT_PREFIX=${QUILT_PREFIX:-quilt/}
>> +
>>  function cd_toplevel
>>  {
>>       cd $(git rev-parse --show-toplevel)
>
> --
> Jani Nikula, Intel Open Source Technology Center
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf.

[Daniel Vetter]

On Tue, Aug 22, 2017 at 11:16:35AM -0700, Rodrigo Vivi wrote:
> On Tue, Aug 22, 2017 at 12:33 AM, Jani Nikula <jani.nikula@intel.com> wrote:
> > On Mon, 21 Aug 2017, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> >> Soon we will need to extend qf for very specific
> >> usages of our internal maintenance and rebase bot.
> >>
> >> So instead of creating yet another config file
> >> let's use the existent one.
> >
> > I think I'd prefer a separate config file for qf.
> 
> hm.. I was here accepting this suggestion, but then I noticed our qf_help
> already referrence $DIM_PREFIX
> 
> so, if we change to .qfrc we will have to redefine this prefix while re-using
> dimrc we don't need any duplication.
> 
> what do you think?

I think encouraging people to have entirely separate public/internal trees
would be good. Maybe even add a warning if QF_PREFIX matches DIM_PREFIX.

The risk is that the rerere magic in dim could accidentally leak internal
stuff.

So +1 from me for going with .qfrc, and maybe for paranoia on top insist
that QF_PREFIX != DIM_PREFIX. I'm one of those idiots who does this wrong,
and it's not good :-)

Cheers, Daniel

> 
> >
> > BR,
> > Jani.
> >
> >>
> >> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> >> Cc: Jani Nikula <jani.nikula@intel.com>
> >> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> >> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >> ---
> >>  dimrc.sample |  9 ++++++++-
> >>  qf           | 18 +++++++++++++++---
> >>  2 files changed, 23 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/dimrc.sample b/dimrc.sample
> >> index be7b99cb6b76..bbddecabd519 100644
> >> --- a/dimrc.sample
> >> +++ b/dimrc.sample
> >> @@ -1,4 +1,4 @@
> >> -# Sample configuration file for dim. Place this at $HOME/.dimrc or point
> >> +# Sample configuration file for dim and qf. Place this at $HOME/.dimrc or point
> >>  # DIM_CONFIG environment variable to it.
> >>  #
> >>  # Defaults are in the comments below.
> >> @@ -20,3 +20,10 @@
> >>
> >>  # Command to run after dim apply
> >>  #DIM_POST_APPLY_ACTION=
> >> +
> >> +#
> >> +# qf
> >> +#
> >> +
> >> +# Quilt branch prefix
> >> +#QUILT_PREFIX=
> >> \ No newline at end of file
> >> diff --git a/qf b/qf
> >> index be234e72fa15..befdb2c15b5f 100755
> >> --- a/qf
> >> +++ b/qf
> >> @@ -26,12 +26,24 @@
> >>
> >>  # quilt git flow script
> >>
> >> -# config
> >> -QUILT_PREFIX=quilt/
> >> -
> >>  # fail on any goof-up
> >>  set -e
> >>
> >> +#
> >> +# User configuration. Set in environment or configuration file. See
> >> +# dimrc.sample for an example.
> >> +#
> >> +
> >> +# dim configuration file
> >> +DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
> >> +if [ -r $DIM_CONFIG ]; then
> >> +     # shellcheck source=/dev/null
> >> +     . $DIM_CONFIG
> >> +fi
> >> +
> >> +# prefix for quilt branch
> >> +QUILT_PREFIX=${QUILT_PREFIX:-quilt/}
> >> +
> >>  function cd_toplevel
> >>  {
> >>       cd $(git rev-parse --show-toplevel)
> >
> > --
> > Jani Nikula, Intel Open Source Technology Center
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> 
> 
> -- 
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[maintainer-tools PATCH] qf: Introduce .qfrc.

[Rodrigo Vivi]

Soon we will need to extend qf for very specific
usages of our internal maintenance and rebase bot.

So let's start with the only environment configuration
we have but also let's allow qfrc to extend qf commands
and aliases.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 qf          | 18 +++++++++++++++---
 qf.rst      | 25 +++++++++++++++++++++++++
 qfrc.sample |  7 +++++++
 3 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 qfrc.sample

diff --git a/qf b/qf
index a7a106148733..ea3509f0421b 100755
--- a/qf
+++ b/qf
@@ -26,12 +26,24 @@
 
 # quilt git flow script
 
-# config
-QUILT_PREFIX=quilt/
-
 # fail on any goof-up
 set -e
 
+#
+# User configuration. Set in environment or configuration file. See
+# qfrc.sample for an example.
+#
+
+# qf configuration file
+QF_CONFIG=${QF_CONFIG:-$HOME/.qfrc}
+if [ -r $QF_CONFIG ]; then
+	# shellcheck source=/dev/null
+	. $QF_CONFIG
+fi
+
+# prefix for quilt branch
+QUILT_PREFIX=${QUILT_PREFIX:-quilt/}
+
 function cd_toplevel
 {
 	cd $(git rev-parse --show-toplevel)
diff --git a/qf.rst b/qf.rst
index 10447dded391..136c695e604c 100644
--- a/qf.rst
+++ b/qf.rst
@@ -254,6 +254,31 @@ directory as git commands. When using quilt flow in scripts it is
 import to use the explicit forwarding to avoid clashes with
 furture extensions.
 
+
+ALIASES
+=======
+
+Extending **qf** functionalities
+---------------------------------
+
+It is possible to create your own qf helper and aliases by adding them to \$HOME/.qfrc::
+
+	qf_my_fancy_list_aliases()
+	{
+		echo "Hello world!"
+		qf_list_aliases
+	}
+
+	qf_alias_list_aliases=my-fancy-list-aliases
+
+ENVIRONMENT
+===========
+
+QUILT_PREFIX
+------------
+Quilt branch prefix. This is a prefix for the git branch that contains the
+patch files and quilt series file.
+
 CONTRIBUTING
 ============
 
diff --git a/qfrc.sample b/qfrc.sample
new file mode 100644
index 000000000000..d56981609b00
--- /dev/null
+++ b/qfrc.sample
@@ -0,0 +1,7 @@
+# Sample configuration file for qf. Place this at $HOME/.qfrc or point
+# QF_CONFIG environment variable to it.
+#
+# Defaults are in the comments below.
+
+# Quilt branch prefix
+#QUILT_PREFIX=quilt
\ No newline at end of file
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH] qf: Introduce .qfrc.

[Daniel Vetter]

On Wed, Aug 23, 2017 at 10:23:34AM -0700, Rodrigo Vivi wrote:
> Soon we will need to extend qf for very specific
> usages of our internal maintenance and rebase bot.
> 
> So let's start with the only environment configuration
> we have but also let's allow qfrc to extend qf commands
> and aliases.
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  qf          | 18 +++++++++++++++---
>  qf.rst      | 25 +++++++++++++++++++++++++
>  qfrc.sample |  7 +++++++
>  3 files changed, 47 insertions(+), 3 deletions(-)
>  create mode 100644 qfrc.sample
> 
> diff --git a/qf b/qf
> index a7a106148733..ea3509f0421b 100755
> --- a/qf
> +++ b/qf
> @@ -26,12 +26,24 @@
>  
>  # quilt git flow script
>  
> -# config
> -QUILT_PREFIX=quilt/
> -
>  # fail on any goof-up
>  set -e
>  
> +#
> +# User configuration. Set in environment or configuration file. See
> +# qfrc.sample for an example.
> +#
> +
> +# qf configuration file
> +QF_CONFIG=${QF_CONFIG:-$HOME/.qfrc}
> +if [ -r $QF_CONFIG ]; then
> +	# shellcheck source=/dev/null
> +	. $QF_CONFIG
> +fi
> +
> +# prefix for quilt branch
> +QUILT_PREFIX=${QUILT_PREFIX:-quilt/}
> +
>  function cd_toplevel
>  {
>  	cd $(git rev-parse --show-toplevel)
> diff --git a/qf.rst b/qf.rst
> index 10447dded391..136c695e604c 100644
> --- a/qf.rst
> +++ b/qf.rst
> @@ -254,6 +254,31 @@ directory as git commands. When using quilt flow in scripts it is
>  import to use the explicit forwarding to avoid clashes with
>  furture extensions.
>  
> +
> +ALIASES
> +=======
> +
> +Extending **qf** functionalities
> +---------------------------------
> +
> +It is possible to create your own qf helper and aliases by adding them to \$HOME/.qfrc::
> +
> +	qf_my_fancy_list_aliases()
> +	{
> +		echo "Hello world!"
> +		qf_list_aliases
> +	}
> +
> +	qf_alias_list_aliases=my-fancy-list-aliases
> +
> +ENVIRONMENT
> +===========
> +
> +QUILT_PREFIX
> +------------
> +Quilt branch prefix. This is a prefix for the git branch that contains the
> +patch files and quilt series file.
> +
>  CONTRIBUTING
>  ============
>  
> diff --git a/qfrc.sample b/qfrc.sample
> new file mode 100644
> index 000000000000..d56981609b00
> --- /dev/null
> +++ b/qfrc.sample
> @@ -0,0 +1,7 @@
> +# Sample configuration file for qf. Place this at $HOME/.qfrc or point
> +# QF_CONFIG environment variable to it.
> +#
> +# Defaults are in the comments below.
> +
> +# Quilt branch prefix
> +#QUILT_PREFIX=quilt

Misses the / at the end. Otherwise lgtm, ack.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand.

[Daniel Vetter]

On Mon, Aug 21, 2017 at 01:10:51PM -0700, Rodrigo Vivi wrote:
> These sequences here are already covered by `qf git` subcommand.
> I double checked and confirmed that our continuously rebasing
> bot does not use this qf directly here and I'm not aware
> of anyone else using it. So let's remove it so we can start
> handling everything with subcommands (dim style).

I do. It's super handy if you look around at the source code, but want to
manipulate the qf history. This is similar to how git tools by default
work anywhere in the working tree. It's not perfect (e.g. qf git blame
doesn't do what you want it to do), but in many cases just adding a qf to
whatever git command you though of Just Works (e.g. qf log).

If it annoys you too much I guess we could do qf run for cmds in general
and qf git for git stuff, but would be really nice to keep this in some
form.
-Daniel

> 
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  qf     | 7 +------
>  qf.rst | 7 -------
>  2 files changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/qf b/qf
> index 1f056f90ef70..d1c331023230 100755
> --- a/qf
> +++ b/qf
> @@ -480,12 +480,7 @@ case "$1" in
>  		shift
>  		gitk "$@"
>  		;;
> -	help)
> -		qf_help
> -		;;
>  	*)
> -		cd_toplevel
> -		cd patches
> -		git "$@"
> +		qf_help
>  		;;
>  esac
> diff --git a/qf.rst b/qf.rst
> index 902b0d377f41..f0019d76c53d 100644
> --- a/qf.rst
> +++ b/qf.rst
> @@ -233,13 +233,6 @@ help
>  ----
>  This help text here
>  
> -all other subcommands - IMPORTANT
> ----------------------------------
> -Any other subcommands are executed directly in the quilt patches
> -directory as git commans. When using quilt flow in scripts it is
> -import to use the explicit forwarding to avoid clashes with
> -furture extensions.
> -
>  CONTRIBUTING
>  ============
>  
> -- 
> 2.13.2
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand.

[Daniel Vetter]

On Tue, Aug 22, 2017 at 08:55:33AM +0200, Daniel Vetter wrote:
> On Mon, Aug 21, 2017 at 01:10:51PM -0700, Rodrigo Vivi wrote:
> > These sequences here are already covered by `qf git` subcommand.
> > I double checked and confirmed that our continuously rebasing
> > bot does not use this qf directly here and I'm not aware
> > of anyone else using it. So let's remove it so we can start
> > handling everything with subcommands (dim style).
> 
> I do. It's super handy if you look around at the source code, but want to
> manipulate the qf history. This is similar to how git tools by default
> work anywhere in the working tree. It's not perfect (e.g. qf git blame
> doesn't do what you want it to do), but in many cases just adding a qf to
> whatever git command you though of Just Works (e.g. qf log).
> 
> If it annoys you too much I guess we could do qf run for cmds in general
> and qf git for git stuff, but would be really nice to keep this in some
> form.

Otoh my opinion doesn't matter all that much anymore, so if others think
it's ok I can live with qf git log :-)

Ack on the series, but I haven't really checked all the details, I think
Jani's the better person for that.
-Daniel

> -Daniel
> 
> > 
> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > Cc: Imre Deak <imre.deak@intel.com>
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  qf     | 7 +------
> >  qf.rst | 7 -------
> >  2 files changed, 1 insertion(+), 13 deletions(-)
> > 
> > diff --git a/qf b/qf
> > index 1f056f90ef70..d1c331023230 100755
> > --- a/qf
> > +++ b/qf
> > @@ -480,12 +480,7 @@ case "$1" in
> >  		shift
> >  		gitk "$@"
> >  		;;
> > -	help)
> > -		qf_help
> > -		;;
> >  	*)
> > -		cd_toplevel
> > -		cd patches
> > -		git "$@"
> > +		qf_help
> >  		;;
> >  esac
> > diff --git a/qf.rst b/qf.rst
> > index 902b0d377f41..f0019d76c53d 100644
> > --- a/qf.rst
> > +++ b/qf.rst
> > @@ -233,13 +233,6 @@ help
> >  ----
> >  This help text here
> >  
> > -all other subcommands - IMPORTANT
> > ----------------------------------
> > -Any other subcommands are executed directly in the quilt patches
> > -directory as git commans. When using quilt flow in scripts it is
> > -import to use the explicit forwarding to avoid clashes with
> > -furture extensions.
> > -
> >  CONTRIBUTING
> >  ============
> >  
> > -- 
> > 2.13.2
> > 
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand.

[Rodrigo Vivi]

On Tue, Aug 22, 2017 at 12:36 AM, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Aug 22, 2017 at 08:55:33AM +0200, Daniel Vetter wrote:
>> On Mon, Aug 21, 2017 at 01:10:51PM -0700, Rodrigo Vivi wrote:
>> > These sequences here are already covered by `qf git` subcommand.
>> > I double checked and confirmed that our continuously rebasing
>> > bot does not use this qf directly here and I'm not aware
>> > of anyone else using it. So let's remove it so we can start
>> > handling everything with subcommands (dim style).
>>
>> I do. It's super handy if you look around at the source code, but want to
>> manipulate the qf history. This is similar to how git tools by default
>> work anywhere in the working tree. It's not perfect (e.g. qf git blame
>> doesn't do what you want it to do), but in many cases just adding a qf to
>> whatever git command you though of Just Works (e.g. qf log).
>>
>> If it annoys you too much I guess we could do qf run for cmds in general
>> and qf git for git stuff, but would be really nice to keep this in some
>> form.

it doesn't annoy me...
I just considered it to be more in sync with dim, but if we have users
for that I don't want to break it ;)

>
> Otoh my opinion doesn't matter all that much anymore, so if others think

of course it matters!

> it's ok I can live with qf git log :-)

well, if was/is just the log I believe we could do an alias on .qfrc..

But I imagine qfrc can increase a lot and get messy if we start adding
all git subcommands to our .qfrc

>
> Ack on the series, but I haven't really checked all the details, I think
> Jani's the better person for that.

Thanks!

But I will still do few changes like keep this default behaviour and
use .qfrc instead of .dimrc as Jani prefers.

Later I will play with bash_completion for qf as well... Thanks for
the suggestion.

Thanks,
Rodrigo.

> -Daniel
>
>> -Daniel
>>
>> >
>> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>> > Cc: Imre Deak <imre.deak@intel.com>
>> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> > Cc: Jani Nikula <jani.nikula@intel.com>
>> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> > ---
>> >  qf     | 7 +------
>> >  qf.rst | 7 -------
>> >  2 files changed, 1 insertion(+), 13 deletions(-)
>> >
>> > diff --git a/qf b/qf
>> > index 1f056f90ef70..d1c331023230 100755
>> > --- a/qf
>> > +++ b/qf
>> > @@ -480,12 +480,7 @@ case "$1" in
>> >             shift
>> >             gitk "$@"
>> >             ;;
>> > -   help)
>> > -           qf_help
>> > -           ;;
>> >     *)
>> > -           cd_toplevel
>> > -           cd patches
>> > -           git "$@"
>> > +           qf_help
>> >             ;;
>> >  esac
>> > diff --git a/qf.rst b/qf.rst
>> > index 902b0d377f41..f0019d76c53d 100644
>> > --- a/qf.rst
>> > +++ b/qf.rst
>> > @@ -233,13 +233,6 @@ help
>> >  ----
>> >  This help text here
>> >
>> > -all other subcommands - IMPORTANT
>> > ----------------------------------
>> > -Any other subcommands are executed directly in the quilt patches
>> > -directory as git commans. When using quilt flow in scripts it is
>> > -import to use the explicit forwarding to avoid clashes with
>> > -furture extensions.
>> > -
>> >  CONTRIBUTING
>> >  ============
>> >
>> > --
>> > 2.13.2
>> >
>>
>> --
>> Daniel Vetter
>> Software Engineer, Intel Corporation
>> http://blog.ffwll.ch
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] qf: Introduce subcommand and aliases

[Rodrigo Vivi]

Let's start refreshing qf a bit by introducing
subcommand and aliases like dim.

The goal is to have an standardized qf and dim
where both have same style, documentation and
also that is in a format that we can easily
introduce to make check.

Actually all new code here is a simple copy
from dim directly with s/dim/qf.

This patch also introduce qf_usage,
qf_list_commands qf_list_aliases and already
 move qf_help from the case parse $1 to a
subcommand.

v2: Keep default behaviour as git command executed on
    quilt patches directory instead of qf_usage.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 Makefile |   5 +++
 qf       | 109 +++++++++++++++++++++++++++++++++++++++++++++------------------
 qf.rst   |  16 +++++++++-
 3 files changed, 99 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index adf26126e27c..7cb22d2b1e06 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,11 @@ mancheck:
 			echo "$@: $$cmd not documented"; \
 		fi \
 	done
+	@for cmd in $$(./qf list-commands); do \
+		if ! grep -q "^$$cmd" qf.rst; then \
+			echo "$@: $$cmd not documented"; \
+		fi \
+	done
 	rst2man --strict --no-raw dim.rst >/dev/null
 	rst2man --strict --no-raw qf.rst >/dev/null
 
diff --git a/qf b/qf
index 1f056f90ef70..8e7d8c26e68f 100755
--- a/qf
+++ b/qf
@@ -169,28 +169,6 @@ function quilt_clean_check
 	fi
 }
 
-function qf_help
-{
-	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
-	if [ ! -e "$manpage" ]; then
-		manpage=$(dirname $(readlink -f $0))/qf.rst
-		if [ ! -e "$manpage" ]; then
-			echo "Can't find the man page."
-			exit 1
-		fi
-	fi
-
-	if hash rst2man 2>/dev/null; then
-		renderer=rst2man
-		pager="man -l -"
-	else
-		renderer=cat
-		pager=${PAGER:-cat}
-	fi
-
-	$renderer < $manpage | $pager
-}
-
 case "$1" in
 	setup)
 		cd `git rev-parse --show-toplevel`
@@ -480,12 +458,83 @@ case "$1" in
 		shift
 		gitk "$@"
 		;;
-	help)
-		qf_help
-		;;
-	*)
-		cd_toplevel
-		cd patches
-		git "$@"
-		;;
 esac
+
+qf=$(basename $0)
+
+# first positional argument is the subcommand
+if [ -n "$HELP" ] || [ "$#" = "0" ]; then
+    subcommand="usage"
+else
+    subcommand="$1"
+    shift
+fi
+
+function qf_help
+{
+	manpage=$DIM_PREFIX/maintainer-tools/qf.rst
+	if [ ! -e "$manpage" ]; then
+		manpage=$(dirname $(readlink -f $0))/qf.rst
+		if [ ! -e "$manpage" ]; then
+			echo "Can't find the man page."
+			exit 1
+		fi
+	fi
+
+	if hash rst2man 2>/dev/null; then
+		renderer=rst2man
+		pager="man -l -"
+	else
+		renderer=cat
+		pager=${PAGER:-cat}
+	fi
+
+	$renderer < $manpage | $pager
+}
+
+function qf_list_commands
+{
+	declare -F | grep -o " qf_[a-zA-Z_]*" | sed 's/^ qf_//;s/_/-/g'
+}
+
+function qf_list_aliases
+{
+	# use posix mode to omit functions in set output
+	( set -o posix; set ) | grep "^qf_alias_[a-zA-Z0-9_]*=" |\
+		sed 's/^qf_alias_//;s/=/\t/;s/_/-/g'
+}
+
+function qf_usage
+{
+	echo "usage: $qf SUBCOMMAND [ARGUMENTS]"
+	echo
+	echo "The available subcommands are:"
+	if hash column 2>/dev/null; then
+		qf_list_commands | column -c 72 | sed 's/^/\t/'
+	else
+		qf_list_commands | sed 's/^/\t/'
+	fi
+	echo
+	echo "See '$qf help' for more information."
+}
+
+# qf subcommand aliases (with bash 4.3+)
+if ! declare -n subcmd=qf_alias_${subcommand//-/_} &> /dev/null || \
+		test -z "${subcmd:-}"; then
+	subcmd="$subcommand"
+fi
+
+# look up the function by the subcommand name
+subcmd_func=qf_${subcmd//-/_}
+if ! declare -f $subcmd_func >/dev/null; then
+	echo "Using qf as git command on quilt patches directory."
+	cd_toplevel
+	cd patches
+	git "$@"
+	exit $?
+fi
+
+# throw away to not confuse list-aliases
+unset subcmd
+
+$subcmd_func "$@"
diff --git a/qf.rst b/qf.rst
index 902b0d377f41..10447dded391 100644
--- a/qf.rst
+++ b/qf.rst
@@ -95,6 +95,16 @@ $ qf git bisect new|old
 COMMANDS
 ========
 
+list-aliases
+------------
+List all aliases for the subcommand names.
+
+See \$qf_alias_<alias> under ENVIRONMENT below on how to define aliases.
+
+list-commands
+-------------
+List all subcommand names, including aliases.
+
 setup [*branch-name*]
 ---------------------
 Sets up a git repository for this quilt worflow script by
@@ -233,10 +243,14 @@ help
 ----
 This help text here
 
+usage
+-----
+Short form usage help listing all subcommands.
+
 all other subcommands - IMPORTANT
 ---------------------------------
 Any other subcommands are executed directly in the quilt patches
-directory as git commans. When using quilt flow in scripts it is
+directory as git commands. When using quilt flow in scripts it is
 import to use the explicit forwarding to avoid clashes with
 furture extensions.
 
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand.

[Jani Nikula]

On Mon, 21 Aug 2017, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> These sequences here are already covered by `qf git` subcommand.
> I double checked and confirmed that our continuously rebasing
> bot does not use this qf directly here and I'm not aware
> of anyone else using it. So let's remove it so we can start
> handling everything with subcommands (dim style).

Apart from the specific comments from me and Daniel, ack on the
series. This is pretty much how I converted dim way back.

BR,
Jani.



>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  qf     | 7 +------
>  qf.rst | 7 -------
>  2 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/qf b/qf
> index 1f056f90ef70..d1c331023230 100755
> --- a/qf
> +++ b/qf
> @@ -480,12 +480,7 @@ case "$1" in
>  		shift
>  		gitk "$@"
>  		;;
> -	help)
> -		qf_help
> -		;;
>  	*)
> -		cd_toplevel
> -		cd patches
> -		git "$@"
> +		qf_help
>  		;;
>  esac
> diff --git a/qf.rst b/qf.rst
> index 902b0d377f41..f0019d76c53d 100644
> --- a/qf.rst
> +++ b/qf.rst
> @@ -233,13 +233,6 @@ help
>  ----
>  This help text here
>  
> -all other subcommands - IMPORTANT
> ----------------------------------
> -Any other subcommands are executed directly in the quilt patches
> -directory as git commans. When using quilt flow in scripts it is
> -import to use the explicit forwarding to avoid clashes with
> -furture extensions.
> -
>  CONTRIBUTING
>  ============

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx