Skip to contentSkip to conversation

doc: add documentation for dim commit-add-tag

PATCH In review Jani Nikula 2 participants 9 messages Aug 11, 2017 – Aug 14, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 doc: add documentation for dim commit-add-tag

Reported by 'make mancheck'.

---
 dim.rst | 4 ++++
 1 file changed, 4 insertions(+)
dim.rst +4 -0
index 8b4653aacbda..802c776e03f9 100644
@@ -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
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/4 dim: remove dim cherry-pick-branch subcommand

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.

---
 dim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
dim +3 -3
index 2b377cb3a3f3..2f8da975c36a 100755
@@ -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
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/4
#2 lore raw

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

Quoted 48 lines · 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.

---
 dim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
dim +3 -3
index 2b377cb3a3f3..2f8da975c36a 100755
@@ -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
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

PATCH 3/4 dim: remove af and anf aliases

In reply to 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.

---
 dim | 2 --
 1 file changed, 2 deletions(-)
dim +0 -2
index 2f8da975c36a..d9820ac87358 100755
@@ -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 "$@"
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 3/4
#4 lore raw

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

Quoted 3 lines · 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.

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

Quoted 34 lines

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

---
 dim | 2 --
 1 file changed, 2 deletions(-)
dim +0 -2
index 2f8da975c36a..d9820ac87358 100755
@@ -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 "$@"
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

PATCH 4/4 dim: fix list-aliases to not include itself

In reply to 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.

---
 dim | 3 +++
 1 file changed, 3 insertions(+)
dim +3 -0
index d9820ac87358..011cedbd3b6a 100755
@@ -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 "$@"
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 4/4
#6 lore raw

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

Quoted 3 lines · 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.

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

Quoted 25 lines
---
 dim | 3 +++
 1 file changed, 3 insertions(+)
dim +3 -0
index d9820ac87358..011cedbd3b6a 100755
@@ -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 "$@"
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/4
#7 lore raw
In reply to Jani Nikula
Quoted 29 lines · Jani Nikula

Reported by 'make mancheck'.

---
 dim.rst | 4 ++++
 1 file changed, 4 insertions(+)
dim.rst +4 -0
index 8b4653aacbda..802c776e03f9 100644
@@ -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
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw
Quoted 1 line · Rodrigo Vivi

Thanks, pushed the lot.

BR,
Jani.

Quoted 31 lines · Jani Nikula
Quoted 29 lines

Reported by 'make mancheck'.

---
 dim.rst | 4 ++++
 1 file changed, 4 insertions(+)
dim.rst +4 -0
index 8b4653aacbda..802c776e03f9 100644
@@ -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
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx