patman: Use Patch-cc: instead of Cc:

Add a new Patch-cc: tag which performs the service now provided by the Cc: tag. The Cc: tag is interpreted by git send-email but ignored by patman. So now: Cc: patman does nothing. (git send-email can cc patches) Patch-cc: patman Cc's patch and removes this tag from the patch Signed-off-by: Simon Glass <sjg@chromium.org>

patman: Use Patch-cc: instead of Cc:
Add a new Patch-cc: tag which performs the service now provided by the Cc: tag. The Cc: tag is interpreted by git send-email but ignored by patman. So now: Cc: patman does nothing. (git send-email can cc patches) Patch-cc: patman Cc's patch and removes this tag from the patch Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass
1 parent def23217e4
Showing 2 changed files with 14 additions and 11 deletions Side-by-side Diff
tools/patman/README
tools/patman/patchstream.py
@@ -217,8 +217,10 @@
 	to update the log there and then, knowing that the script will
 	do the rest.
  
- Cc: Their Name <email>
-	This copies a single patch to another email address.
+Patch-cc: Their Name <email>
+	This copies a single patch to another email address. Note that the
+	Cc: used by git send-email is ignored by patman, but will be
+	interpreted by git send-email if you use it.
  
 Series-process-log: sort, uniq
 	This tells patman to sort and/or uniq the change logs. It is
@@ -246,8 +248,9 @@
  
 Once the patches are created, patman sends them using git send-email. The
 whole series is sent to the recipients in Series-to: and Series-cc.
-You can Cc individual patches to other people with the Cc: tag. Tags in the
-subject are also picked up to Cc patches. For example, a commit like this:
+You can Cc individual patches to other people with the Patch-cc: tag. Tags
+in the subject are also picked up to Cc patches. For example, a commit like
+this:
  
 >>>>
 commit 10212537b85ff9b6e09c82045127522c0f0db981
  
@@ -258,16 +261,16 @@
  
     This should make sending out e-mails to the right people easier.
  
-    Cc: sandbox, mikef, ag
-    Cc: afleming
+    Patch-cc: sandbox, mikef, ag
+    Patch-cc: afleming
 <<<<
  
 will create a patch which is copied to x86, arm, sandbox, mikef, ag and
 afleming.
  
-If you have a cover letter it will get sent to the union of the CC lists of
-all of the other patches. If you want to sent it to additional people you
-can add a tag:
+If you have a cover letter it will get sent to the union of the Patch-cc
+lists of all of the other patches. If you want to sent it to additional
+people you can add a tag:
  
 Cover-letter-cc: <list of addresses>
  
@@ -36,7 +36,7 @@
 re_commit_tag = re.compile('^Commit-([a-z-]*): *(.*)')
  
 # Commit tags that we want to collect and keep
-re_tag = re.compile('^(Tested-by|Acked-by|Reviewed-by|Cc): (.*)')
+re_tag = re.compile('^(Tested-by|Acked-by|Reviewed-by|Patch-cc): (.*)')
  
 # The start of a new commit in the git log
 re_commit = re.compile('^commit ([0-9a-f]*)$')
@@ -267,7 +267,7 @@
             if (tag_match.group(1) == 'Tested-by' and
                     tag_match.group(2).find(os.getenv('USER') + '@') != -1):
                 self.warn.append("Ignoring %s" % line)
-            elif tag_match.group(1) == 'Cc':
+            elif tag_match.group(1) == 'Patch-cc':
                 self.commit.AddCc(tag_match.group(2).split(','))
             else:
                 self.tags.append(line);
...	...	@@ -217,8 +217,10 @@
217	217	to update the log there and then, knowing that the script will
218	218	do the rest.
219	219
220		- Cc: Their Name <email>
221		- This copies a single patch to another email address.
	220	+Patch-cc: Their Name <email>
	221	+ This copies a single patch to another email address. Note that the
	222	+ Cc: used by git send-email is ignored by patman, but will be
	223	+ interpreted by git send-email if you use it.
222	224
223	225	Series-process-log: sort, uniq
224	226	This tells patman to sort and/or uniq the change logs. It is
...	...	@@ -246,8 +248,9 @@
246	248
247	249	Once the patches are created, patman sends them using git send-email. The
248	250	whole series is sent to the recipients in Series-to: and Series-cc.
249		-You can Cc individual patches to other people with the Cc: tag. Tags in the
250		-subject are also picked up to Cc patches. For example, a commit like this:
	251	+You can Cc individual patches to other people with the Patch-cc: tag. Tags
	252	+in the subject are also picked up to Cc patches. For example, a commit like
	253	+this:
251	254
252	255	>>>>
253	256	commit 10212537b85ff9b6e09c82045127522c0f0db981
254	257
...	...	@@ -258,16 +261,16 @@
258	261
259	262	This should make sending out e-mails to the right people easier.
260	263
261		- Cc: sandbox, mikef, ag
262		- Cc: afleming
	264	+ Patch-cc: sandbox, mikef, ag
	265	+ Patch-cc: afleming
263	266	<<<<
264	267
265	268	will create a patch which is copied to x86, arm, sandbox, mikef, ag and
266	269	afleming.
267	270
268		-If you have a cover letter it will get sent to the union of the CC lists of
269		-all of the other patches. If you want to sent it to additional people you
270		-can add a tag:
	271	+If you have a cover letter it will get sent to the union of the Patch-cc
	272	+lists of all of the other patches. If you want to sent it to additional
	273	+people you can add a tag:
271	274
272	275	Cover-letter-cc: <list of addresses>
273	276
...	...	@@ -36,7 +36,7 @@
36	36	re_commit_tag = re.compile('^Commit-([a-z-]): (.*)')
37	37
38	38	# Commit tags that we want to collect and keep
39		-re_tag = re.compile('^(Tested-by\|Acked-by\|Reviewed-by\|Cc): (.*)')
	39	+re_tag = re.compile('^(Tested-by\|Acked-by\|Reviewed-by\|Patch-cc): (.*)')
40	40
41	41	# The start of a new commit in the git log
42	42	re_commit = re.compile('^commit ([0-9a-f]*)$')
...	...	@@ -267,7 +267,7 @@
267	267	if (tag_match.group(1) == 'Tested-by' and
268	268	tag_match.group(2).find(os.getenv('USER') + '@') != -1):
269	269	self.warn.append("Ignoring %s" % line)
270		- elif tag_match.group(1) == 'Cc':
	270	+ elif tag_match.group(1) == 'Patch-cc':
271	271	self.commit.AddCc(tag_match.group(2).split(','))
272	272	else:
273	273	self.tags.append(line);