Page MenuHomeFreeBSD
Differential D2943 Diff 6569 head/devel/subversion/files/extra-patch-fbsd-template

Changeset View

Standalone View

View Options

head/devel/subversion/files/extra-patch-fbsd-template

--- subversion/svn/util.c.orig 2014-03-20 14:29:13.887966536 -0400 --- subversion/svn/util.c.orig 2013-07-10 04:00:05 UTC
+++ subversion/svn/util.c 2014-03-20 14:29:53.806964066 -0400 +++ subversion/svn/util.c
@@ -66,6 +66,9 @@ @@ -66,6 +66,9 @@
#include "private/svn_client_private.h" #include "private/svn_client_private.h"
#include "private/svn_cmdline_private.h" #include "private/svn_cmdline_private.h"
#include "private/svn_string_private.h" #include "private/svn_string_private.h"
+#ifdef HAS_ORGANIZATION_NAME +#ifdef HAS_ORGANIZATION_NAME
+#include "freebsd-organization.h" +#include "freebsd-organization.h"
+#endif +#endif
␌ ␌
@@ -322,6 +325,70 @@ @@ -322,6 +325,70 @@ truncate_buffer_at_prefix(apr_size_t *ne
} }
+/* +/*
+ * Since we're adding freebsd-specific tokens to the log message, + * Since we're adding freebsd-specific tokens to the log message,
+ * clean out any leftovers to avoid accidently sending them to other + * clean out any leftovers to avoid accidently sending them to other
+ * projects that won't be expecting them. + * projects that won't be expecting them.
+ */ + */
+ +
+static const char *prefixes[] = { +static const char *prefixes[] = {
+ "PR:", + "PR:",
+ "Differential Revision:",
+ "Submitted by:", + "Submitted by:",
+ "Reviewed by:", + "Reviewed by:",
+ "Approved by:", + "Approved by:",
+ "Obtained from:", + "Obtained from:",
+ "MFC after:", + "MFC after:",
+ "MFH:", + "MFH:",
+ "Relnotes:", + "Relnotes:",
+ "Security:", + "Security:",
+ "Sponsored by:" + "Sponsored by:"
+ "Differential Revision:",
+}; +};
+ +
+void +void
+cleanmsg(apr_size_t *l, char *s) +cleanmsg(apr_size_t *l, char *s)
+{ +{
+ int i; + int i;
+ char *pos; + char *pos;
+ char *kw; + char *kw;
Show All 33 Lines
+ } + }
+ } + }
+ } + }
+} +}
+ +
#define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")
svn_error_t * svn_error_t *
@@ -337,8 +403,38 @@ @@ -337,8 +404,38 @@ svn_cl__get_log_message(const char **log
/* Set default message. */ /* Set default message. */
default_msg = svn_stringbuf_create(APR_EOL_STR, pool); default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "PR:\t\t" 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, "Submitted by:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Approved 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, "Obtained from:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t" + svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t"
+#ifdef HAS_ORGANIZATION_NAME +#ifdef HAS_ORGANIZATION_NAME
+ ORGANIZATION_NAME + ORGANIZATION_NAME
+#endif +#endif
+ APR_EOL_STR); + APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX); svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX);
- svn_stringbuf_appendcstr(default_msg, APR_EOL_STR 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, 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, "> 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, "> 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, "> Submitted by: If someone else sent in the change." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." 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, "> 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, "> 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, "> 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, "> 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, "> 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, "> 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, "> Sponsored by: If the change was sponsored by an organization." 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, "> Empty fields above will be automatically removed." 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); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
*tmp_file = NULL; *tmp_file = NULL;
if (lmb->message) if (lmb->message)
@@ -350,6 +444,7 @@ @@ -350,6 +447,7 @@ svn_cl__get_log_message(const char **log
that follows it. */ that follows it. */
truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data, truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
EDITOR_EOF_PREFIX); EDITOR_EOF_PREFIX);
+ cleanmsg(NULL, (char*)log_msg_buf->data); + cleanmsg(NULL, (char*)log_msg_buf->data);
/* Make a string from a stringbuf, sharing the data allocation. */ /* Make a string from a stringbuf, sharing the data allocation. */
log_msg_str->data = log_msg_buf->data; log_msg_str->data = log_msg_buf->data;
@@ -470,6 +565,13 @@ @@ -470,6 +568,13 @@ svn_cl__get_log_message(const char **log
if (message) if (message)
truncate_buffer_at_prefix(&message->len, message->data, truncate_buffer_at_prefix(&message->len, message->data,
EDITOR_EOF_PREFIX); EDITOR_EOF_PREFIX);
+ /* + /*
+ * Since we're adding freebsd-specific tokens to the log message, + * Since we're adding freebsd-specific tokens to the log message,
+ * clean out any leftovers to avoid accidently sending them to other + * clean out any leftovers to avoid accidently sending them to other
+ * projects that won't be expecting them. + * projects that won't be expecting them.
+ */ + */
+ if (message) + if (message)
+ cleanmsg(&message->len, message->data); + cleanmsg(&message->len, message->data);
if (message) if (message)
{ {