Date: Tue, 30 Jun 2015 11:04:55 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390951 - in head/devel/subversion: . files Message-ID: <201506301104.t5UB4tLE006959@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Jun 30 11:04:54 2015 New Revision: 390951 URL: https://svnweb.freebsd.org/changeset/ports/390951 Log: Move the phabricator line to the end, it seems it only works there. With hat: phabric-admin@ Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D2943 Modified: head/devel/subversion/Makefile.common head/devel/subversion/files/extra-patch-fbsd-template Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Tue Jun 30 10:39:31 2015 (r390950) +++ head/devel/subversion/Makefile.common Tue Jun 30 11:04:54 2015 (r390951) @@ -3,7 +3,7 @@ PORTNAME?= subversion PORTVERSION= 1.8.13 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= APACHE/subversion DIST_SUBDIR= subversion18 Modified: head/devel/subversion/files/extra-patch-fbsd-template ============================================================================== --- head/devel/subversion/files/extra-patch-fbsd-template Tue Jun 30 10:39:31 2015 (r390950) +++ head/devel/subversion/files/extra-patch-fbsd-template Tue Jun 30 11:04:54 2015 (r390951) @@ -1,5 +1,5 @@ ---- 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 +--- subversion/svn/util.c.orig 2013-07-10 04:00:05 UTC ++++ subversion/svn/util.c @@ -66,6 +66,9 @@ #include "private/svn_client_private.h" #include "private/svn_cmdline_private.h" @@ -10,7 +10,7 @@ -@@ -322,6 +325,70 @@ +@@ -322,6 +325,70 @@ truncate_buffer_at_prefix(apr_size_t *ne } @@ -22,7 +22,6 @@ + +static const char *prefixes[] = { + "PR:", -+ "Differential Revision:", + "Submitted by:", + "Reviewed by:", + "Approved by:", @@ -32,6 +31,7 @@ + "Relnotes:", + "Security:", + "Sponsored by:" ++ "Differential Revision:", +}; + +void @@ -81,13 +81,12 @@ #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -337,8 +403,38 @@ +@@ -337,8 +404,38 @@ svn_cl__get_log_message(const char **log /* 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, "Approved by:\t" APR_EOL_STR); @@ -101,12 +100,12 @@ + ORGANIZATION_NAME +#endif + 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, 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, "> 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); @@ -116,12 +115,13 @@ + 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, "> 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, APR_EOL_STR); *tmp_file = NULL; if (lmb->message) -@@ -350,6 +444,7 @@ +@@ -350,6 +447,7 @@ svn_cl__get_log_message(const char **log that follows it. */ truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data, EDITOR_EOF_PREFIX); @@ -129,7 +129,7 @@ /* Make a string from a stringbuf, sharing the data allocation. */ 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) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506301104.t5UB4tLE006959>