Annotation of src/usr.bin/cvs/commit.c, Revision 1.143
1.143 ! tobias 1: /* $OpenBSD: commit.c,v 1.142 2008/06/14 04:34:08 tobias Exp $ */
1.1 jfb 2: /*
1.55 joris 3: * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
1.71 xsa 4: * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
1.1 jfb 5: *
1.55 joris 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.
1.1 jfb 9: *
1.55 joris 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.
1.1 jfb 17: */
18:
1.105 otto 19: #include <sys/stat.h>
20:
21: #include <errno.h>
22: #include <fcntl.h>
1.137 joris 23: #include <libgen.h>
1.105 otto 24: #include <string.h>
25: #include <unistd.h>
1.1 jfb 26:
27: #include "cvs.h"
1.55 joris 28: #include "diff.h"
1.80 joris 29: #include "remote.h"
1.1 jfb 30:
1.135 tobias 31: void cvs_commit_local(struct cvs_file *);
32: void cvs_commit_check_files(struct cvs_file *);
1.139 joris 33: void cvs_commit_loginfo(char *);
1.135 tobias 34: void cvs_commit_lock_dirs(struct cvs_file *);
35:
1.112 joris 36: static BUF *commit_diff(struct cvs_file *, RCSNUM *, int);
1.71 xsa 37: static void commit_desc_set(struct cvs_file *);
1.55 joris 38:
1.137 joris 39: struct file_info_list files_info;
40: struct trigger_list *line_list;
1.86 joris 41:
1.139 joris 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:
1.55 joris 47: int conflicts_found;
1.86 joris 48: char *logmsg = NULL;
1.137 joris 49: char *loginfo = NULL;
1.34 jfb 50:
51: struct cvs_cmd cvs_cmd_commit = {
1.132 joris 52: CVS_OP_COMMIT, CVS_USE_WDIR | CVS_LOCK_REPO, "commit",
1.55 joris 53: { "ci", "com" },
1.34 jfb 54: "Check files into the repository",
55: "[-flR] [-F logfile | -m msg] [-r rev] ...",
56: "F:flm:Rr:",
1.18 joris 57: NULL,
1.55 joris 58: cvs_commit
1.18 joris 59: };
1.1 jfb 60:
1.55 joris 61: int
62: cvs_commit(int argc, char **argv)
1.1 jfb 63: {
1.127 joris 64: int flags;
1.121 tobias 65: int ch, Fflag, mflag;
1.127 joris 66: struct module_checkout *mc;
1.55 joris 67: struct cvs_recursion cr;
1.137 joris 68: struct cvs_filelist *l;
69: struct file_info *fi;
1.127 joris 70: char *arg = ".", repo[MAXPATHLEN];
1.3 krapht 71:
1.58 joris 72: flags = CR_RECURSE_DIRS;
1.121 tobias 73: Fflag = mflag = 0;
1.58 joris 74:
1.55 joris 75: while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
1.1 jfb 76: switch (ch) {
77: case 'F':
1.121 tobias 78: /* free previously assigned value */
79: if (logmsg != NULL)
80: xfree(logmsg);
1.88 joris 81: logmsg = cvs_logmsg_read(optarg);
1.121 tobias 82: Fflag = 1;
1.1 jfb 83: break;
1.82 xsa 84: case 'f':
85: break;
1.1 jfb 86: case 'l':
1.58 joris 87: flags &= ~CR_RECURSE_DIRS;
1.1 jfb 88: break;
89: case 'm':
1.121 tobias 90: /* free previously assigned value */
91: if (logmsg != NULL)
92: xfree(logmsg);
1.55 joris 93: logmsg = xstrdup(optarg);
1.121 tobias 94: mflag = 1;
1.55 joris 95: break;
1.82 xsa 96: case 'R':
1.120 tobias 97: flags |= CR_RECURSE_DIRS;
1.82 xsa 98: break;
1.55 joris 99: case 'r':
1.1 jfb 100: break;
101: default:
1.55 joris 102: fatal("%s", cvs_cmd_commit.cmd_synopsis);
1.1 jfb 103: }
104: }
105:
1.55 joris 106: argc -= optind;
107: argv += optind;
1.121 tobias 108:
109: /* -F and -m are mutually exclusive */
110: if (Fflag && mflag)
111: fatal("cannot specify both a log file and a message");
1.1 jfb 112:
1.139 joris 113: TAILQ_INIT(&files_affected);
114: TAILQ_INIT(&files_added);
115: TAILQ_INIT(&files_removed);
116: TAILQ_INIT(&files_modified);
117:
1.137 joris 118: TAILQ_INIT(&files_info);
1.86 joris 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);
1.92 joris 134:
1.139 joris 135: if (TAILQ_EMPTY(&files_affected))
1.92 joris 136: return (0);
1.86 joris 137:
1.139 joris 138: if (logmsg == NULL && cvs_server_active == 0) {
139: logmsg = cvs_logmsg_create(NULL, &files_added, &files_removed,
140: &files_modified);
1.87 joris 141:
1.135 tobias 142: if (logmsg == NULL)
143: fatal("This shouldnt happen, honestly!");
1.139 joris 144: }
1.80 joris 145:
1.139 joris 146: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.89 joris 147: cvs_client_connect_to_server();
1.80 joris 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);
1.99 xsa 154:
155: if (!(flags & CR_RECURSE_DIRS))
156: cvs_client_send_request("Argument -l");
1.80 joris 157:
1.123 tobias 158: cvs_client_send_logmsg(logmsg);
1.80 joris 159: cvs_client_send_files(argv, argc);
160: cvs_client_senddir(".");
161: cvs_client_send_request("ci");
162: cvs_client_get_responses();
1.86 joris 163: } else {
1.137 joris 164: if (cvs_server_active && logmsg == NULL)
165: fatal("no log message specified");
166:
1.139 joris 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);
1.135 tobias 176: }
1.132 joris 177:
1.139 joris 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");
1.137 joris 182: cvs_trigger_freelist(line_list);
1.139 joris 183: goto end;
1.137 joris 184: }
1.138 joris 185:
1.139 joris 186: cvs_trigger_freelist(line_list);
187: cvs_trigger_freeinfo(&files_info);
188: }
1.137 joris 189:
1.139 joris 190: if (cvs_logmsg_verify(logmsg))
191: goto end;
1.127 joris 192:
1.139 joris 193: cr.fileproc = cvs_commit_lock_dirs;
194: cvs_file_walklist(&files_affected, &cr);
1.137 joris 195:
1.139 joris 196: line_list = cvs_trigger_getlines(CVS_PATH_LOGINFO, repo);
1.135 tobias 197:
1.139 joris 198: cr.fileproc = cvs_commit_local;
199: cvs_file_walklist(&files_affected, &cr);
1.138 joris 200:
1.139 joris 201: if (line_list != NULL) {
202: cvs_commit_loginfo(repo);
1.138 joris 203:
1.139 joris 204: cvs_trigger_handle(CVS_TRIGGER_LOGINFO, repo,
205: loginfo, line_list, &files_info);
1.137 joris 206:
1.139 joris 207: xfree(loginfo);
208: cvs_trigger_freelist(line_list);
209: cvs_trigger_freeinfo(&files_info);
1.135 tobias 210: }
1.139 joris 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);
1.80 joris 216: }
1.1 jfb 217:
1.137 joris 218: end:
219: cvs_trigger_freeinfo(&files_info);
1.123 tobias 220: xfree(logmsg);
1.18 joris 221: return (0);
1.132 joris 222: }
223:
224: void
1.139 joris 225: cvs_commit_loginfo(char *repo)
1.137 joris 226: {
227: BUF *buf;
1.139 joris 228: char pwd[MAXPATHLEN];
1.137 joris 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:
1.139 joris 238: if (!TAILQ_EMPTY(&files_added)) {
1.137 joris 239: cvs_buf_puts(buf, "Added Files:");
240:
1.139 joris 241: TAILQ_FOREACH(cf, &files_added, flist) {
1.137 joris 242: cvs_buf_putc(buf, '\n');
243: cvs_buf_putc(buf, '\t');
1.139 joris 244: cvs_buf_puts(buf, cf->file_path);
1.137 joris 245: }
246:
247: cvs_buf_putc(buf, '\n');
248: }
249:
1.139 joris 250: if (!TAILQ_EMPTY(&files_modified)) {
1.137 joris 251: cvs_buf_puts(buf, "Modified Files:");
252:
1.139 joris 253: TAILQ_FOREACH(cf, &files_modified, flist) {
1.137 joris 254: cvs_buf_putc(buf, '\n');
255: cvs_buf_putc(buf, '\t');
1.139 joris 256: cvs_buf_puts(buf, cf->file_path);
1.137 joris 257: }
258:
259: cvs_buf_putc(buf, '\n');
260: }
261:
1.139 joris 262: if (!TAILQ_EMPTY(&files_removed)) {
1.137 joris 263: cvs_buf_puts(buf, "Removed Files:");
264:
1.139 joris 265: TAILQ_FOREACH(cf, &files_removed, flist) {
1.137 joris 266: cvs_buf_putc(buf, '\n');
267: cvs_buf_putc(buf, '\t');
1.139 joris 268: cvs_buf_puts(buf, cf->file_path);
1.137 joris 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
1.132 joris 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);
1.18 joris 294: }
1.1 jfb 295:
1.55 joris 296: void
1.86 joris 297: cvs_commit_check_files(struct cvs_file *cf)
1.18 joris 298: {
1.112 joris 299: char *tag;
300: RCSNUM *branch, *brev;
301:
1.123 tobias 302: branch = brev = NULL;
303:
1.86 joris 304: cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path);
1.44 joris 305:
1.108 joris 306: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL)
307: cvs_remote_classify_file(cf);
308: else
1.110 joris 309: cvs_file_classify(cf, cvs_directory_tag);
1.59 joris 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: }
1.32 joris 316:
1.136 tobias 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 ||
1.79 joris 324: cf->file_status == FILE_UNLINK) {
1.136 tobias 325: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
326: cf->file_path);
1.55 joris 327: conflicts_found++;
1.79 joris 328: return;
329: }
1.57 joris 330:
1.136 tobias 331: if (cf->file_status == FILE_CONFLICT &&
332: cf->file_ent->ce_conflict != NULL) {
1.60 joris 333: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
334: "merging, please fix these first", cf->file_path);
335: conflicts_found++;
1.79 joris 336: return;
1.60 joris 337: }
338:
1.136 tobias 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);
1.128 joris 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",
1.57 joris 348: cf->file_path);
349: conflicts_found++;
1.79 joris 350: return;
1.57 joris 351: }
1.55 joris 352:
1.112 joris 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;
1.125 joris 363: rcsnum_free(brev);
1.112 joris 364: }
365:
366: brev = rcs_translate_tag(tag, cf->file_rcs);
367:
368: if (brev == NULL) {
1.143 ! tobias 369: if (cf->file_status == FILE_ADDED)
! 370: goto next;
1.112 joris 371: fatal("failed to resolve tag: %s",
372: cf->file_ent->ce_tag);
373: }
374:
375: if ((branch = rcsnum_revtobr(brev)) == NULL) {
1.136 tobias 376: cvs_log(LP_ERR, "sticky tag %s is not "
377: "a branch for file %s", tag,
378: cf->file_path);
1.112 joris 379: conflicts_found++;
1.123 tobias 380: rcsnum_free(brev);
1.112 joris 381: return;
382: }
383:
384: if (!RCSNUM_ISBRANCHREV(brev)) {
1.136 tobias 385: cvs_log(LP_ERR, "sticky tag %s is not "
386: "a branch for file %s", tag,
387: cf->file_path);
1.112 joris 388: conflicts_found++;
1.123 tobias 389: rcsnum_free(branch);
390: rcsnum_free(brev);
1.112 joris 391: return;
392: }
393:
394: if (!RCSNUM_ISBRANCH(branch)) {
1.136 tobias 395: cvs_log(LP_ERR, "sticky tag %s is not "
396: "a branch for file %s", tag,
397: cf->file_path);
1.112 joris 398: conflicts_found++;
1.123 tobias 399: rcsnum_free(branch);
400: rcsnum_free(brev);
1.112 joris 401: return;
402: }
403: }
404: }
405:
406: next:
1.123 tobias 407: if (branch != NULL)
408: rcsnum_free(branch);
409: if (brev != NULL)
410: rcsnum_free(brev);
411:
1.135 tobias 412: if (cf->file_status != FILE_ADDED &&
413: cf->file_status != FILE_REMOVED &&
414: cf->file_status != FILE_MODIFIED)
415: return;
1.86 joris 416:
1.139 joris 417: cvs_file_get(cf->file_path, 0, &files_affected);
1.135 tobias 418:
1.86 joris 419: switch (cf->file_status) {
420: case FILE_ADDED:
1.139 joris 421: cvs_file_get(cf->file_path, 0, &files_added);
1.86 joris 422: break;
423: case FILE_REMOVED:
1.139 joris 424: cvs_file_get(cf->file_path, 0, &files_removed);
1.86 joris 425: break;
426: case FILE_MODIFIED:
1.139 joris 427: cvs_file_get(cf->file_path, 0, &files_modified);
1.86 joris 428: break;
429: }
1.55 joris 430: }
1.1 jfb 431:
1.55 joris 432: void
433: cvs_commit_local(struct cvs_file *cf)
434: {
1.112 joris 435: char *tag;
1.91 joris 436: BUF *b, *d;
1.143 ! tobias 437: int onbranch, isnew, histtype, branchadded;
1.112 joris 438: RCSNUM *nrev, *crev, *rrev, *brev;
1.102 xsa 439: int openflags, rcsflags;
1.119 tobias 440: char rbuf[CVS_REV_BUFSZ], nbuf[CVS_REV_BUFSZ];
1.56 joris 441: CVSENTRIES *entlist;
1.100 otto 442: char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN];
1.137 joris 443: struct file_info *fi;
1.17 joris 444:
1.55 joris 445: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.110 joris 446: cvs_file_classify(cf, cvs_directory_tag);
1.69 joris 447:
448: if (cvs_noexec == 1)
449: return;
1.35 xsa 450:
1.64 joris 451: if (cf->file_type != CVS_FILE)
452: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
453:
1.143 ! tobias 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:
1.107 joris 475: cvs_log(LP_ERR, "skipping bogus file `%s'", cf->file_path);
476: return;
477: }
478:
1.112 joris 479: onbranch = 0;
480: nrev = RCS_HEAD_REV;
481: crev = NULL;
482: rrev = NULL;
483:
1.115 joris 484: if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) {
1.114 joris 485: rcsnum_free(cf->file_rcs->rf_branch);
486: cf->file_rcs->rf_branch = NULL;
487: }
488:
1.143 ! tobias 489: if (cf->file_rcs != NULL) {
1.112 joris 490: rrev = rcs_head_get(cf->file_rcs);
491: crev = rcs_head_get(cf->file_rcs);
1.116 tobias 492: if (crev == NULL || rrev == NULL)
1.142 tobias 493: fatal("no head revision in RCS file for %s",
494: cf->file_path);
1.112 joris 495:
496: if (tag != NULL) {
497: rcsnum_free(crev);
1.133 tobias 498: rcsnum_free(rrev);
499: brev = rcs_sym_getrev(cf->file_rcs, tag);
1.112 joris 500: crev = rcs_translate_tag(tag, cf->file_rcs);
1.133 tobias 501: if (brev == NULL || crev == NULL) {
1.112 joris 502: fatal("failed to resolve existing tag: %s",
503: tag);
504: }
505:
1.133 tobias 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)) {
1.112 joris 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:
1.133 tobias 522: rcsnum_free(brev);
1.112 joris 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));
1.93 joris 531: } else {
1.61 joris 532: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.93 joris 533: }
1.61 joris 534:
1.123 tobias 535: if (rrev != NULL)
536: rcsnum_free(rrev);
1.67 joris 537: isnew = 0;
1.66 joris 538: if (cf->file_status == FILE_ADDED) {
1.67 joris 539: isnew = 1;
1.66 joris 540: rcsflags = RCS_CREATE;
1.143 ! tobias 541: openflags = O_CREAT | O_RDONLY;
1.66 joris 542: if (cf->file_rcs != NULL) {
1.143 ! tobias 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: }
1.66 joris 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);
1.61 joris 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,
1.103 otto 578: rcsflags, 0444);
1.61 joris 579: if (cf->file_rcs == NULL)
580: fatal("cvs_commit_local: failed to create RCS file "
581: "for %s", cf->file_path);
1.71 xsa 582:
583: commit_desc_set(cf);
1.143 ! tobias 584:
! 585: if (branchadded)
! 586: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.61 joris 587: }
1.36 joris 588:
1.77 reyk 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: }
1.142 tobias 594:
595: if (isnew == 0 && cf->file_rcs->rf_head == NULL)
596: fatal("no head revision in RCS file for %s", cf->file_path);
1.7 jfb 597:
1.112 joris 598: if (isnew == 0 && onbranch == 0)
599: d = commit_diff(cf, cf->file_rcs->rf_head, 0);
1.7 jfb 600:
1.56 joris 601: if (cf->file_status == FILE_REMOVED) {
1.112 joris 602: b = rcs_rev_getbuf(cf->file_rcs, crev, 0);
603: } else if (onbranch == 1) {
604: b = commit_diff(cf, crev, 1);
1.61 joris 605: } else {
1.129 tobias 606: b = cvs_buf_load_fd(cf->fd);
1.56 joris 607: }
1.7 jfb 608:
1.112 joris 609: if (isnew == 0 && onbranch == 0) {
610: if (rcs_deltatext_set(cf->file_rcs, crev, d) == -1)
1.61 joris 611: fatal("cvs_commit_local: failed to set delta");
612: }
1.3 krapht 613:
1.112 joris 614: if (rcs_rev_add(cf->file_rcs, nrev, logmsg, -1, NULL) == -1)
1.55 joris 615: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 616:
1.112 joris 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)
1.55 joris 621: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 622:
1.56 joris 623: if (cf->file_status == FILE_REMOVED) {
1.112 joris 624: if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1)
1.56 joris 625: fatal("cvs_commit_local: failed to set state");
1.101 xsa 626: }
627:
628: if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {
1.126 tobias 629: int cf_kflag;
1.101 xsa 630:
1.126 tobias 631: cf_kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
632: rcs_kwexp_set(cf->file_rcs, cf_kflag);
1.56 joris 633: }
634:
1.55 joris 635: rcs_write(cf->file_rcs);
1.6 jfb 636:
1.56 joris 637: if (cf->file_status == FILE_REMOVED) {
1.77 reyk 638: strlcpy(nbuf, "Removed", sizeof(nbuf));
1.61 joris 639: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 640: if (cf->file_rcs->rf_dead == 1)
1.77 reyk 641: strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
1.63 joris 642: else
1.112 joris 643: rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56 joris 644: } else if (cf->file_status == FILE_MODIFIED) {
1.112 joris 645: rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56 joris 646: }
647:
1.77 reyk 648: if (verbosity > 1)
649: cvs_printf("new revision: %s\n", nbuf);
1.3 krapht 650:
1.55 joris 651: (void)unlink(cf->file_path);
652: (void)close(cf->fd);
653: cf->fd = -1;
1.56 joris 654:
655: if (cf->file_status != FILE_REMOVED) {
1.112 joris 656: cvs_checkout_file(cf, nrev, NULL, CO_COMMIT);
1.56 joris 657: } else {
658: entlist = cvs_ent_open(cf->file_wd);
659: cvs_ent_remove(entlist, cf->file_name);
1.64 joris 660:
661: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
662:
1.102 xsa 663: (void)xsnprintf(attic, MAXPATHLEN, "%s/%s",
664: repo, CVS_PATH_ATTIC);
1.64 joris 665:
666: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
667: fatal("cvs_commit_local: failed to create Attic");
668:
1.102 xsa 669: (void)xsnprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
1.64 joris 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:
1.85 joris 676: if (cvs_server_active == 1)
677: cvs_server_update_entry("Remove-entry", cf);
1.56 joris 678: }
1.3 krapht 679:
1.77 reyk 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);
1.137 joris 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);
1.140 joris 692: if (tag != NULL)
693: fi->tag_new = xstrdup(tag);
1.137 joris 694: TAILQ_INSERT_TAIL(&files_info, fi, flist);
1.77 reyk 695: }
1.107 joris 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: }
1.125 joris 708:
709: if (crev != NULL)
710: rcsnum_free(crev);
1.107 joris 711:
712: cvs_history_add(histtype, cf, NULL);
1.39 xsa 713: }
714:
1.91 joris 715: static BUF *
1.112 joris 716: commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse)
1.39 xsa 717: {
1.131 joris 718: int fd1, fd2, f;
1.112 joris 719: char *p1, *p2, *p;
1.122 tobias 720: BUF *b;
1.97 joris 721:
722: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
1.39 xsa 723:
1.63 joris 724: if (cf->file_status == FILE_MODIFIED ||
725: cf->file_status == FILE_ADDED) {
1.129 tobias 726: b = cvs_buf_load_fd(cf->fd);
1.131 joris 727: fd1 = cvs_buf_write_stmp(b, p1, NULL);
1.122 tobias 728: cvs_buf_free(b);
1.63 joris 729: } else {
1.131 joris 730: fd1 = rcs_rev_write_stmp(cf->file_rcs, rev, p1, 0);
1.56 joris 731: }
1.3 krapht 732:
1.97 joris 733: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
1.131 joris 734: fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
1.55 joris 735:
1.129 tobias 736: b = cvs_buf_alloc(128);
1.55 joris 737:
738: diff_format = D_RCSDIFF;
1.112 joris 739:
740: if (reverse == 1) {
741: p = p1;
742: p1 = p2;
743: p2 = p;
1.131 joris 744:
745: f = fd1;
746: fd1 = fd2;
747: fd2 = f;
1.112 joris 748: }
749:
1.131 joris 750: if (cvs_diffreg(p1, p2, fd1, fd2, b) == D_ERROR)
1.112 joris 751: fatal("commit_diff: failed to get RCS patch");
1.131 joris 752:
753: close(fd1);
754: close(fd2);
1.96 joris 755:
756: xfree(p1);
757: xfree(p2);
1.55 joris 758:
1.122 tobias 759: return (b);
1.71 xsa 760: }
761:
762: static void
763: commit_desc_set(struct cvs_file *cf)
764: {
765: BUF *bp;
1.102 xsa 766: int fd;
1.100 otto 767: char desc_path[MAXPATHLEN], *desc;
1.71 xsa 768:
1.134 tobias 769: (void)xsnprintf(desc_path, MAXPATHLEN, "%s/%s/%s%s",
770: cf->file_wd, CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
1.71 xsa 771:
1.100 otto 772: if ((fd = open(desc_path, O_RDONLY)) == -1)
1.71 xsa 773: return;
774:
1.129 tobias 775: bp = cvs_buf_load_fd(fd);
1.71 xsa 776: cvs_buf_putc(bp, '\0');
777: desc = cvs_buf_release(bp);
778:
779: rcs_desc_set(cf->file_rcs, desc);
780:
1.76 joris 781: (void)close(fd);
1.71 xsa 782: (void)cvs_unlink(desc_path);
783:
784: xfree(desc);
1.1 jfb 785: }
![[BACK]](/icons/back.gif){kind=icon}
Return to commit.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs