xref: /openbsd-src/usr.bin/cvs/commit.c (revision d874cce4b1d9fe6b41c9e4f2117a77d8a4a37b92)
1 /*	$OpenBSD: commit.c,v 1.143 2008/06/15 04:38:52 tobias Exp $	*/
2 /*
3  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
4  * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
5  *
6  * Permission to use, copy, modify, and distribute this software for any
7  * purpose with or without fee is hereby granted, provided that the above
8  * copyright notice and this permission notice appear in all copies.
9  *
10  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17  */
18 
19 #include <sys/stat.h>
20 
21 #include <errno.h>
22 #include <fcntl.h>
23 #include <libgen.h>
24 #include <string.h>
25 #include <unistd.h>
26 
27 #include "cvs.h"
28 #include "diff.h"
29 #include "remote.h"
30 
31 void			 cvs_commit_local(struct cvs_file *);
32 void			 cvs_commit_check_files(struct cvs_file *);
33 void			 cvs_commit_loginfo(char *);
34 void			 cvs_commit_lock_dirs(struct cvs_file *);
35 
36 static BUF *commit_diff(struct cvs_file *, RCSNUM *, int);
37 static void commit_desc_set(struct cvs_file *);
38 
39 struct	file_info_list	 files_info;
40 struct	trigger_list	*line_list;
41 
42 struct cvs_flisthead	files_affected;
43 struct cvs_flisthead	files_added;
44 struct cvs_flisthead	files_removed;
45 struct cvs_flisthead	files_modified;
46 
47 int	conflicts_found;
48 char	*logmsg = NULL;
49 char	*loginfo = NULL;
50 
51 struct cvs_cmd cvs_cmd_commit = {
52 	CVS_OP_COMMIT, CVS_USE_WDIR | CVS_LOCK_REPO, "commit",
53 	{ "ci", "com" },
54 	"Check files into the repository",
55 	"[-flR] [-F logfile | -m msg] [-r rev] ...",
56 	"F:flm:Rr:",
57 	NULL,
58 	cvs_commit
59 };
60 
61 int
62 cvs_commit(int argc, char **argv)
63 {
64 	int flags;
65 	int ch, Fflag, mflag;
66 	struct module_checkout *mc;
67 	struct cvs_recursion cr;
68 	struct cvs_filelist *l;
69 	struct file_info *fi;
70 	char *arg = ".", repo[MAXPATHLEN];
71 
72 	flags = CR_RECURSE_DIRS;
73 	Fflag = mflag = 0;
74 
75 	while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
76 		switch (ch) {
77 		case 'F':
78 			/* free previously assigned value */
79 			if (logmsg != NULL)
80 				xfree(logmsg);
81 			logmsg = cvs_logmsg_read(optarg);
82 			Fflag = 1;
83 			break;
84 		case 'f':
85 			break;
86 		case 'l':
87 			flags &= ~CR_RECURSE_DIRS;
88 			break;
89 		case 'm':
90 			/* free previously assigned value */
91 			if (logmsg != NULL)
92 				xfree(logmsg);
93 			logmsg = xstrdup(optarg);
94 			mflag = 1;
95 			break;
96 		case 'R':
97 			flags |= CR_RECURSE_DIRS;
98 			break;
99 		case 'r':
100 			break;
101 		default:
102 			fatal("%s", cvs_cmd_commit.cmd_synopsis);
103 		}
104 	}
105 
106 	argc -= optind;
107 	argv += optind;
108 
109 	/* -F and -m are mutually exclusive */
110 	if (Fflag && mflag)
111 		fatal("cannot specify both a log file and a message");
112 
113 	TAILQ_INIT(&files_affected);
114 	TAILQ_INIT(&files_added);
115 	TAILQ_INIT(&files_removed);
116 	TAILQ_INIT(&files_modified);
117 
118 	TAILQ_INIT(&files_info);
119 	conflicts_found = 0;
120 
121 	cr.enterdir = NULL;
122 	cr.leavedir = NULL;
123 	cr.fileproc = cvs_commit_check_files;
124 	cr.flags = flags;
125 
126 	if (argc > 0)
127 		cvs_file_run(argc, argv, &cr);
128 	else
129 		cvs_file_run(1, &arg, &cr);
130 
131 	if (conflicts_found != 0)
132 		fatal("%d conflicts found, please correct these first",
133 		    conflicts_found);
134 
135 	if (TAILQ_EMPTY(&files_affected))
136 		return (0);
137 
138 	if (logmsg == NULL && cvs_server_active == 0) {
139 		logmsg = cvs_logmsg_create(NULL, &files_added, &files_removed,
140 		    &files_modified);
141 
142 		if (logmsg == NULL)
143 			fatal("This shouldnt happen, honestly!");
144 	}
145 
146 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
147 		cvs_client_connect_to_server();
148 		cr.fileproc = cvs_client_sendfile;
149 
150 		if (argc > 0)
151 			cvs_file_run(argc, argv, &cr);
152 		else
153 			cvs_file_run(1, &arg, &cr);
154 
155 		if (!(flags & CR_RECURSE_DIRS))
156 			cvs_client_send_request("Argument -l");
157 
158 		cvs_client_send_logmsg(logmsg);
159 		cvs_client_send_files(argv, argc);
160 		cvs_client_senddir(".");
161 		cvs_client_send_request("ci");
162 		cvs_client_get_responses();
163 	} else {
164 		if (cvs_server_active && logmsg == NULL)
165 			fatal("no log message specified");
166 
167 		cvs_get_repository_name(".", repo, MAXPATHLEN);
168 
169 		line_list = cvs_trigger_getlines(CVS_PATH_COMMITINFO, repo);
170 		if (line_list != NULL) {
171 			TAILQ_FOREACH(l, &files_affected, flist) {
172 				fi = xcalloc(1, sizeof(*fi));
173 				fi->file_path = xstrdup(l->file_path);
174 				TAILQ_INSERT_TAIL(&files_info, fi,
175 				    flist);
176 			}
177 
178 			if (cvs_trigger_handle(CVS_TRIGGER_COMMITINFO,
179 			    repo, NULL, line_list, &files_info)) {
180 				cvs_log(LP_ERR,
181 				    "Pre-commit check failed");
182 				cvs_trigger_freelist(line_list);
183 				goto end;
184 			}
185 
186 			cvs_trigger_freelist(line_list);
187 			cvs_trigger_freeinfo(&files_info);
188 		}
189 
190 		if (cvs_logmsg_verify(logmsg))
191 			goto end;
192 
193 		cr.fileproc = cvs_commit_lock_dirs;
194 		cvs_file_walklist(&files_affected, &cr);
195 
196 		line_list = cvs_trigger_getlines(CVS_PATH_LOGINFO, repo);
197 
198 		cr.fileproc = cvs_commit_local;
199 		cvs_file_walklist(&files_affected, &cr);
200 
201 		if (line_list != NULL) {
202 			cvs_commit_loginfo(repo);
203 
204 			cvs_trigger_handle(CVS_TRIGGER_LOGINFO, repo,
205 			    loginfo, line_list, &files_info);
206 
207 			xfree(loginfo);
208 			cvs_trigger_freelist(line_list);
209 			cvs_trigger_freeinfo(&files_info);
210 		}
211 
212 		mc = cvs_module_lookup(repo);
213 		if (mc->mc_prog != NULL &&
214 		    (mc->mc_flags & MODULE_RUN_ON_COMMIT))
215 			cvs_exec(mc->mc_prog, NULL, 0);
216 	}
217 
218 end:
219 	cvs_trigger_freeinfo(&files_info);
220 	xfree(logmsg);
221 	return (0);
222 }
223 
224 void
225 cvs_commit_loginfo(char *repo)
226 {
227 	BUF *buf;
228 	char pwd[MAXPATHLEN];
229 	struct cvs_filelist *cf;
230 
231 	if (getcwd(pwd, sizeof(pwd)) == NULL)
232 		fatal("Can't get working directory");
233 
234 	buf = cvs_buf_alloc(1024);
235 
236 	cvs_trigger_loginfo_header(buf, repo);
237 
238 	if (!TAILQ_EMPTY(&files_added)) {
239 		cvs_buf_puts(buf, "Added Files:");
240 
241 		TAILQ_FOREACH(cf, &files_added, flist) {
242 			cvs_buf_putc(buf, '\n');
243 			cvs_buf_putc(buf, '\t');
244 			cvs_buf_puts(buf, cf->file_path);
245 		}
246 
247 		cvs_buf_putc(buf, '\n');
248 	}
249 
250 	if (!TAILQ_EMPTY(&files_modified)) {
251 		cvs_buf_puts(buf, "Modified Files:");
252 
253 		TAILQ_FOREACH(cf, &files_modified, flist) {
254 			cvs_buf_putc(buf, '\n');
255 			cvs_buf_putc(buf, '\t');
256 			cvs_buf_puts(buf, cf->file_path);
257 		}
258 
259 		cvs_buf_putc(buf, '\n');
260 	}
261 
262 	if (!TAILQ_EMPTY(&files_removed)) {
263 		cvs_buf_puts(buf, "Removed Files:");
264 
265 		TAILQ_FOREACH(cf, &files_removed, flist) {
266 			cvs_buf_putc(buf, '\n');
267 			cvs_buf_putc(buf, '\t');
268 			cvs_buf_puts(buf, cf->file_path);
269 		}
270 
271 		cvs_buf_putc(buf, '\n');
272 	}
273 
274 	cvs_buf_puts(buf, "Log Message:\n");
275 
276 	cvs_buf_puts(buf, logmsg);
277 
278 	cvs_buf_putc(buf, '\n');
279 	cvs_buf_putc(buf, '\0');
280 
281 	loginfo = cvs_buf_release(buf);
282 }
283 
284 void
285 cvs_commit_lock_dirs(struct cvs_file *cf)
286 {
287 	char repo[MAXPATHLEN];
288 
289 	cvs_get_repository_path(cf->file_wd, repo, sizeof(repo));
290 	cvs_log(LP_TRACE, "cvs_commit_lock_dirs: %s", repo);
291 
292 	/* locks stay in place until we are fully done and exit */
293 	cvs_repository_lock(repo, 1);
294 }
295 
296 void
297 cvs_commit_check_files(struct cvs_file *cf)
298 {
299 	char *tag;
300 	RCSNUM *branch, *brev;
301 
302 	branch = brev = NULL;
303 
304 	cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path);
305 
306 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL)
307 		cvs_remote_classify_file(cf);
308 	else
309 		cvs_file_classify(cf, cvs_directory_tag);
310 
311 	if (cf->file_type == CVS_DIR) {
312 		if (verbosity > 1)
313 			cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
314 		return;
315 	}
316 
317 	if (cf->file_status == FILE_UPTODATE)
318 		return;
319 
320 	if (cf->file_status == FILE_MERGE ||
321 	    cf->file_status == FILE_PATCH ||
322 	    cf->file_status == FILE_CHECKOUT ||
323 	    cf->file_status == FILE_LOST ||
324 	    cf->file_status == FILE_UNLINK) {
325 		cvs_log(LP_ERR, "conflict: %s is not up-to-date",
326 		    cf->file_path);
327 		conflicts_found++;
328 		return;
329 	}
330 
331 	if (cf->file_status == FILE_CONFLICT &&
332 	   cf->file_ent->ce_conflict != NULL) {
333 		cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
334 		    "merging, please fix these first", cf->file_path);
335 		conflicts_found++;
336 		return;
337 	}
338 
339 	if (cf->file_status == FILE_MODIFIED &&
340 	    cf->file_ent->ce_conflict != NULL &&
341 	    update_has_conflict_markers(cf)) {
342 		cvs_log(LP_ERR, "warning: file %s seems to still contain "
343 		    "conflict indicators", cf->file_path);
344 	}
345 
346 	if (cf->file_ent != NULL && cf->file_ent->ce_date != -1) {
347 		cvs_log(LP_ERR, "conflict: cannot commit to sticky date for %s",
348 		    cf->file_path);
349 		conflicts_found++;
350 		return;
351 	}
352 
353 	if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
354 		tag = cvs_directory_tag;
355 		if (cf->file_ent != NULL)
356 			tag = cf->file_ent->ce_tag;
357 
358 		if (tag != NULL && cf->file_rcs != NULL) {
359 			brev = rcs_sym_getrev(cf->file_rcs, tag);
360 			if (brev != NULL) {
361 				if (RCSNUM_ISBRANCH(brev))
362 					goto next;
363 				rcsnum_free(brev);
364 			}
365 
366 			brev = rcs_translate_tag(tag, cf->file_rcs);
367 
368 			if (brev == NULL) {
369 				if (cf->file_status == FILE_ADDED)
370 					goto next;
371 				fatal("failed to resolve tag: %s",
372 				    cf->file_ent->ce_tag);
373 			}
374 
375 			if ((branch = rcsnum_revtobr(brev)) == NULL) {
376 				cvs_log(LP_ERR, "sticky tag %s is not "
377 				    "a branch for file %s", tag,
378 				    cf->file_path);
379 				conflicts_found++;
380 				rcsnum_free(brev);
381 				return;
382 			}
383 
384 			if (!RCSNUM_ISBRANCHREV(brev)) {
385 				cvs_log(LP_ERR, "sticky tag %s is not "
386 				    "a branch for file %s", tag,
387 				    cf->file_path);
388 				conflicts_found++;
389 				rcsnum_free(branch);
390 				rcsnum_free(brev);
391 				return;
392 			}
393 
394 			if (!RCSNUM_ISBRANCH(branch)) {
395 				cvs_log(LP_ERR, "sticky tag %s is not "
396 				    "a branch for file %s", tag,
397 				    cf->file_path);
398 				conflicts_found++;
399 				rcsnum_free(branch);
400 				rcsnum_free(brev);
401 				return;
402 			}
403 		}
404 	}
405 
406 next:
407 	if (branch != NULL)
408 		rcsnum_free(branch);
409 	if (brev != NULL)
410 		rcsnum_free(brev);
411 
412 	if (cf->file_status != FILE_ADDED &&
413 	    cf->file_status != FILE_REMOVED &&
414 	    cf->file_status != FILE_MODIFIED)
415 		return;
416 
417 	cvs_file_get(cf->file_path, 0, &files_affected);
418 
419 	switch (cf->file_status) {
420 	case FILE_ADDED:
421 		cvs_file_get(cf->file_path, 0, &files_added);
422 		break;
423 	case FILE_REMOVED:
424 		cvs_file_get(cf->file_path, 0, &files_removed);
425 		break;
426 	case FILE_MODIFIED:
427 		cvs_file_get(cf->file_path, 0, &files_modified);
428 		break;
429 	}
430 }
431 
432 void
433 cvs_commit_local(struct cvs_file *cf)
434 {
435 	char *tag;
436 	BUF *b, *d;
437 	int onbranch, isnew, histtype, branchadded;
438 	RCSNUM *nrev, *crev, *rrev, *brev;
439 	int openflags, rcsflags;
440 	char rbuf[CVS_REV_BUFSZ], nbuf[CVS_REV_BUFSZ];
441 	CVSENTRIES *entlist;
442 	char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN];
443 	struct file_info *fi;
444 
445 	cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
446 	cvs_file_classify(cf, cvs_directory_tag);
447 
448 	if (cvs_noexec == 1)
449 		return;
450 
451 	if (cf->file_type != CVS_FILE)
452 		fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
453 
454 	tag = cvs_directory_tag;
455 	if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
456 		tag = cf->file_ent->ce_tag;
457 
458 	branchadded = 0;
459 	switch (cf->file_status) {
460 	case FILE_ADDED:
461 		if (cf->file_rcs == NULL && tag != NULL) {
462 			branchadded = 1;
463 			cvs_add_tobranch(cf, tag);
464 		}
465 		break;
466 	case FILE_MODIFIED:
467 	case FILE_REMOVED:
468 		if (cf->file_rcs == NULL) {
469 			cvs_log(LP_ERR, "RCS file for %s got lost",
470 			    cf->file_path);
471 			return;
472 		}
473 		break;
474 	default:
475 		cvs_log(LP_ERR, "skipping bogus file `%s'", cf->file_path);
476 		return;
477 	}
478 
479 	onbranch = 0;
480 	nrev = RCS_HEAD_REV;
481 	crev = NULL;
482 	rrev = NULL;
483 
484 	if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) {
485 		rcsnum_free(cf->file_rcs->rf_branch);
486 		cf->file_rcs->rf_branch = NULL;
487 	}
488 
489 	if (cf->file_rcs != NULL) {
490 		rrev = rcs_head_get(cf->file_rcs);
491 		crev = rcs_head_get(cf->file_rcs);
492 		if (crev == NULL || rrev == NULL)
493 			fatal("no head revision in RCS file for %s",
494 			    cf->file_path);
495 
496 		if (tag != NULL) {
497 			rcsnum_free(crev);
498 			rcsnum_free(rrev);
499 			brev = rcs_sym_getrev(cf->file_rcs, tag);
500 			crev = rcs_translate_tag(tag, cf->file_rcs);
501 			if (brev == NULL || crev == NULL) {
502 				fatal("failed to resolve existing tag: %s",
503 				    tag);
504 			}
505 
506 			rrev = rcsnum_alloc();
507 			rcsnum_cpy(brev, rrev, brev->rn_len - 1);
508 
509 			if (RCSNUM_ISBRANCHREV(crev) &&
510 			    rcsnum_cmp(crev, rrev, 0)) {
511 				nrev = rcsnum_alloc();
512 				rcsnum_cpy(crev, nrev, 0);
513 				rcsnum_inc(nrev);
514 			} else if (!RCSNUM_ISBRANCH(crev)) {
515 				nrev = rcsnum_brtorev(brev);
516 				if (nrev == NULL)
517 					fatal("failed to create branch rev");
518 			} else {
519 				fatal("this isnt suppose to happen, honestly");
520 			}
521 
522 			rcsnum_free(brev);
523 			rcsnum_free(rrev);
524 			rrev = rcsnum_branch_root(nrev);
525 
526 			/* branch stuff was checked in cvs_commit_check_files */
527 			onbranch = 1;
528 		}
529 
530 		rcsnum_tostr(crev, rbuf, sizeof(rbuf));
531 	} else {
532 		strlcpy(rbuf, "Non-existent", sizeof(rbuf));
533 	}
534 
535 	if (rrev != NULL)
536 		rcsnum_free(rrev);
537 	isnew = 0;
538 	if (cf->file_status == FILE_ADDED) {
539 		isnew = 1;
540 		rcsflags = RCS_CREATE;
541 		openflags = O_CREAT | O_RDONLY;
542 		if (cf->file_rcs != NULL) {
543 			if (!onbranch) {
544 				if (cf->in_attic == 0)
545 					cvs_log(LP_ERR, "warning: expected %s "
546 					    "to be in the Attic",
547 					    cf->file_path);
548 
549 				if (cf->file_rcs->rf_dead == 0)
550 					cvs_log(LP_ERR, "warning: expected %s "
551 					    "to be dead", cf->file_path);
552 
553 				cvs_get_repository_path(cf->file_wd, repo,
554 				    MAXPATHLEN);
555 				(void)xsnprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
556 				    repo, cf->file_name, RCS_FILE_EXT);
557 
558 				if (rename(cf->file_rpath, rcsfile) == -1)
559 					fatal("cvs_commit_local: failed to "
560 					    "move %s outside the Attic: %s",
561 					    cf->file_path, strerror(errno));
562 
563 				xfree(cf->file_rpath);
564 				cf->file_rpath = xstrdup(rcsfile);
565 				isnew = 0;
566 			}
567 
568 			rcsflags = RCS_READ | RCS_PARSE_FULLY;
569 			openflags = O_RDONLY;
570 			rcs_close(cf->file_rcs);
571 		}
572 
573 		cf->repo_fd = open(cf->file_rpath, openflags);
574 		if (cf->repo_fd < 0)
575 			fatal("cvs_commit_local: %s", strerror(errno));
576 
577 		cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
578 		    rcsflags, 0444);
579 		if (cf->file_rcs == NULL)
580 			fatal("cvs_commit_local: failed to create RCS file "
581 			    "for %s", cf->file_path);
582 
583 		commit_desc_set(cf);
584 
585 		if (branchadded)
586 			strlcpy(rbuf, "Non-existent", sizeof(rbuf));
587 	}
588 
589 	if (verbosity > 1) {
590 		cvs_printf("Checking in %s:\n", cf->file_path);
591 		cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
592 		cvs_printf("old revision: %s; ", rbuf);
593 	}
594 
595 	if (isnew == 0 && cf->file_rcs->rf_head == NULL)
596 		fatal("no head revision in RCS file for %s", cf->file_path);
597 
598 	if (isnew == 0 && onbranch == 0)
599 		d = commit_diff(cf, cf->file_rcs->rf_head, 0);
600 
601 	if (cf->file_status == FILE_REMOVED) {
602 		b = rcs_rev_getbuf(cf->file_rcs, crev, 0);
603 	} else if (onbranch == 1) {
604 		b = commit_diff(cf, crev, 1);
605 	} else {
606 		b = cvs_buf_load_fd(cf->fd);
607 	}
608 
609 	if (isnew == 0 && onbranch == 0) {
610 		if (rcs_deltatext_set(cf->file_rcs, crev, d) == -1)
611 			fatal("cvs_commit_local: failed to set delta");
612 	}
613 
614 	if (rcs_rev_add(cf->file_rcs, nrev, logmsg, -1, NULL) == -1)
615 		fatal("cvs_commit_local: failed to add new revision");
616 
617 	if (nrev == RCS_HEAD_REV)
618 		nrev = cf->file_rcs->rf_head;
619 
620 	if (rcs_deltatext_set(cf->file_rcs, nrev, b) == -1)
621 		fatal("cvs_commit_local: failed to set new HEAD delta");
622 
623 	if (cf->file_status == FILE_REMOVED) {
624 		if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1)
625 			fatal("cvs_commit_local: failed to set state");
626 	}
627 
628 	if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {
629 		int cf_kflag;
630 
631 		cf_kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
632 		rcs_kwexp_set(cf->file_rcs, cf_kflag);
633 	}
634 
635 	rcs_write(cf->file_rcs);
636 
637 	if (cf->file_status == FILE_REMOVED) {
638 		strlcpy(nbuf, "Removed", sizeof(nbuf));
639 	} else if (cf->file_status == FILE_ADDED) {
640 		if (cf->file_rcs->rf_dead == 1)
641 			strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
642 		else
643 			rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
644 	} else if (cf->file_status == FILE_MODIFIED) {
645 		rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
646 	}
647 
648 	if (verbosity > 1)
649 		cvs_printf("new revision: %s\n", nbuf);
650 
651 	(void)unlink(cf->file_path);
652 	(void)close(cf->fd);
653 	cf->fd = -1;
654 
655 	if (cf->file_status != FILE_REMOVED) {
656 		cvs_checkout_file(cf, nrev, NULL, CO_COMMIT);
657 	} else {
658 		entlist = cvs_ent_open(cf->file_wd);
659 		cvs_ent_remove(entlist, cf->file_name);
660 
661 		cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
662 
663 		(void)xsnprintf(attic, MAXPATHLEN, "%s/%s",
664 		    repo, CVS_PATH_ATTIC);
665 
666 		if (mkdir(attic, 0755) == -1 && errno != EEXIST)
667 			fatal("cvs_commit_local: failed to create Attic");
668 
669 		(void)xsnprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
670 		    CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
671 
672 		if (rename(cf->file_rpath, attic) == -1)
673 			fatal("cvs_commit_local: failed to move %s to Attic",
674 			    cf->file_path);
675 
676 		if (cvs_server_active == 1)
677 			cvs_server_update_entry("Remove-entry", cf);
678 	}
679 
680 	if (verbosity > 1)
681 		cvs_printf("done\n");
682 	else {
683 		cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
684 		    cf->file_path, rbuf, nbuf);
685 	}
686 
687 	if (line_list != NULL) {
688 		fi = xcalloc(1, sizeof(*fi));
689 		fi->file_path = xstrdup(cf->file_path);
690 		fi->crevstr = xstrdup(rbuf);
691 		fi->nrevstr = xstrdup(nbuf);
692 		if (tag != NULL)
693 			fi->tag_new = xstrdup(tag);
694 		TAILQ_INSERT_TAIL(&files_info, fi, flist);
695 	}
696 
697 	switch (cf->file_status) {
698 	case FILE_MODIFIED:
699 		histtype = CVS_HISTORY_COMMIT_MODIFIED;
700 		break;
701 	case FILE_ADDED:
702 		histtype = CVS_HISTORY_COMMIT_ADDED;
703 		break;
704 	case FILE_REMOVED:
705 		histtype = CVS_HISTORY_COMMIT_REMOVED;
706 		break;
707 	}
708 
709 	if (crev != NULL)
710 		rcsnum_free(crev);
711 
712 	cvs_history_add(histtype, cf, NULL);
713 }
714 
715 static BUF *
716 commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse)
717 {
718 	int fd1, fd2, f;
719 	char *p1, *p2, *p;
720 	BUF *b;
721 
722 	(void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
723 
724 	if (cf->file_status == FILE_MODIFIED ||
725 	    cf->file_status == FILE_ADDED) {
726 		b = cvs_buf_load_fd(cf->fd);
727 		fd1 = cvs_buf_write_stmp(b, p1, NULL);
728 		cvs_buf_free(b);
729 	} else {
730 		fd1 = rcs_rev_write_stmp(cf->file_rcs, rev, p1, 0);
731 	}
732 
733 	(void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
734 	fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
735 
736 	b = cvs_buf_alloc(128);
737 
738 	diff_format = D_RCSDIFF;
739 
740 	if (reverse == 1) {
741 		p = p1;
742 		p1 = p2;
743 		p2 = p;
744 
745 		f = fd1;
746 		fd1 = fd2;
747 		fd2 = f;
748 	}
749 
750 	if (cvs_diffreg(p1, p2, fd1, fd2, b) == D_ERROR)
751 		fatal("commit_diff: failed to get RCS patch");
752 
753 	close(fd1);
754 	close(fd2);
755 
756 	xfree(p1);
757 	xfree(p2);
758 
759 	return (b);
760 }
761 
762 static void
763 commit_desc_set(struct cvs_file *cf)
764 {
765 	BUF *bp;
766 	int fd;
767 	char desc_path[MAXPATHLEN], *desc;
768 
769 	(void)xsnprintf(desc_path, MAXPATHLEN, "%s/%s/%s%s",
770 	    cf->file_wd, CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
771 
772 	if ((fd = open(desc_path, O_RDONLY)) == -1)
773 		return;
774 
775 	bp = cvs_buf_load_fd(fd);
776 	cvs_buf_putc(bp, '\0');
777 	desc = cvs_buf_release(bp);
778 
779 	rcs_desc_set(cf->file_rcs, desc);
780 
781 	(void)close(fd);
782 	(void)cvs_unlink(desc_path);
783 
784 	xfree(desc);
785 }
786