Attachment #149689 for bug #195252

Lines 3-9 Link Here

(-)Makefile.common (-1 / +1 lines)
3		3
4	PORTNAME= subversion	4	PORTNAME= subversion
5	PORTVERSION= 1.7.18	5	PORTVERSION= 1.7.18
6	PORTREVISION?= 0	6	PORTREVISION?= 1
7	CATEGORIES+= devel	7	CATEGORIES+= devel
8	MASTER_SITES= ${MASTER_SITE_APACHE}	8	MASTER_SITES= ${MASTER_SITE_APACHE}
9	DIST_SUBDIR= subversion17	9	DIST_SUBDIR= subversion17




--- subversion/svn/util.c.orig	2014-03-20 14:29:13.887966536 -0400
+++ subversion/svn/util.c	2014-03-20 14:29:53.806964066 -0400
@@ -66,6 +66,9 @@
 #include "private/svn_opt_private.h"
 #include "private/svn_client_private.h"
 #include "private/svn_cmdline_private.h"
 #include "private/svn_string_private.h"
+#ifdef HAS_ORGANIZATION_NAME
+#include "freebsd-organization.h"

 
 
 
@@ -322,6 +325,71 @@
 }
 
 

+
+static const char *prefixes[] = {
+  "PR:",
+  "Differential Revision:",
+  "Submitted by:",
+  "Reported by:",
+  "Reviewed by:",
+  "Approved by:",
+  "Obtained from:",

 #define EDITOR_EOF_PREFIX  _("--This line, and those below, will be ignored--")
 
 svn_error_t *
@@ -337,8 +403,40 @@
 
   /* Set default message.  */
   default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
+  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "Reported by:\t" APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR);

-  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above:                     76 columns --|" APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> PR:                       If a GNATS PR is affected by the change." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Differential Revision:    https://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Submitted by:             If someone else sent in the change." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Reported by:              If someone else reported the issue." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Reviewed by:              If someone else reviewed your modification." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Approved by:              If you needed approval for this commit." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Obtained from:            If the change is from a third party." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> MFC after:                N [day[s]|week[s]|month[s]].  Request a reminder email." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> MFH:                      Ports tree branch name.  Request approval for merge." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Relnotes:                 Set to 'yes' for mention in release notes." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Security:                 Vulnerability reference (one per line) or description." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Sponsored by:             If the change was sponsored by an organization." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
 
   *tmp_file = NULL;
   if (lmb->message)
@@ -350,6 +447,7 @@
          that follows it.  */
       truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
                                 EDITOR_EOF_PREFIX);

 
       /* Make a string from a stringbuf, sharing the data allocation. */
       log_msg_str->data = log_msg_buf->data;
@@ -470,6 +568,13 @@
       if (message)
         truncate_buffer_at_prefix(&message->len, message->data,
                                   EDITOR_EOF_PREFIX);

Return to bug 195252

Lines 1-8 Link Here

(-)files/extra-patch-fbsd-template (-18 / +24 lines)
1	--- ./subversion/svn/util.c.orig 2011-10-20 16:01:47.000000000 +0200	1	--- subversion/svn/util.c.orig 2014-03-20 14:29:13.887966536 -0400
2	+++ ./subversion/svn/util.c 2014-04-11 19:04:14.000000000 +0200	2	+++ subversion/svn/util.c 2014-03-20 14:29:53.806964066 -0400
3	@@ -63,6 +63,9 @@	3	@@ -66,6 +66,9 @@
4	#include "private/svn_opt_private.h"
5	#include "private/svn_client_private.h"	4	#include "private/svn_client_private.h"
		5	#include "private/svn_cmdline_private.h"
6	#include "private/svn_string_private.h"	6	#include "private/svn_string_private.h"
7	+#ifdef HAS_ORGANIZATION_NAME	7	+#ifdef HAS_ORGANIZATION_NAME
8	+#include "freebsd-organization.h"	8	+#include "freebsd-organization.h"
Lines 10-16 Link Here
10		10
11		11
12		12
13	@@ -682,6 +685,69 @@	13	@@ -322,6 +325,71 @@
14	}	14	}
15		15
16		16
Lines 22-28 Link Here
22	+	22	+
23	+static const char *prefixes[] = {	23	+static const char *prefixes[] = {
24	+ "PR:",	24	+ "PR:",
		25	+ "Differential Revision:",
25	+ "Submitted by:",	26	+ "Submitted by:",
		27	+ "Reported by:",
26	+ "Reviewed by:",	28	+ "Reviewed by:",
27	+ "Approved by:",	29	+ "Approved by:",
28	+ "Obtained from:",	30	+ "Obtained from:",
Lines 80-93 Link Here
80	#define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")	82	#define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")
81		83
82	svn_error_t *	84	svn_error_t *
83	@@ -697,8 +763,36 @@	85	@@ -337,8 +403,40 @@
84		86
85	/* Set default message. */	87	/* Set default message. */
86	default_msg = svn_stringbuf_create(APR_EOL_STR, pool);	88	default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
87	+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);	89	+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
88	+ svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR);	90	+ svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR);
		91	+ svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR);
89	+ svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR);	92	+ svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR);
90	+ svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR);	93	+ svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR);
		94	+ svn_stringbuf_appendcstr(default_msg, "Reported by:\t" APR_EOL_STR);
91	+ svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR);	95	+ svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR);
92	+ svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR);	96	+ svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR);
93	+ svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR);	97	+ svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR);
Lines 103-124 Link Here
103	- svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR);	107	- svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR);
104	+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);	108	+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
105	+ svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above: 76 columns --\|" APR_EOL_STR);	109	+ svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above: 76 columns --\|" APR_EOL_STR);
106	+ svn_stringbuf_appendcstr(default_msg, "> PR: If a GNATS PR is affected by the change." APR_EOL_STR);	110	+ svn_stringbuf_appendcstr(default_msg, "> PR: If a GNATS PR is affected by the change." APR_EOL_STR);
107	+ svn_stringbuf_appendcstr(default_msg, "> Submitted by: If someone else sent in the change." APR_EOL_STR);	111	+ svn_stringbuf_appendcstr(default_msg, "> Differential Revision: https://reviews.freebsd.org/D### (full phabric URL needed)." APR_EOL_STR);
108	+ svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." APR_EOL_STR);	112	+ svn_stringbuf_appendcstr(default_msg, "> Submitted by: If someone else sent in the change." APR_EOL_STR);
109	+ svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR);	113	+ svn_stringbuf_appendcstr(default_msg, "> Reported by: If someone else reported the issue." APR_EOL_STR);
110	+ svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR);	114	+ svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." APR_EOL_STR);
111	+ svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]\|week[s]\|month[s]]. Request a reminder email." APR_EOL_STR);	115	+ svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR);
112	+ svn_stringbuf_appendcstr(default_msg, "> MFH: Ports tree branch name. Request approval for merge." APR_EOL_STR);	116	+ svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR);
113	+ svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR);	117	+ svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]\|week[s]\|month[s]]. Request a reminder email." APR_EOL_STR);
114	+ svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR);	118	+ svn_stringbuf_appendcstr(default_msg, "> MFH: Ports tree branch name. Request approval for merge." APR_EOL_STR);
115	+ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR);	119	+ svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR);
		120	+ svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR);
		121	+ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR);
116	+ svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR);	122	+ svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR);
117	+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);	123	+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
118		124
119	*tmp_file = NULL;	125	*tmp_file = NULL;
120	if (lmb->message)	126	if (lmb->message)
121	@@ -710,6 +804,7 @@	127	@@ -350,6 +447,7 @@
122	that follows it. */	128	that follows it. */
123	truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,	129	truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
124	EDITOR_EOF_PREFIX);	130	EDITOR_EOF_PREFIX);
Lines 126-132 Link Here
126		132
127	/* Make a string from a stringbuf, sharing the data allocation. */	133	/* Make a string from a stringbuf, sharing the data allocation. */
128	log_msg_str->data = log_msg_buf->data;	134	log_msg_str->data = log_msg_buf->data;
129	@@ -830,6 +925,13 @@	135	@@ -470,6 +568,13 @@
130	if (message)	136	if (message)
131	truncate_buffer_at_prefix(&message->len, message->data,	137	truncate_buffer_at_prefix(&message->len, message->data,
132	EDITOR_EOF_PREFIX);	138	EDITOR_EOF_PREFIX);