Change in coreboot[master]: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44843 )

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"

Marking dependencies has undergone some change in Chrome OS tree. The
script to cherry-pick the changes to ChromeOS tree prepends "Original-" to
the concerned meta data i.e. Cq-Depend becomes Original-Cq-Depend. This
causes dependencies to not take effect when changes are submitted to the
continuous integration. Do not prepend "Original-" to the dependency
meta data.

BUG=None
TEST=Ensure that the Cq-Depend line is added without any prefix.

Change-Id: I0503234954f872ee56708e19e89cae9d9fa30df7
Signed-off-by: Karthikeyan Ramasubramanian 
---
M util/scripts/cross-repo-cherrypick
1 file changed, 6 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/44843/1

diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 3fbc46f..3794e20 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -54,12 +54,17 @@
    		'"${SPLICE_CMD}"'
    	}
    	end=1
-	}; /^(BUG|BRANCH|TEST|CQ-DEPEND)=/ {
+	}; /^(BUG|BRANCH|TEST)=/ {
    	if (end==0) {
    		print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
    		print "";
    	}
    	end=1
+	}; /^Cq-Depend:/ {
+		if (end==0) {
+			print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
+		}
+		end=1
    }; {
    	if (end==0)
    		print "Original-" $0;

[Paul Fagerburg (Code Review)]

Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44843 )

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

Patch Set 1: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44843 )

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/44843/1/util/scripts/cross-repo-che... 
File util/scripts/cross-repo-cherrypick:

https://review.coreboot.org/c/coreboot/+/44843/1/util/scripts/cross-repo-che... 
PS1, Line 64: 		if (end==0) {
Thanks for taking this on!

I'm not sure if this is correct, though: The way this works is that the commit message is replayed backwards (last line first) by the use of tax in line 51. When one of the BUG|BRANCH|TEST lines is identified, we assume that the last block (that came first) is over and add the Original-Commit-Id and Signed-off-by lines. Cq-Depend, however, can appear anywhere in the last block.

I'd simply make the /^Cq-Depend:/ condition print out the original line unchanged unconditionally.

[Karthik Ramasubramanian (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Furquan Shaikh, Martin Roth, Tim Wawrzynczak, Paul Fagerburg, Dossym Nurmukhanov,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/44843

to look at the new patch set (#2).

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"

Marking dependencies has undergone some change in Chrome OS tree. The
script to cherry-pick the changes to ChromeOS tree prepends "Original-" to
the concerned meta data i.e. Cq-Depend becomes Original-Cq-Depend. This
causes dependencies to not take effect when changes are submitted to the
continuous integration. Do not prepend "Original-" to the dependency
meta data.

BUG=None
TEST=Ensure that the Cq-Depend line is added without any prefix.

Change-Id: I0503234954f872ee56708e19e89cae9d9fa30df7
Signed-off-by: Karthikeyan Ramasubramanian 
---
M util/scripts/cross-repo-cherrypick
1 file changed, 4 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/44843/2

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44843 )

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/44843/1/util/scripts/cross-repo-che... 
File util/scripts/cross-repo-cherrypick:

https://review.coreboot.org/c/coreboot/+/44843/1/util/scripts/cross-repo-che... 
PS1, Line 64: 		if (end==0) {
> Thanks for taking this on! […]

I assumed that Cq-Depend will always be the first line in the last block. But you are right. If that assumption does not hold true, then the rest of the meta data will be in broken state.

[Paul Fagerburg (Code Review)]

Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44843 )

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

Patch Set 2: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44843 )

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

Patch Set 2: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44843 )

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"

Marking dependencies has undergone some change in Chrome OS tree. The
script to cherry-pick the changes to ChromeOS tree prepends "Original-" to
the concerned meta data i.e. Cq-Depend becomes Original-Cq-Depend. This
causes dependencies to not take effect when changes are submitted to the
continuous integration. Do not prepend "Original-" to the dependency
meta data.

BUG=None
TEST=Ensure that the Cq-Depend line is added without any prefix.

Change-Id: I0503234954f872ee56708e19e89cae9d9fa30df7
Signed-off-by: Karthikeyan Ramasubramanian 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44843
Tested-by: build bot (Jenkins) 
Reviewed-by: Paul Fagerburg 
Reviewed-by: Furquan Shaikh 
---
M util/scripts/cross-repo-cherrypick
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Paul Fagerburg: Looks good to me, approved

diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 3fbc46f..35e4b33 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -54,12 +54,15 @@
    		'"${SPLICE_CMD}"'
    	}
    	end=1
-	}; /^(BUG|BRANCH|TEST|CQ-DEPEND)=/ {
+	}; /^(BUG|BRANCH|TEST)=/ {
    	if (end==0) {
    		print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
    		print "";
    	}
    	end=1
+	}; /^Cq-Depend:/ {
+		print $0;
+		next
    }; {
    	if (end==0)
    		print "Original-" $0;