[maintainer-tools PATCH 1/4] doc: add documentation for dim commit-add-tag

[maintainer-tools PATCH 1/4] doc: add documentation for dim commit-add-tag

[Jani Nikula]

Reported by 'make mancheck'.

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

diff --git a/dim.rst b/dim.rst
index 8b4653aacbda..802c776e03f9 100644
--- a/dim.rst
+++ b/dim.rst
@@ -204,6 +204,10 @@ apply [*git am arguments*]
 --------------------------
 **apply-branch** shorthand for the current branch.
 
+commit-add-tag *string* [...]
+-----------------------------
+Append each argument at the end of the commit message of HEAD.
+
 extract-tags *branch* [*git-rangeish*]
 --------------------------------------
 This extracts various tags (e.g. Reviewed-by:) from emails and applies them to the
-- 
2.11.0

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

[maintainer-tools PATCH 2/4] dim: remove dim cherry-pick-branch subcommand

[Jani Nikula]

Demote dim_cherry_pick_branch to an internal function. It's too
specialized (at least for now) to be useful for anything other than as a
helper for the cherry-pick-fixes and cherry-pick-next-fixes subcommands.

As a side effect, fixes mancheck for missing documentation for the
subcommand.

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

diff --git a/dim b/dim
index 2b377cb3a3f3..2f8da975c36a 100755
--- a/dim
+++ b/dim
@@ -987,7 +987,7 @@ function git_list_fixes
 	    "$@"
 }
 
-function dim_cherry_pick_branch
+function cherry_pick_branch
 {
 	local branch log fail_log needed have_fixes
 
@@ -1057,13 +1057,13 @@ function dim_cherry_pick_branch
 function dim_cherry_pick_fixes
 {
 	assert_branch drm-intel-fixes
-	dim_cherry_pick_branch drm-intel-fixes "$@"
+	cherry_pick_branch drm-intel-fixes "$@"
 }
 
 function dim_cherry_pick_next_fixes
 {
 	assert_branch drm-intel-next-fixes
-	dim_cherry_pick_branch drm-intel-next-fixes "$@"
+	cherry_pick_branch drm-intel-next-fixes "$@"
 }
 
 dim_alias_ar=apply-resolved
-- 
2.11.0

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

[maintainer-tools PATCH 3/4] dim: remove af and anf aliases

[Jani Nikula]

We don't generally apply patches to the drm-intel-fixes or
drm-intel-next-fixes trees, we cherry-pick instead, so the aliases are
unnecessary.

And, of course, anyone really needing them can add them as personal
aliases in their dimrc.

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

diff --git a/dim b/dim
index 2f8da975c36a..d9820ac87358 100755
--- a/dim
+++ b/dim
@@ -921,13 +921,11 @@ function dim_apply_queued
 	dim_apply_branch drm-intel-next-queued "$@"
 }
 
-dim_alias_af=apply-fixes
 function dim_apply_fixes
 {
 	dim_apply_branch drm-intel-fixes "$@"
 }
 
-dim_alias_anf=apply-next-fixes
 function dim_apply_next_fixes
 {
 	dim_apply_branch drm-intel-next-fixes "$@"
-- 
2.11.0

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

[maintainer-tools PATCH 4/4] dim: fix list-aliases to not include itself

[Jani Nikula]

dim list-aliases lists "list-aliases" as being an alias of
"list-aliases". This is because the temporary subcmd variable reference
is erroneously included in the list. Unset it.

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

diff --git a/dim b/dim
index d9820ac87358..011cedbd3b6a 100755
--- a/dim
+++ b/dim
@@ -2053,4 +2053,7 @@ if ! declare -f $subcmd_func >/dev/null; then
 	exit 1
 fi
 
+# throw away to not confuse list-aliases
+unset subcmd
+
 $subcmd_func "$@"
-- 
2.11.0

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

Re: [maintainer-tools PATCH 1/4] doc: add documentation for dim commit-add-tag

[Rodrigo Vivi]

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Fri, Aug 11, 2017 at 06:03:22PM +0300, Jani Nikula wrote:
> Reported by 'make mancheck'.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  dim.rst | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/dim.rst b/dim.rst
> index 8b4653aacbda..802c776e03f9 100644
> --- a/dim.rst
> +++ b/dim.rst
> @@ -204,6 +204,10 @@ apply [*git am arguments*]
>  --------------------------
>  **apply-branch** shorthand for the current branch.
>  
> +commit-add-tag *string* [...]
> +-----------------------------
> +Append each argument at the end of the commit message of HEAD.
> +
>  extract-tags *branch* [*git-rangeish*]
>  --------------------------------------
>  This extracts various tags (e.g. Reviewed-by:) from emails and applies them to the
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 2/4] dim: remove dim cherry-pick-branch subcommand

[Rodrigo Vivi]

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>


On Fri, Aug 11, 2017 at 06:03:23PM +0300, Jani Nikula wrote:
> Demote dim_cherry_pick_branch to an internal function. It's too
> specialized (at least for now) to be useful for anything other than as a
> helper for the cherry-pick-fixes and cherry-pick-next-fixes subcommands.
> 
> As a side effect, fixes mancheck for missing documentation for the
> subcommand.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  dim | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/dim b/dim
> index 2b377cb3a3f3..2f8da975c36a 100755
> --- a/dim
> +++ b/dim
> @@ -987,7 +987,7 @@ function git_list_fixes
>  	    "$@"
>  }
>  
> -function dim_cherry_pick_branch
> +function cherry_pick_branch
>  {
>  	local branch log fail_log needed have_fixes
>  
> @@ -1057,13 +1057,13 @@ function dim_cherry_pick_branch
>  function dim_cherry_pick_fixes
>  {
>  	assert_branch drm-intel-fixes
> -	dim_cherry_pick_branch drm-intel-fixes "$@"
> +	cherry_pick_branch drm-intel-fixes "$@"
>  }
>  
>  function dim_cherry_pick_next_fixes
>  {
>  	assert_branch drm-intel-next-fixes
> -	dim_cherry_pick_branch drm-intel-next-fixes "$@"
> +	cherry_pick_branch drm-intel-next-fixes "$@"
>  }
>  
>  dim_alias_ar=apply-resolved
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 4/4] dim: fix list-aliases to not include itself

[Rodrigo Vivi]

On Fri, Aug 11, 2017 at 06:03:25PM +0300, Jani Nikula wrote:
> dim list-aliases lists "list-aliases" as being an alias of
> "list-aliases". This is because the temporary subcmd variable reference
> is erroneously included in the list. Unset it.

I got confused with to many list-aliases list-aliases, so I run dim list-aliases
and understood what you meant... ;)


Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  dim | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/dim b/dim
> index d9820ac87358..011cedbd3b6a 100755
> --- a/dim
> +++ b/dim
> @@ -2053,4 +2053,7 @@ if ! declare -f $subcmd_func >/dev/null; then
>  	exit 1
>  fi
>  
> +# throw away to not confuse list-aliases
> +unset subcmd
> +
>  $subcmd_func "$@"
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 3/4] dim: remove af and anf aliases

[Rodrigo Vivi]

On Fri, Aug 11, 2017 at 06:03:24PM +0300, Jani Nikula wrote:
> We don't generally apply patches to the drm-intel-fixes or
> drm-intel-next-fixes trees, we cherry-pick instead, so the aliases are
> unnecessary.

great! this always confused me honestly, but I thought you were
the one using this somehow.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> 
> And, of course, anyone really needing them can add them as personal
> aliases in their dimrc.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  dim | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/dim b/dim
> index 2f8da975c36a..d9820ac87358 100755
> --- a/dim
> +++ b/dim
> @@ -921,13 +921,11 @@ function dim_apply_queued
>  	dim_apply_branch drm-intel-next-queued "$@"
>  }
>  
> -dim_alias_af=apply-fixes
>  function dim_apply_fixes
>  {
>  	dim_apply_branch drm-intel-fixes "$@"
>  }
>  
> -dim_alias_anf=apply-next-fixes
>  function dim_apply_next_fixes
>  {
>  	dim_apply_branch drm-intel-next-fixes "$@"
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [maintainer-tools PATCH 1/4] doc: add documentation for dim commit-add-tag

[Jani Nikula]

On Fri, 11 Aug 2017, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Thanks, pushed the lot.

BR,
Jani.

>
> On Fri, Aug 11, 2017 at 06:03:22PM +0300, Jani Nikula wrote:
>> Reported by 'make mancheck'.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  dim.rst | 4 ++++
>>  1 file changed, 4 insertions(+)
>> 
>> diff --git a/dim.rst b/dim.rst
>> index 8b4653aacbda..802c776e03f9 100644
>> --- a/dim.rst
>> +++ b/dim.rst
>> @@ -204,6 +204,10 @@ apply [*git am arguments*]
>>  --------------------------
>>  **apply-branch** shorthand for the current branch.
>>  
>> +commit-add-tag *string* [...]
>> +-----------------------------
>> +Append each argument at the end of the commit message of HEAD.
>> +
>>  extract-tags *branch* [*git-rangeish*]
>>  --------------------------------------
>>  This extracts various tags (e.g. Reviewed-by:) from emails and applies them to the
>> -- 
>> 2.11.0
>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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