Handle commits on a per-directory basis instead handling all of them at

once in local setup.  Also added '!' to reuse typed log message for all
following directories.

ok joris

4 files changed, 153 insertions, 59 deletions

diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c
index 009c90ee226..9f4a9417c0f 100644
--- a/usr.bin/cvs/commit.c
+++ b/usr.bin/cvs/commit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commit.c,v 1.134 2008/06/08 02:54:08 tobias Exp $	*/
+/*	$OpenBSD: commit.c,v 1.135 2008/06/08 20:08:43 tobias Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -27,17 +27,27 @@
 #include "diff.h"
 #include "remote.h"
 
-void	cvs_commit_local(struct cvs_file *);
-void	cvs_commit_check_files(struct cvs_file *);
-void	cvs_commit_lock_dirs(struct cvs_file *);
+struct	cvs_dirlist {
+	char	*file_path;
+	struct	cvs_flisthead files_affected;
+	struct	cvs_flisthead files_added;
+	struct	cvs_flisthead files_removed;
+	struct	cvs_flisthead files_modified;
+	TAILQ_ENTRY(cvs_dirlist) dlist;
+};
+
+TAILQ_HEAD(cvs_dlisthead, cvs_dirlist);
+
+void			 cvs_commit_local(struct cvs_file *);
+void			 cvs_commit_check_files(struct cvs_file *);
+void			 cvs_commit_lock_dirs(struct cvs_file *);
+struct cvs_dirlist	*cvs_commit_getdir(char *dir);
+void			 cvs_commit_freedirlist(void);
 
 static BUF *commit_diff(struct cvs_file *, RCSNUM *, int);
 static void commit_desc_set(struct cvs_file *);
 
-struct	cvs_flisthead files_affected;
-struct	cvs_flisthead files_added;
-struct	cvs_flisthead files_removed;
-struct	cvs_flisthead files_modified;
+struct	cvs_dlisthead directory_list;
 
 int	conflicts_found;
 char	*logmsg = NULL;
@@ -59,6 +69,7 @@ cvs_commit(int argc, char **argv)
 	int ch, Fflag, mflag;
 	struct module_checkout *mc;
 	struct cvs_recursion cr;
+	struct cvs_dirlist *d;
 	char *arg = ".", repo[MAXPATHLEN];
 
 	flags = CR_RECURSE_DIRS;
@@ -102,10 +113,7 @@ cvs_commit(int argc, char **argv)
 	if (Fflag && mflag)
 		fatal("cannot specify both a log file and a message");
 
-	TAILQ_INIT(&files_affected);
-	TAILQ_INIT(&files_added);
-	TAILQ_INIT(&files_removed);
-	TAILQ_INIT(&files_modified);
+	TAILQ_INIT(&directory_list);
 	conflicts_found = 0;
 
 	cr.enterdir = NULL;
@@ -122,22 +130,20 @@ cvs_commit(int argc, char **argv)
 		fatal("%d conflicts found, please correct these first",
 		    conflicts_found);
 
-	if (TAILQ_EMPTY(&files_affected))
+	if (TAILQ_EMPTY(&directory_list))
 		return (0);
 
-	if (logmsg == NULL && cvs_server_active == 0) {
-		logmsg = cvs_logmsg_create(&files_added, &files_removed,
-		    &files_modified);
-	}
+	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
+		d = TAILQ_FIRST(&directory_list);
 
-	if (logmsg == NULL)
-		fatal("This shouldnt happen, honestly!");
+		if (logmsg == NULL) {
+			logmsg = cvs_logmsg_create(NULL, &d->files_added,
+			    &d->files_removed, &d->files_modified);
+		}
 
-	cvs_file_freelist(&files_modified);
-	cvs_file_freelist(&files_removed);
-	cvs_file_freelist(&files_added);
+		if (logmsg == NULL)
+			fatal("This shouldnt happen, honestly!");
 
-	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
 		cvs_client_connect_to_server();
 		cr.fileproc = cvs_client_sendfile;
 
@@ -155,25 +161,73 @@ cvs_commit(int argc, char **argv)
 		cvs_client_send_request("ci");
 		cvs_client_get_responses();
 	} else {
-		cr.fileproc = cvs_commit_lock_dirs;
-		cvs_file_walklist(&files_affected, &cr);
-
-		cr.fileproc = cvs_commit_local;
-		cvs_file_walklist(&files_affected, &cr);
-		cvs_file_freelist(&files_affected);
-
-		cvs_get_repository_name(".", repo, MAXPATHLEN);
-		mc = cvs_module_lookup(repo);
-		if (mc->mc_prog != NULL &&
-		    (mc->mc_flags & MODULE_RUN_ON_COMMIT))
-			cvs_exec(mc->mc_prog);
+		TAILQ_FOREACH(d, &directory_list, dlist) {
+			if (!Fflag && !mflag) {
+				if (logmsg != NULL)
+					xfree(logmsg);
+				logmsg = cvs_logmsg_create(d->file_path,
+				    &d->files_added, &d->files_removed,
+				    &d->files_modified);
+			}
+
+			cr.fileproc = cvs_commit_lock_dirs;
+			cvs_file_walklist(&d->files_affected, &cr);
+
+			cr.fileproc = cvs_commit_local;
+			cvs_file_walklist(&d->files_affected, &cr);
+
+			cvs_get_repository_name(".", repo, MAXPATHLEN);
+			mc = cvs_module_lookup(repo);
+			if (mc->mc_prog != NULL &&
+			    (mc->mc_flags & MODULE_RUN_ON_COMMIT))
+				cvs_exec(mc->mc_prog);
+		}
 	}
 
+	cvs_commit_freedirlist();
+
 	xfree(logmsg);
 	return (0);
 }
 
 void
+cvs_commit_freedirlist(void)
+{
+	struct cvs_dirlist *d;
+
+	while ((d = TAILQ_FIRST(&directory_list)) != NULL) {
+		TAILQ_REMOVE(&directory_list, d, dlist);
+		xfree(d->file_path);
+		cvs_file_freelist(&(d->files_affected));
+		cvs_file_freelist(&(d->files_added));
+		cvs_file_freelist(&(d->files_modified));
+		cvs_file_freelist(&(d->files_removed));
+		xfree(d);
+	}
+}
+
+struct cvs_dirlist *
+cvs_commit_getdir(char *dir)
+{
+	struct cvs_dirlist *dp;
+
+	TAILQ_FOREACH(dp, &directory_list, dlist) {
+		if (strcmp(dp->file_path, dir) == 0)
+			return dp;
+	}
+
+	dp = xmalloc(sizeof(*dp));
+	dp->file_path = xstrdup(dir);
+	TAILQ_INIT(&(dp->files_affected));
+	TAILQ_INIT(&(dp->files_added));
+	TAILQ_INIT(&(dp->files_modified));
+	TAILQ_INIT(&(dp->files_removed));
+
+	TAILQ_INSERT_TAIL(&directory_list, dp, dlist);
+	return dp;
+}
+
+void
 cvs_commit_lock_dirs(struct cvs_file *cf)
 {
 	char repo[MAXPATHLEN];
@@ -191,6 +245,7 @@ cvs_commit_check_files(struct cvs_file *cf)
 	char *tag;
 	RCSNUM *branch, *brev;
 	char rev[CVS_REV_BUFSZ];
+	struct cvs_dirlist *d;
 
 	branch = brev = NULL;
 
@@ -294,20 +349,28 @@ next:
 	if (brev != NULL)
 		rcsnum_free(brev);
 
-	if (cf->file_status == FILE_ADDED ||
-	    cf->file_status == FILE_REMOVED ||
-	    cf->file_status == FILE_MODIFIED)
-		cvs_file_get(cf->file_path, 0, &files_affected);
+	if (cf->file_status != FILE_ADDED &&
+	    cf->file_status != FILE_REMOVED &&
+	    cf->file_status != FILE_MODIFIED)
+		return;
+
+	if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
+		d = cvs_commit_getdir(cf->file_wd);
+	} else {
+		d = cvs_commit_getdir("remote");
+	}
+
+	cvs_file_get(cf->file_path, 0, &d->files_affected);
 
 	switch (cf->file_status) {
 	case FILE_ADDED:
-		cvs_file_get(cf->file_path, 0, &files_added);
+		cvs_file_get(cf->file_path, 0, &d->files_added);
 		break;
 	case FILE_REMOVED:
-		cvs_file_get(cf->file_path, 0, &files_removed);
+		cvs_file_get(cf->file_path, 0, &d->files_removed);
 		break;
 	case FILE_MODIFIED:
-		cvs_file_get(cf->file_path, 0, &files_modified);
+		cvs_file_get(cf->file_path, 0, &d->files_modified);
 		break;
 	}
 }
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index 718aaeae763..31db439ffe8 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.h,v 1.165 2008/05/28 17:12:00 tobias Exp $	*/
+/*	$OpenBSD: cvs.h,v 1.166 2008/06/08 20:08:43 tobias Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -392,8 +392,8 @@ struct cvsroot	*cvsroot_get(const char *);
 
 /* logmsg.c */
 char *	cvs_logmsg_read(const char *path);
-char *	cvs_logmsg_create(struct cvs_flisthead *, struct cvs_flisthead *,
-	struct cvs_flisthead *);
+char *	cvs_logmsg_create(char *, struct cvs_flisthead *,
+	    struct cvs_flisthead *, struct cvs_flisthead *);
 
 /* misc stuff */
 void	cvs_update_local(struct cvs_file *);
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c
index 7a87eb42856..97d52e40895 100644
--- a/usr.bin/cvs/import.c
+++ b/usr.bin/cvs/import.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: import.c,v 1.91 2008/06/08 13:35:47 joris Exp $	*/
+/*	$OpenBSD: import.c,v 1.92 2008/06/08 20:08:43 tobias Exp $	*/
 /*
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
  *
@@ -113,7 +113,7 @@ cvs_import(int argc, char **argv)
 	}
 
 	if (logmsg == NULL)
-		logmsg = cvs_logmsg_create(NULL, NULL, NULL);
+		logmsg = cvs_logmsg_create(NULL, NULL, NULL, NULL);
 
 	if (logmsg == NULL)
 		fatal("This shouldnt happen, honestly!");
diff --git a/usr.bin/cvs/logmsg.c b/usr.bin/cvs/logmsg.c
index a2d440ce1ad..bf02daf29be 100644
--- a/usr.bin/cvs/logmsg.c
+++ b/usr.bin/cvs/logmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logmsg.c,v 1.48 2008/05/22 15:46:30 tobias Exp $	*/
+/*	$OpenBSD: logmsg.c,v 1.49 2008/06/08 20:08:43 tobias Exp $	*/
 /*
  * Copyright (c) 2007 Joris Vink <joris@openbsd.org>
  *
@@ -21,6 +21,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <libgen.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -92,14 +93,19 @@ cvs_logmsg_read(const char *path)
 }
 
 char *
-cvs_logmsg_create(struct cvs_flisthead *added, struct cvs_flisthead *removed,
-	struct cvs_flisthead *modified)
+cvs_logmsg_create(char *dir, struct cvs_flisthead *added,
+    struct cvs_flisthead *removed, struct cvs_flisthead *modified)
 {
 	FILE *fp;
 	int c, fd, saved_errno;
 	struct cvs_filelist *cf;
 	struct stat st1, st2;
 	char *fpath, *logmsg;
+	static int reuse = 0;
+	static char *prevmsg = NULL;
+
+	if (reuse)
+		return xstrdup(prevmsg);
 
 	(void)xasprintf(&fpath, "%s/cvsXXXXXXXXXX", cvs_tmpdir);
 
@@ -114,31 +120,44 @@ cvs_logmsg_create(struct cvs_flisthead *added, struct cvs_flisthead *removed,
 		fatal("cvs_logmsg_create: fdopen %s", strerror(saved_errno));
 	}
 
-	fprintf(fp, "\n%s %s\n%s Enter Log.  Lines beginning with `%s' are "
+	if (prevmsg != NULL && prevmsg[0] != '\0')
+		fprintf(fp, "%s", prevmsg);
+	else
+		fputc('\n', fp);
+
+	fprintf(fp, "%s %s\n%s Enter Log.  Lines beginning with `%s' are "
 	    "removed automatically\n%s\n", CVS_LOGMSG_PREFIX, CVS_LOGMSG_LINE,
 	    CVS_LOGMSG_PREFIX, CVS_LOGMSG_PREFIX, CVS_LOGMSG_PREFIX);
 
+	if (cvs_cmdop == CVS_OP_COMMIT) {
+		fprintf(fp, "%s Committing in %s\n%s\n", CVS_LOGMSG_PREFIX,
+		    dir != NULL ? dir : ".", CVS_LOGMSG_PREFIX);
+	}
+
 	if (added != NULL && !TAILQ_EMPTY(added)) {
 		fprintf(fp, "%s Added Files:", CVS_LOGMSG_PREFIX);
 		TAILQ_FOREACH(cf, added, flist)
-			fprintf(fp, "\n%s\t%s",
-			    CVS_LOGMSG_PREFIX, cf->file_path);
+			fprintf(fp, "\n%s\t%s", CVS_LOGMSG_PREFIX,
+			    dir != NULL ? basename(cf->file_path) :
+			    cf->file_path);
 		fputs("\n", fp);
 	}
 
 	if (removed != NULL && !TAILQ_EMPTY(removed)) {
 		fprintf(fp, "%s Removed Files:", CVS_LOGMSG_PREFIX);
 		TAILQ_FOREACH(cf, removed, flist)
-			fprintf(fp, "\n%s\t%s",
-			    CVS_LOGMSG_PREFIX, cf->file_path);
+			fprintf(fp, "\n%s\t%s", CVS_LOGMSG_PREFIX,
+			    dir != NULL ? basename(cf->file_path) :
+			    cf->file_path);
 		fputs("\n", fp);
 	}
 
 	if (modified != NULL && !TAILQ_EMPTY(modified)) {
 		fprintf(fp, "%s Modified Files:", CVS_LOGMSG_PREFIX);
 		TAILQ_FOREACH(cf, modified, flist)
-			fprintf(fp, "\n%s\t%s",
-			    CVS_LOGMSG_PREFIX, cf->file_path);
+			fprintf(fp, "\n%s\t%s", CVS_LOGMSG_PREFIX,
+			    dir != NULL ? basename(cf->file_path) :
+			    cf->file_path);
 		fputs("\n", fp);
 	}
 
@@ -166,21 +185,33 @@ cvs_logmsg_create(struct cvs_flisthead *added, struct cvs_flisthead *removed,
 
 		if (st1.st_mtime != st2.st_mtime) {
 			logmsg = cvs_logmsg_read(fpath);
+			if (prevmsg != NULL)
+				xfree(prevmsg);
+			prevmsg = xstrdup(logmsg);
 			break;
 		}
 
 		printf("\nLog message unchanged or not specified\n"
-		    "a)bort, c)ontinue, e)dit\nAction: (continue) ");
+		    "a)bort, c)ontinue, e)dit, !)reuse this message "
+		    "unchanged for remaining dirs\nAction: (continue) ");
 		(void)fflush(stdout);
 
 		c = getc(stdin);
 		if (c == EOF || c == 'a') {
 			fatal("Aborted by user");
 		} else if (c == '\n' || c == 'c') {
-			logmsg = xstrdup("");
+			if (prevmsg == NULL)
+				prevmsg = xstrdup("");
+			logmsg = xstrdup(prevmsg);
 			break;
 		} else if (c == 'e') {
 			continue;
+		} else if (c == '!') {
+			reuse = 1;
+			if (prevmsg == NULL)
+				prevmsg = xstrdup("");
+			logmsg = xstrdup(prevmsg);
+			break;
 		} else {
 			cvs_log(LP_ERR, "invalid input");
 			continue;