my cvs and rlog patches have been committed

README.md

···
 
        `$ ruby openbsd-commitid.rb`
 
-**NOTE**: `rlog` in path must be modified to separate revisions and files
-with an arbitrary delimiter, not just a line of dashes since those appear in
-some commit messages.  This allows the script to accurately separate each
-revision from `rlog`.  This change might be committed, but is included here
-as a patch for now.
+**NOTE**: This script relies on recently added changes to OpenBSD's `rlog`
+and `cvs` tools:
 
-**NOTE**: This script relies on a newly added `-C` flag to `cvs admin`, which
-sets a `commitid` in an RCS file.  This change has not yet been committed and
-is included as a patch here.
+- `cvs admin -C` to set a revision's `commitid`
+- `rlog -E` and `rlog -S` to control the revision separators in `rlog`
+  output, since the default line of dashes appears in old commit messages
 
 ####Details
 

patches/patch-cvs_admin_commitid.diff

···
-# add a -C flag to 'cvs admin' to assign a commitid to an existing revision
-#
-# waiting to be committed
-
-Index: gnu/usr.bin/cvs/src/admin.c
-===================================================================
-RCS file: /cvs/src/gnu/usr.bin/cvs/src/admin.c,v
-retrieving revision 1.2
-diff -u -p -u -p -r1.2 admin.c
---- gnu/usr.bin/cvs/src/admin.c	11 May 2008 12:16:00 -0000	1.2
-+++ gnu/usr.bin/cvs/src/admin.c	6 Aug 2014 23:37:35 -0000
-@@ -27,6 +27,7 @@ static const char *const admin_usage[] =
-     "\t-A file    Append another file's access list.\n",
-     "\t-b[rev]    Set default branch (highest branch on trunk if omitted).\n",
-     "\t-c string  Set comment leader.\n",
-+    "\t-C rev:id  Replace revision's commit id.\n",
-     "\t-e[users]  Remove (comma-separated) user names from access list\n",
-     "\t           (all names if omitted).\n",
-     "\t-I         Run interactively.\n",
-@@ -167,7 +168,7 @@ admin (argc, argv)
-     optind = 0;
-     only_k_option = 1;
-     while ((c = getopt (argc, argv,
--			"+ib::c:a:A:e::l::u::LUn:N:m:o:s:t::IqxV:k:")) != -1)
-+			"+ib::c:C:a:A:e::l::u::LUn:N:m:o:s:t::IqxV:k:")) != -1)
-     {
- 	if (c != 'k')
- 	    only_k_option = 0;
-@@ -209,6 +210,11 @@ admin (argc, argv)
- 		strcat (admin_data.comment, optarg);
- 		break;
- 
-+	    case 'C':
-+		/* Change or add commitid. */
-+		arg_add (&admin_data, 'C', optarg);
-+		break;
-+
- 	    case 'a':
- 		arg_add (&admin_data, 'a', optarg);
- 		break;
-@@ -689,7 +695,7 @@ admin_fileproc (callerdat, finfo)
-     for (i = 0; i < admin_data->ac; ++i)
-     {
- 	char *arg;
--	char *p, *rev, *revnum, *tag, *msg;
-+	char *p, *rev, *revnum, *tag, *msg, *commitid;
- 	char **users;
- 	int argc, u;
- 	Node *n;
-@@ -736,6 +742,50 @@ admin_fileproc (callerdat, finfo)
- 		for (u = 0; u < argc; ++u)
- 		    RCS_addaccess (rcs, users[u]);
- 		free_names (&argc, users);
-+		break;
-+	    case 'C':
-+	        p = strchr (arg, ':');
-+		if (p == NULL)
-+		{
-+		    error (0, 0, "%s: -C option lacks commitid", rcs->path);
-+		    status = 1;
-+		    continue;
-+		}
-+		*p = '\0';
-+		rev = RCS_gettag (rcs, arg + 2, 0, NULL);
-+		if (rev == NULL)
-+		{
-+		    error (0, 0, "%s: no such revision %s", rcs->path, rev);
-+		    status = 1;
-+		    continue;
-+		}
-+		*p++ = ':';
-+		commitid = p;
-+
-+		n = findnode (rcs->versions, rev);
-+		free (rev);
-+		delta = (RCSVers *) n->data;
-+
-+		if (delta->other_delta == NULL)
-+    		    delta->other_delta = getlist();
-+
-+		n = findnode (delta->other_delta, "commitid");
-+		if (n == NULL) {
-+		    if (strlen(commitid)) {
-+			n = getnode();
-+			n->type = RCSFIELD;
-+			n->key = xstrdup ("commitid");
-+			n->data = xstrdup(commitid);
-+			addnode (delta->other_delta, n);
-+		    }
-+		} else {
-+		    if (strlen(commitid)) {
-+			free (n->data);
-+			n->data = xstrdup(commitid);
-+		    } else
-+		        delnode(n);
-+		}
-+
- 		break;
- 	    case 'n': /* fall through */
- 	    case 'N':

patches/patch-rcs_rlog_revsep.diff

···
-# add -E and -S flags to rlog to allow changing RCS end and revision separators
-# to something non-standard, since lines of all dashes appear inside of some
-# existing commit messages, making it impossible to accurately parse rlog
-# output
-#
-# might be committed
-
-Index: usr.bin/rcs/rlog.1
-===================================================================
-RCS file: /var/cvs/src/usr.bin/rcs/rlog.1,v
-retrieving revision 1.24
-diff -u -p -u -p -r1.24 rlog.1
---- usr.bin/rcs/rlog.1	3 Sep 2010 11:09:29 -0000	1.24
-+++ usr.bin/rcs/rlog.1	21 Jan 2016 20:27:27 -0000
-@@ -24,8 +24,10 @@
- .Nm
- .Op Fl bhLNRtV
- .Op Fl d Ns Ar dates
-+.Op Fl E Ns Ar endsep
- .Op Fl l Ns Op Ar lockers
- .Op Fl r Ns Op Ar revs
-+.Op Fl S Ns Ar revsep
- .Op Fl s Ns Ar states
- .Op Fl w Ns Op Ar logins
- .Op Fl x Ns Ar suffixes
-@@ -82,6 +84,11 @@ character.
- See also the
- .Fl z
- option, below.
-+.It Fl E Ns Ar endsep
-+Print
-+.Ar endsep
-+at the end of each RCS file, instead of the default string of
-+77 equal signs.
- .It Fl h
- Print the RCS header,
- describing a file's branch, lock details, symbolic names, etc.
-@@ -131,6 +138,11 @@ and
- Without argument, the
- .Fl r
- option means the latest revision of the default branch.
-+.It Fl S Ns Ar revsep
-+Print
-+.Ar revsep
-+at the end of each RCS revision, instead of the default string of
-+28 dash signs.
- .It Fl s Ns Ar states
- Print information about revisions whose state matches one of the
- specified
-Index: usr.bin/rcs/rlog.c
-===================================================================
-RCS file: /var/cvs/src/usr.bin/rcs/rlog.c,v
-retrieving revision 1.71
-diff -u -p -u -p -r1.71 rlog.c
---- usr.bin/rcs/rlog.c	16 Jan 2015 06:40:11 -0000	1.71
-+++ usr.bin/rcs/rlog.c	21 Jan 2016 20:29:26 -0000
-@@ -46,10 +46,7 @@ static int	rlog_select_daterev(RCSFILE *
- static void	rlog_file(const char *, RCSFILE *);
- static void	rlog_rev_print(struct rcs_delta *);
- 
--#define RLOG_OPTSTRING	"d:hLl::NqRr::s:TtVw::x::z::"
--#define REVSEP		"----------------------------"
--#define REVEND \
-- "============================================================================="
-+#define RLOG_OPTSTRING	"d:E:hLl::NqRr::S:s:TtVw::x::z::"
- 
- static int dflag, hflag, Lflag, lflag, rflag, tflag, Nflag, wflag;
- static char *llist = NULL;
-@@ -57,14 +54,18 @@ static char *slist = NULL;
- static char *wlist = NULL;
- static char *revisions = NULL;
- static char *rlog_dates = NULL;
-+static char *revsep = "----------------------------";
-+static char *revend = "====================================================="
-+    "========================";
- 
- __dead void
- rlog_usage(void)
- {
- 	fprintf(stderr,
--	    "usage: rlog [-bhLNRtV] [-ddates] [-l[lockers]] [-r[revs]]\n"
--	    "            [-sstates] [-w[logins]] [-xsuffixes]\n"
--	    "            [-ztz] file ...\n");
-+	    "usage: rlog [-bhLNRtV] [-ddates] [-Eendsep] [-l[lockers]] "
-+	    "[-r[revs]]\n"
-+	    "            [-Srevsep] [-sstates] [-w[logins]] [-xsuffixes] "
-+	    "[-ztz] file ...\n");
- 
- 	exit(1);
- }
-@@ -85,6 +86,9 @@ rlog_main(int argc, char **argv)
- 			dflag = 1;
- 			rlog_dates = rcs_optarg;
- 			break;
-+		case 'E':
-+			revend = rcs_optarg;
-+			break;
- 		case 'h':
- 			hflag = 1;
- 			break;
-@@ -110,6 +114,9 @@ rlog_main(int argc, char **argv)
- 			rflag = 1;
- 			revisions = rcs_optarg;
- 			break;
-+		case 'S':
-+			revsep = rcs_optarg;
-+			break;
- 		case 's':
- 			slist = rcs_optarg;
- 			break;
-@@ -420,7 +427,7 @@ rlog_file(const char *fname, RCSFILE *fi
- 		}
- 	}
- 
--	printf("%s\n", REVEND);
-+	printf("%s\n", revend);
- }
- 
- static void
-@@ -501,7 +508,7 @@ rlog_rev_print(struct rcs_delta *rdp)
- 	    (slist != NULL || lflag == 1 || wflag == 1)) && found == 0))
- 		return;
- 
--	printf("%s\n", REVSEP);
-+	printf("%s\n", revsep);
- 
- 	rcsnum_tostr(rdp->rd_num, numb, sizeof(numb));
-