diff options
Diffstat (limited to 'contrib/cvs/src/commit.c')
| -rw-r--r-- | contrib/cvs/src/commit.c | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/contrib/cvs/src/commit.c b/contrib/cvs/src/commit.c index ba5dc5c..d67d0a1 100644 --- a/contrib/cvs/src/commit.c +++ b/contrib/cvs/src/commit.c @@ -250,12 +250,23 @@ find_fileproc (callerdat, finfo) vers = Version_TS (&xfinfo, NULL, saved_tag, NULL, 0, 0); if (vers->ts_user == NULL && vers->vn_user != NULL - && vers->vn_user[0] == '-') - /* FIXME: If vn_user is starts with "-" but ts_user is - non-NULL, what classify_file does is print "%s should be - removed and is still there". I'm not sure what it does - then. We probably should do the same. */ - status = T_REMOVED; + && (vers->vn_user[0] == '0' || vers->vn_user[0] == '-')) + { + if ( vers->vn_user[0] == '0') + { + /* This happens when one has `cvs add'ed a file, but it no + longer exists in the working directory at commit time. */ + status = T_ADDED; + } + else + { + /* FIXME: If vn_user is starts with "-" but ts_user is + non-NULL, what classify_file does is print "%s should be + removed and is still there". I'm not sure what it does + then. We probably should do the same. */ + status = T_REMOVED; + } + } else if (vers->vn_user == NULL) { if (vers->ts_user == NULL) @@ -271,7 +282,8 @@ find_fileproc (callerdat, finfo) && vers->vn_user[0] == '0') /* FIXME: If vn_user is "0" but ts_user is NULL, what classify_file does is print "new-born %s has disappeared" and removes the entry. - We probably should do the same. */ + We probably should do the same. No! Not here. Otherwise, a commit + would succeed in some cases when it should fail. See above. */ status = T_ADDED; else if (vers->ts_user != NULL && vers->ts_rcs != NULL @@ -454,7 +466,7 @@ commit (argc, argv) err = start_recursion (find_fileproc, find_filesdoneproc, find_dirent_proc, (DIRLEAVEPROC) NULL, (void *)&find_args, - argc, argv, local, W_LOCAL, 0, 0, + argc, argv, local, W_LOCAL, 0, LOCK_NONE, (char *)NULL, 0); if (err) error (1, 0, "correct above errors first!"); @@ -497,9 +509,7 @@ commit (argc, argv) do_editor (".", &saved_message, (char *)NULL, find_args.ulist); /* We always send some sort of message, even if empty. */ - /* FIXME: is that true? There seems to be some code in do_editor - which can leave the message NULL. */ - option_with_arg ("-m", saved_message); + option_with_arg ("-m", saved_message ? saved_message : ""); /* OK, now process all the questionable files we have been saving up. */ @@ -549,6 +559,7 @@ commit (argc, argv) if (!run_module_prog) send_arg("-n"); option_with_arg ("-r", saved_tag); + send_arg ("--"); /* FIXME: This whole find_args.force/SEND_FORCE business is a kludge. It would seem to be a server bug that we have to @@ -636,7 +647,8 @@ commit (argc, argv) */ err = start_recursion (check_fileproc, check_filesdoneproc, check_direntproc, (DIRLEAVEPROC) NULL, NULL, argc, - argv, local, W_LOCAL, aflag, 0, (char *) NULL, 1); + argv, local, W_LOCAL, aflag, LOCK_NONE, + (char *) NULL, 1); if (err) { Lock_Cleanup (); @@ -650,7 +662,7 @@ commit (argc, argv) if (noexec == 0) err = start_recursion (commit_fileproc, commit_filesdoneproc, commit_direntproc, commit_dirleaveproc, NULL, - argc, argv, local, W_LOCAL, aflag, 0, + argc, argv, local, W_LOCAL, aflag, LOCK_NONE, (char *) NULL, 1); /* @@ -1220,13 +1232,17 @@ commit_fileproc (callerdat, finfo) * with files as args from the command line. In that latter case, we * need to get the commit message ourselves */ - if (!(got_message)) + if (!got_message) { got_message = 1; - if (use_editor) + if ( +#ifdef SERVER_SUPPORT + !server_active && +#endif + use_editor) do_editor (finfo->update_dir, &saved_message, finfo->repository, ulist); - do_verify (&saved_message, finfo->repository); + do_verify (&saved_message, finfo->repository); } p = findnode (cilist, finfo->file); @@ -1546,7 +1562,11 @@ commit_direntproc (callerdat, dir, repos, update_dir, entries) /* get commit message */ real_repos = Name_Repository (dir, update_dir); got_message = 1; - if (use_editor) + if ( +#ifdef SERVER_SUPPORT + !server_active && +#endif + use_editor) do_editor (update_dir, &saved_message, real_repos, ulist); do_verify (&saved_message, real_repos); free (real_repos); |
