[maintainer-tools PATCH 1/5] dim: stop adding Daniel's signed-off-by to driver date updates

[maintainer-tools PATCH 1/5] dim: stop adding Daniel's signed-off-by to driver date updates

[Jani Nikula]

git commit -s option should DTRT.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dim b/dim
index b4e46c698345..6d889bd6a04d 100755
--- a/dim
+++ b/dim
@@ -1522,8 +1522,7 @@ function dim_update_next
 	$DRY sed -i -e "s/^#define DRIVER_DATE.*\"[0-9]*\"$/#define DRIVER_DATE\t\t\"$driver_date\"/; s/^#define DRIVER_TIMESTAMP.*/#define DRIVER_TIMESTAMP\t$driver_timestamp/" \
 	     drivers/gpu/drm/i915/i915_drv.h
 	$DRY git add drivers/gpu/drm/i915/i915_drv.h
-	echo -e "drm/i915: Update DRIVER_DATE to $driver_date\n\nSigned-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>" | \
-		git commit -s -F -
+	git commit $DRY_RUN -sm "drm/i915: Update DRIVER_DATE to $driver_date"
 
 	gitk drm-intel-next-queued ^$(url_to_remote $drm_upstream_git)/drm-next &
 
-- 
2.11.0

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

[maintainer-tools PATCH 2/5] dim: use git format-patch style for *** REMINDERS ***

[Jani Nikula]

git format-patch adds *** SUBJECT HERE *** and similar to remind about
things that need to be filled in. Follow suit.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dim b/dim
index 6d889bd6a04d..248d12f3a8a4 100755
--- a/dim
+++ b/dim
@@ -887,9 +887,7 @@ function dim_backmerge
 	cat > $patch_file <<-HERE
 		Merge $upstream into $branch
 
-		<Explain here why you've done the backmerge, e.g. which patches
-		 or which driver pull request you need to be able to merge
-		 \$feature_work from \$author.>
+		*** DETAILED BACKMERGE RATIONALE HERE ***
 
 		HERE
 
@@ -1426,7 +1424,7 @@ function prep_pull_mail_overview
 	local obj
 
 	if [ "$#" = "0" ]; then
-		echo "*** insert pull request overview here ***"
+		echo "*** PULL REQUEST OVERVIEW HERE ***"
 	else
 		for tag in "$@"; do
 			obj=$(git rev-parse $tag)
@@ -1566,7 +1564,7 @@ function dim_update_next_continue
 	if [[ "$(git cat-file -t $obj)" == "tag" ]] ; then
 		git cat-file -p $obj | tail -n+6 >> $req_file
 	else
-		echo "<tag doesn't contain a changelog overview, fix this>" >> $req_file
+		echo "*** CHANGELOG OVERVIEW HERE ***" >> $req_file
 	fi
 	cat >> $req_file <<-HERE
 
-- 
2.11.0

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

[maintainer-tools PATCH 3/5] dim: remove defaults from pull mail hello/signature

[Jani Nikula]

Historical baggage from the times this was just Daniel's maintainer
script.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/dim b/dim
index 248d12f3a8a4..be98e7295170 100755
--- a/dim
+++ b/dim
@@ -1395,11 +1395,6 @@ function prep_pull_mail_greetings
 {
 	if [ -r $DIM_TEMPLATE_HELLO ]; then
 		cat $DIM_TEMPLATE_HELLO
-	else
-		cat <<-EOF
-		Hi Dave,
-
-		EOF
 	fi
 }
 
@@ -1407,13 +1402,6 @@ function prep_pull_mail_signature
 {
 	if [ -r $DIM_TEMPLATE_SIGNATURE ]; then
 		cat $DIM_TEMPLATE_SIGNATURE
-	else
-		cat <<-EOF
-
-		Cheers, Daniel
-
-
-		EOF
 	fi
 }
 
-- 
2.11.0

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

[maintainer-tools PATCH 4/5] dim: reuse pull request signature for drm-intel-testing mails

[Jani Nikula]

I think adding a new config for this would be overkill, and this is
bound to be more correct than "Cheers, Daniel".

Leave the generic "Hi all" salute in place though.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dim b/dim
index be98e7295170..96baffde5524 100755
--- a/dim
+++ b/dim
@@ -1554,12 +1554,7 @@ function dim_update_next_continue
 	else
 		echo "*** CHANGELOG OVERVIEW HERE ***" >> $req_file
 	fi
-	cat >> $req_file <<-HERE
-
-		Happy testing!
-
-		Cheers, Daniel
-		HERE
+	prep_pull_mail_signature >> $req_file
 
 	$DRY $DIM_MUA -s "Updated drm-intel-testing" \
 	     -i $req_file \
-- 
2.11.0

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

[maintainer-tools PATCH 5/5] dim: update pull and test request recipients

[Jani Nikula]

Make it easier to add/remove people as needed. Add Joonas, Rodrigo and
Sean as new recipients for pull requests. Replace Daniel with Joonas and
Rodrigo as test request recipients.

Perhaps we'll want to make the list branch specific in the future, but
get the low hanging fruit first.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 dim | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/dim b/dim
index 96baffde5524..b177b9b28242 100755
--- a/dim
+++ b/dim
@@ -83,13 +83,27 @@ drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip
 drm_upstream_git=git://people.freedesktop.org/~airlied/linux
 linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 
-# email aliases
-addr_drm_maintainer="Dave Airlie <airlied@gmail.com>"
-addr_intel_gfx_maintainer1="Daniel Vetter <daniel.vetter@ffwll.ch>"
-addr_intel_gfx_maintainer2="Jani Nikula <jani.nikula@linux.intel.com>"
-addr_intel_gfx="intel-gfx@lists.freedesktop.org"
-addr_dri_devel="dri-devel@lists.freedesktop.org"
-addr_intel_qa="\"Jari Tahvanainen\" <jari.tahvanainen@intel.com>"
+# Recipients for all dim based pull requests.
+# Add To: lines to the end, Cc: lines in the beginning with -c.
+pull_request_recipients=(
+	-c "Daniel Vetter <daniel.vetter@ffwll.ch>"
+	-c "Jani Nikula <jani.nikula@linux.intel.com>"
+	-c "Joonas Lahtinen <joonas.lahtinen@linux.intel.com>"
+	-c "Rodrigo Vivi <rodrigo.vivi@intel.com>"
+	-c "Sean Paul <seanpaul@chromium.org>"
+	-c "dri-devel@lists.freedesktop.org"
+	-c "intel-gfx@lists.freedesktop.org"
+	"Dave Airlie <airlied@gmail.com>"
+)
+
+# Recipients for drm-intel-testing updates.
+test_request_recipients=(
+	-c "Jani Nikula <jani.nikula@linux.intel.com>"
+	-c "Joonas Lahtinen <joonas.lahtinen@linux.intel.com>"
+	-c "Rodrigo Vivi <rodrigo.vivi@intel.com>"
+	-c "intel-gfx@lists.freedesktop.org"
+	"Jari Tahvanainen <jari.tahvanainen@intel.com>"
+)
 
 # integration configuration
 integration_config=nightly.conf
@@ -1557,11 +1571,7 @@ function dim_update_next_continue
 	prep_pull_mail_signature >> $req_file
 
 	$DRY $DIM_MUA -s "Updated drm-intel-testing" \
-	     -i $req_file \
-	     -c "$addr_intel_gfx" \
-	     -c "$addr_intel_gfx_maintainer1" \
-	     -c "$addr_intel_gfx_maintainer2" \
-	     "$addr_intel_qa"
+	     -i $req_file "${test_request_recipients[@]}"
 }
 
 function dim_tag_next
@@ -1652,12 +1662,7 @@ function dim_pull_request
 
 	git request-pull $upstream $git_url $tag >> $req_file
 	$DRY $DIM_MUA -s "[PULL] $branch" \
-		-i $req_file \
-		-c "$addr_intel_gfx" \
-		-c "$addr_dri_devel" \
-		-c "$addr_intel_gfx_maintainer1" \
-		-c "$addr_intel_gfx_maintainer2" \
-		"$addr_drm_maintainer"
+	     -i $req_file "${pull_request_recipients[@]}"
 }
 
 function dim_pull_request_next
-- 
2.11.0

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

Re: [maintainer-tools PATCH 5/5] dim: update pull and test request recipients

[Sean Paul]

On Fri, Sep 8, 2017 at 9:30 AM, Jani Nikula <jani.nikula@intel.com> wrote:
> Make it easier to add/remove people as needed. Add Joonas, Rodrigo and
> Sean as new recipients for pull requests. Replace Daniel with Joonas and
> Rodrigo as test request recipients.
>
> Perhaps we'll want to make the list branch specific in the future, but
> get the low hanging fruit first.
>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>

Hi Jani,
For the entire series:

Reviewed-by: Sean Paul <seanpaul@chromium.org> (although this means
I'll have to add default signatures now :/)



> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  dim | 41 +++++++++++++++++++++++------------------
>  1 file changed, 23 insertions(+), 18 deletions(-)
>
> diff --git a/dim b/dim
> index 96baffde5524..b177b9b28242 100755
> --- a/dim
> +++ b/dim
> @@ -83,13 +83,27 @@ drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip
>  drm_upstream_git=git://people.freedesktop.org/~airlied/linux
>  linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
>
> -# email aliases
> -addr_drm_maintainer="Dave Airlie <airlied@gmail.com>"
> -addr_intel_gfx_maintainer1="Daniel Vetter <daniel.vetter@ffwll.ch>"
> -addr_intel_gfx_maintainer2="Jani Nikula <jani.nikula@linux.intel.com>"
> -addr_intel_gfx="intel-gfx@lists.freedesktop.org"
> -addr_dri_devel="dri-devel@lists.freedesktop.org"
> -addr_intel_qa="\"Jari Tahvanainen\" <jari.tahvanainen@intel.com>"
> +# Recipients for all dim based pull requests.
> +# Add To: lines to the end, Cc: lines in the beginning with -c.
> +pull_request_recipients=(
> +       -c "Daniel Vetter <daniel.vetter@ffwll.ch>"
> +       -c "Jani Nikula <jani.nikula@linux.intel.com>"
> +       -c "Joonas Lahtinen <joonas.lahtinen@linux.intel.com>"
> +       -c "Rodrigo Vivi <rodrigo.vivi@intel.com>"
> +       -c "Sean Paul <seanpaul@chromium.org>"
> +       -c "dri-devel@lists.freedesktop.org"
> +       -c "intel-gfx@lists.freedesktop.org"
> +       "Dave Airlie <airlied@gmail.com>"
> +)
> +
> +# Recipients for drm-intel-testing updates.
> +test_request_recipients=(
> +       -c "Jani Nikula <jani.nikula@linux.intel.com>"
> +       -c "Joonas Lahtinen <joonas.lahtinen@linux.intel.com>"
> +       -c "Rodrigo Vivi <rodrigo.vivi@intel.com>"
> +       -c "intel-gfx@lists.freedesktop.org"
> +       "Jari Tahvanainen <jari.tahvanainen@intel.com>"
> +)
>
>  # integration configuration
>  integration_config=nightly.conf
> @@ -1557,11 +1571,7 @@ function dim_update_next_continue
>         prep_pull_mail_signature >> $req_file
>
>         $DRY $DIM_MUA -s "Updated drm-intel-testing" \
> -            -i $req_file \
> -            -c "$addr_intel_gfx" \
> -            -c "$addr_intel_gfx_maintainer1" \
> -            -c "$addr_intel_gfx_maintainer2" \
> -            "$addr_intel_qa"
> +            -i $req_file "${test_request_recipients[@]}"
>  }
>
>  function dim_tag_next
> @@ -1652,12 +1662,7 @@ function dim_pull_request
>
>         git request-pull $upstream $git_url $tag >> $req_file
>         $DRY $DIM_MUA -s "[PULL] $branch" \
> -               -i $req_file \
> -               -c "$addr_intel_gfx" \
> -               -c "$addr_dri_devel" \
> -               -c "$addr_intel_gfx_maintainer1" \
> -               -c "$addr_intel_gfx_maintainer2" \
> -               "$addr_drm_maintainer"
> +            -i $req_file "${pull_request_recipients[@]}"
>  }
>
>  function dim_pull_request_next
> --
> 2.11.0
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 3/5] dim: remove defaults from pull mail hello/signature

[Vivi, Rodrigo]

On Fri, 2017-09-08 at 16:29 +0300, Jani Nikula wrote:
> Historical baggage from the times this was just Daniel's maintainer
> script.
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  dim | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/dim b/dim
> index 248d12f3a8a4..be98e7295170 100755
> --- a/dim
> +++ b/dim
> @@ -1395,11 +1395,6 @@ function prep_pull_mail_greetings
>  {
>  	if [ -r $DIM_TEMPLATE_HELLO ]; then
>  		cat $DIM_TEMPLATE_HELLO
> -	else
> -		cat <<-EOF
> -		Hi Dave,
> -
> -		EOF
>  	fi
>  }
>  
> @@ -1407,13 +1402,6 @@ function prep_pull_mail_signature
>  {
>  	if [ -r $DIM_TEMPLATE_SIGNATURE ]; then
>  		cat $DIM_TEMPLATE_SIGNATURE

This template signature didn't work for me with "," on it... 
how do you use it?

Btw Acked-by on the whole series...

> -	else
> -		cat <<-EOF
> -
> -		Cheers, Daniel
> -
> -
> -		EOF
>  	fi
>  }
>  

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

Re: [maintainer-tools PATCH 5/5] dim: update pull and test request recipients

[Jani Nikula]

On Fri, 08 Sep 2017, Sean Paul <seanpaul@chromium.org> wrote:
> On Fri, Sep 8, 2017 at 9:30 AM, Jani Nikula <jani.nikula@intel.com> wrote:
>> Make it easier to add/remove people as needed. Add Joonas, Rodrigo and
>> Sean as new recipients for pull requests. Replace Daniel with Joonas and
>> Rodrigo as test request recipients.
>>
>> Perhaps we'll want to make the list branch specific in the future, but
>> get the low hanging fruit first.
>>
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Sean Paul <seanpaul@chromium.org>
>
> Hi Jani,
> For the entire series:
>
> Reviewed-by: Sean Paul <seanpaul@chromium.org> (although this means
> I'll have to add default signatures now :/)

Thanks, pushed. You don't have to add signatures... you'll just get none
instead of Daniel's signature. ;)

BR,
Jani.

>
>
>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  dim | 41 +++++++++++++++++++++++------------------
>>  1 file changed, 23 insertions(+), 18 deletions(-)
>>
>> diff --git a/dim b/dim
>> index 96baffde5524..b177b9b28242 100755
>> --- a/dim
>> +++ b/dim
>> @@ -83,13 +83,27 @@ drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip
>>  drm_upstream_git=git://people.freedesktop.org/~airlied/linux
>>  linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
>>
>> -# email aliases
>> -addr_drm_maintainer="Dave Airlie <airlied@gmail.com>"
>> -addr_intel_gfx_maintainer1="Daniel Vetter <daniel.vetter@ffwll.ch>"
>> -addr_intel_gfx_maintainer2="Jani Nikula <jani.nikula@linux.intel.com>"
>> -addr_intel_gfx="intel-gfx@lists.freedesktop.org"
>> -addr_dri_devel="dri-devel@lists.freedesktop.org"
>> -addr_intel_qa="\"Jari Tahvanainen\" <jari.tahvanainen@intel.com>"
>> +# Recipients for all dim based pull requests.
>> +# Add To: lines to the end, Cc: lines in the beginning with -c.
>> +pull_request_recipients=(
>> +       -c "Daniel Vetter <daniel.vetter@ffwll.ch>"
>> +       -c "Jani Nikula <jani.nikula@linux.intel.com>"
>> +       -c "Joonas Lahtinen <joonas.lahtinen@linux.intel.com>"
>> +       -c "Rodrigo Vivi <rodrigo.vivi@intel.com>"
>> +       -c "Sean Paul <seanpaul@chromium.org>"
>> +       -c "dri-devel@lists.freedesktop.org"
>> +       -c "intel-gfx@lists.freedesktop.org"
>> +       "Dave Airlie <airlied@gmail.com>"
>> +)
>> +
>> +# Recipients for drm-intel-testing updates.
>> +test_request_recipients=(
>> +       -c "Jani Nikula <jani.nikula@linux.intel.com>"
>> +       -c "Joonas Lahtinen <joonas.lahtinen@linux.intel.com>"
>> +       -c "Rodrigo Vivi <rodrigo.vivi@intel.com>"
>> +       -c "intel-gfx@lists.freedesktop.org"
>> +       "Jari Tahvanainen <jari.tahvanainen@intel.com>"
>> +)
>>
>>  # integration configuration
>>  integration_config=nightly.conf
>> @@ -1557,11 +1571,7 @@ function dim_update_next_continue
>>         prep_pull_mail_signature >> $req_file
>>
>>         $DRY $DIM_MUA -s "Updated drm-intel-testing" \
>> -            -i $req_file \
>> -            -c "$addr_intel_gfx" \
>> -            -c "$addr_intel_gfx_maintainer1" \
>> -            -c "$addr_intel_gfx_maintainer2" \
>> -            "$addr_intel_qa"
>> +            -i $req_file "${test_request_recipients[@]}"
>>  }
>>
>>  function dim_tag_next
>> @@ -1652,12 +1662,7 @@ function dim_pull_request
>>
>>         git request-pull $upstream $git_url $tag >> $req_file
>>         $DRY $DIM_MUA -s "[PULL] $branch" \
>> -               -i $req_file \
>> -               -c "$addr_intel_gfx" \
>> -               -c "$addr_dri_devel" \
>> -               -c "$addr_intel_gfx_maintainer1" \
>> -               -c "$addr_intel_gfx_maintainer2" \
>> -               "$addr_drm_maintainer"
>> +            -i $req_file "${pull_request_recipients[@]}"
>>  }
>>
>>  function dim_pull_request_next
>> --
>> 2.11.0
>>

-- 
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 3/5] dim: remove defaults from pull mail hello/signature

[Jani Nikula]

On Sat, 09 Sep 2017, "Vivi, Rodrigo" <rodrigo.vivi@intel.com> wrote:
> On Fri, 2017-09-08 at 16:29 +0300, Jani Nikula wrote:
>> Historical baggage from the times this was just Daniel's maintainer
>> script.
>> 
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  dim | 12 ------------
>>  1 file changed, 12 deletions(-)
>> 
>> diff --git a/dim b/dim
>> index 248d12f3a8a4..be98e7295170 100755
>> --- a/dim
>> +++ b/dim
>> @@ -1395,11 +1395,6 @@ function prep_pull_mail_greetings
>>  {
>>  	if [ -r $DIM_TEMPLATE_HELLO ]; then
>>  		cat $DIM_TEMPLATE_HELLO
>> -	else
>> -		cat <<-EOF
>> -		Hi Dave,
>> -
>> -		EOF
>>  	fi
>>  }
>>  
>> @@ -1407,13 +1402,6 @@ function prep_pull_mail_signature
>>  {
>>  	if [ -r $DIM_TEMPLATE_SIGNATURE ]; then
>>  		cat $DIM_TEMPLATE_SIGNATURE
>
> This template signature didn't work for me with "," on it... 
> how do you use it?

I just have the signature in the file ~/.dim.template.signature which is
the default. But you should be able to use your own location too. Just
make sure it's an absolute path, using $HOME or something.

BR,
Jani.


>
> Btw Acked-by on the whole series...
>
>> -	else
>> -		cat <<-EOF
>> -
>> -		Cheers, Daniel
>> -
>> -
>> -		EOF
>>  	fi
>>  }
>>  
>

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