Annotation of src/usr.bin/cvs/commit.c, Revision 1.156
1.156 ! joris 1: /* $OpenBSD: commit.c,v 1.155 2016/10/13 20:51:25 fcambus 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.154 nicm 24: #include <stdlib.h>
1.105 otto 25: #include <string.h>
26: #include <unistd.h>
1.1 jfb 27:
28: #include "cvs.h"
1.55 joris 29: #include "diff.h"
1.80 joris 30: #include "remote.h"
1.1 jfb 31:
1.135 tobias 32: void cvs_commit_local(struct cvs_file *);
33: void cvs_commit_check_files(struct cvs_file *);
1.139 joris 34: void cvs_commit_loginfo(char *);
1.135 tobias 35: void cvs_commit_lock_dirs(struct cvs_file *);
36:
1.112 joris 37: static BUF *commit_diff(struct cvs_file *, RCSNUM *, int);
1.71 xsa 38: static void commit_desc_set(struct cvs_file *);
1.55 joris 39:
1.137 joris 40: struct file_info_list files_info;
41: struct trigger_list *line_list;
1.86 joris 42:
1.139 joris 43: struct cvs_flisthead files_affected;
44: struct cvs_flisthead files_added;
45: struct cvs_flisthead files_removed;
46: struct cvs_flisthead files_modified;
47:
1.86 joris 48: char *logmsg = NULL;
1.137 joris 49: char *loginfo = NULL;
1.152 nicm 50:
51: static int conflicts_found;
1.34 jfb 52:
53: struct cvs_cmd cvs_cmd_commit = {
1.132 joris 54: CVS_OP_COMMIT, CVS_USE_WDIR | CVS_LOCK_REPO, "commit",
1.55 joris 55: { "ci", "com" },
1.34 jfb 56: "Check files into the repository",
57: "[-flR] [-F logfile | -m msg] [-r rev] ...",
58: "F:flm:Rr:",
1.18 joris 59: NULL,
1.55 joris 60: cvs_commit
1.18 joris 61: };
1.1 jfb 62:
1.55 joris 63: int
64: cvs_commit(int argc, char **argv)
1.1 jfb 65: {
1.127 joris 66: int flags;
1.121 tobias 67: int ch, Fflag, mflag;
1.127 joris 68: struct module_checkout *mc;
1.55 joris 69: struct cvs_recursion cr;
1.137 joris 70: struct cvs_filelist *l;
71: struct file_info *fi;
1.153 deraadt 72: char *arg = ".", repo[PATH_MAX];
1.3 krapht 73:
1.58 joris 74: flags = CR_RECURSE_DIRS;
1.121 tobias 75: Fflag = mflag = 0;
1.58 joris 76:
1.55 joris 77: while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
1.1 jfb 78: switch (ch) {
79: case 'F':
1.121 tobias 80: /* free previously assigned value */
1.154 nicm 81: free(logmsg);
1.88 joris 82: logmsg = cvs_logmsg_read(optarg);
1.121 tobias 83: Fflag = 1;
1.1 jfb 84: break;
1.82 xsa 85: case 'f':
86: break;
1.1 jfb 87: case 'l':
1.58 joris 88: flags &= ~CR_RECURSE_DIRS;
1.1 jfb 89: break;
90: case 'm':
1.121 tobias 91: /* free previously assigned value */
1.154 nicm 92: free(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.146 joris 113: RB_INIT(&files_affected);
114: RB_INIT(&files_added);
115: RB_INIT(&files_removed);
116: RB_INIT(&files_modified);
1.139 joris 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.146 joris 135: if (RB_EMPTY(&files_affected))
1.92 joris 136: return (0);
1.86 joris 137:
1.139 joris 138: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.145 tobias 139: if (logmsg == NULL) {
140: logmsg = cvs_logmsg_create(NULL, &files_added,
141: &files_removed, &files_modified);
142: if (logmsg == NULL)
143: fatal("This shouldnt happen, honestly!");
144: }
1.89 joris 145: cvs_client_connect_to_server();
1.80 joris 146: cr.fileproc = cvs_client_sendfile;
147:
148: if (argc > 0)
149: cvs_file_run(argc, argv, &cr);
150: else
151: cvs_file_run(1, &arg, &cr);
1.99 xsa 152:
153: if (!(flags & CR_RECURSE_DIRS))
154: cvs_client_send_request("Argument -l");
1.80 joris 155:
1.123 tobias 156: cvs_client_send_logmsg(logmsg);
1.80 joris 157: cvs_client_send_files(argv, argc);
158: cvs_client_senddir(".");
159: cvs_client_send_request("ci");
160: cvs_client_get_responses();
1.86 joris 161: } else {
1.153 deraadt 162: cvs_get_repository_name(".", repo, PATH_MAX);
1.139 joris 163:
164: line_list = cvs_trigger_getlines(CVS_PATH_COMMITINFO, repo);
165: if (line_list != NULL) {
1.146 joris 166: RB_FOREACH(l, cvs_flisthead, &files_affected) {
1.139 joris 167: fi = xcalloc(1, sizeof(*fi));
168: fi->file_path = xstrdup(l->file_path);
169: TAILQ_INSERT_TAIL(&files_info, fi,
170: flist);
1.135 tobias 171: }
1.132 joris 172:
1.139 joris 173: if (cvs_trigger_handle(CVS_TRIGGER_COMMITINFO,
174: repo, NULL, line_list, &files_info)) {
175: cvs_log(LP_ERR,
176: "Pre-commit check failed");
1.137 joris 177: cvs_trigger_freelist(line_list);
1.139 joris 178: goto end;
1.137 joris 179: }
1.138 joris 180:
1.139 joris 181: cvs_trigger_freelist(line_list);
182: cvs_trigger_freeinfo(&files_info);
183: }
1.137 joris 184:
1.145 tobias 185: if (cvs_server_active) {
186: if (logmsg == NULL)
187: fatal("no log message specified");
188: } else if (logmsg == NULL) {
189: logmsg = cvs_logmsg_create(NULL, &files_added,
1.151 nicm 190: &files_removed, &files_modified);
1.145 tobias 191: if (logmsg == NULL)
192: fatal("This shouldnt happen, honestly!");
193: }
194:
1.139 joris 195: if (cvs_logmsg_verify(logmsg))
196: goto end;
1.127 joris 197:
1.139 joris 198: cr.fileproc = cvs_commit_lock_dirs;
199: cvs_file_walklist(&files_affected, &cr);
1.137 joris 200:
1.139 joris 201: line_list = cvs_trigger_getlines(CVS_PATH_LOGINFO, repo);
1.135 tobias 202:
1.139 joris 203: cr.fileproc = cvs_commit_local;
204: cvs_file_walklist(&files_affected, &cr);
1.138 joris 205:
1.139 joris 206: if (line_list != NULL) {
207: cvs_commit_loginfo(repo);
1.138 joris 208:
1.139 joris 209: cvs_trigger_handle(CVS_TRIGGER_LOGINFO, repo,
210: loginfo, line_list, &files_info);
1.137 joris 211:
1.154 nicm 212: free(loginfo);
1.139 joris 213: cvs_trigger_freelist(line_list);
214: cvs_trigger_freeinfo(&files_info);
1.135 tobias 215: }
1.139 joris 216:
217: mc = cvs_module_lookup(repo);
218: if (mc->mc_prog != NULL &&
219: (mc->mc_flags & MODULE_RUN_ON_COMMIT))
220: cvs_exec(mc->mc_prog, NULL, 0);
1.80 joris 221: }
1.1 jfb 222:
1.137 joris 223: end:
224: cvs_trigger_freeinfo(&files_info);
1.154 nicm 225: free(logmsg);
1.18 joris 226: return (0);
1.132 joris 227: }
228:
229: void
1.139 joris 230: cvs_commit_loginfo(char *repo)
1.137 joris 231: {
232: BUF *buf;
1.153 deraadt 233: char pwd[PATH_MAX];
1.137 joris 234: struct cvs_filelist *cf;
235:
236: if (getcwd(pwd, sizeof(pwd)) == NULL)
237: fatal("Can't get working directory");
238:
1.150 ray 239: buf = buf_alloc(1024);
1.137 joris 240:
241: cvs_trigger_loginfo_header(buf, repo);
242:
1.146 joris 243: if (!RB_EMPTY(&files_added)) {
1.150 ray 244: buf_puts(buf, "Added Files:");
1.137 joris 245:
1.146 joris 246: RB_FOREACH(cf, cvs_flisthead, &files_added) {
1.150 ray 247: buf_putc(buf, '\n');
248: buf_putc(buf, '\t');
249: buf_puts(buf, cf->file_path);
1.137 joris 250: }
251:
1.150 ray 252: buf_putc(buf, '\n');
1.137 joris 253: }
254:
1.146 joris 255: if (!RB_EMPTY(&files_modified)) {
1.150 ray 256: buf_puts(buf, "Modified Files:");
1.137 joris 257:
1.146 joris 258: RB_FOREACH(cf, cvs_flisthead, &files_modified) {
1.150 ray 259: buf_putc(buf, '\n');
260: buf_putc(buf, '\t');
261: buf_puts(buf, cf->file_path);
1.137 joris 262: }
263:
1.150 ray 264: buf_putc(buf, '\n');
1.137 joris 265: }
266:
1.146 joris 267: if (!RB_EMPTY(&files_removed)) {
1.150 ray 268: buf_puts(buf, "Removed Files:");
1.137 joris 269:
1.146 joris 270: RB_FOREACH(cf, cvs_flisthead, &files_removed) {
1.150 ray 271: buf_putc(buf, '\n');
272: buf_putc(buf, '\t');
273: buf_puts(buf, cf->file_path);
1.137 joris 274: }
275:
1.150 ray 276: buf_putc(buf, '\n');
1.137 joris 277: }
278:
1.150 ray 279: buf_puts(buf, "Log Message:\n");
1.137 joris 280:
1.150 ray 281: buf_puts(buf, logmsg);
1.137 joris 282:
1.150 ray 283: buf_putc(buf, '\n');
284: buf_putc(buf, '\0');
1.137 joris 285:
1.150 ray 286: loginfo = buf_release(buf);
1.137 joris 287: }
288:
289: void
1.132 joris 290: cvs_commit_lock_dirs(struct cvs_file *cf)
291: {
1.153 deraadt 292: char repo[PATH_MAX];
1.132 joris 293:
294: cvs_get_repository_path(cf->file_wd, repo, sizeof(repo));
295: cvs_log(LP_TRACE, "cvs_commit_lock_dirs: %s", repo);
296:
297: /* locks stay in place until we are fully done and exit */
298: cvs_repository_lock(repo, 1);
1.18 joris 299: }
1.1 jfb 300:
1.55 joris 301: void
1.86 joris 302: cvs_commit_check_files(struct cvs_file *cf)
1.18 joris 303: {
1.112 joris 304: char *tag;
305: RCSNUM *branch, *brev;
306:
1.123 tobias 307: branch = brev = NULL;
308:
1.86 joris 309: cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path);
1.44 joris 310:
1.108 joris 311: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL)
312: cvs_remote_classify_file(cf);
313: else
1.110 joris 314: cvs_file_classify(cf, cvs_directory_tag);
1.59 joris 315:
316: if (cf->file_type == CVS_DIR) {
317: if (verbosity > 1)
318: cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
319: return;
320: }
1.32 joris 321:
1.136 tobias 322: if (cf->file_status == FILE_UPTODATE)
323: return;
324:
325: if (cf->file_status == FILE_MERGE ||
326: cf->file_status == FILE_PATCH ||
327: cf->file_status == FILE_CHECKOUT ||
328: cf->file_status == FILE_LOST ||
1.79 joris 329: cf->file_status == FILE_UNLINK) {
1.136 tobias 330: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
331: cf->file_path);
1.55 joris 332: conflicts_found++;
1.79 joris 333: return;
334: }
1.57 joris 335:
1.136 tobias 336: if (cf->file_status == FILE_CONFLICT &&
337: cf->file_ent->ce_conflict != NULL) {
1.60 joris 338: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
339: "merging, please fix these first", cf->file_path);
340: conflicts_found++;
1.79 joris 341: return;
1.60 joris 342: }
343:
1.136 tobias 344: if (cf->file_status == FILE_MODIFIED &&
345: cf->file_ent->ce_conflict != NULL &&
346: update_has_conflict_markers(cf)) {
347: cvs_log(LP_ERR, "warning: file %s seems to still contain "
348: "conflict indicators", cf->file_path);
1.128 joris 349: }
350:
351: if (cf->file_ent != NULL && cf->file_ent->ce_date != -1) {
352: cvs_log(LP_ERR, "conflict: cannot commit to sticky date for %s",
1.57 joris 353: cf->file_path);
354: conflicts_found++;
1.79 joris 355: return;
1.57 joris 356: }
1.55 joris 357:
1.112 joris 358: if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
359: tag = cvs_directory_tag;
360: if (cf->file_ent != NULL)
361: tag = cf->file_ent->ce_tag;
362:
363: if (tag != NULL && cf->file_rcs != NULL) {
364: brev = rcs_sym_getrev(cf->file_rcs, tag);
365: if (brev != NULL) {
1.156 ! joris 366: if (!RCSNUM_ISBRANCH(brev)) {
! 367: cvs_log(LP_ERR, "sticky tag %s is not "
! 368: "a branch for file %s", tag,
! 369: cf->file_path);
! 370: conflicts_found++;
! 371: }
1.112 joris 372: }
373: }
374: }
375:
1.155 fcambus 376: free(branch);
377: free(brev);
1.123 tobias 378:
1.135 tobias 379: if (cf->file_status != FILE_ADDED &&
380: cf->file_status != FILE_REMOVED &&
381: cf->file_status != FILE_MODIFIED)
382: return;
1.86 joris 383:
1.147 joris 384: cvs_file_get(cf->file_path, 0, &files_affected, CVS_FILE);
1.135 tobias 385:
1.86 joris 386: switch (cf->file_status) {
387: case FILE_ADDED:
1.147 joris 388: cvs_file_get(cf->file_path, 0, &files_added, CVS_FILE);
1.86 joris 389: break;
390: case FILE_REMOVED:
1.147 joris 391: cvs_file_get(cf->file_path, 0, &files_removed, CVS_FILE);
1.86 joris 392: break;
393: case FILE_MODIFIED:
1.147 joris 394: cvs_file_get(cf->file_path, 0, &files_modified, CVS_FILE);
1.86 joris 395: break;
396: }
1.55 joris 397: }
1.1 jfb 398:
1.55 joris 399: void
400: cvs_commit_local(struct cvs_file *cf)
401: {
1.112 joris 402: char *tag;
1.91 joris 403: BUF *b, *d;
1.143 tobias 404: int onbranch, isnew, histtype, branchadded;
1.112 joris 405: RCSNUM *nrev, *crev, *rrev, *brev;
1.102 xsa 406: int openflags, rcsflags;
1.119 tobias 407: char rbuf[CVS_REV_BUFSZ], nbuf[CVS_REV_BUFSZ];
1.56 joris 408: CVSENTRIES *entlist;
1.153 deraadt 409: char attic[PATH_MAX], repo[PATH_MAX], rcsfile[PATH_MAX];
1.137 joris 410: struct file_info *fi;
1.17 joris 411:
1.55 joris 412: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.110 joris 413: cvs_file_classify(cf, cvs_directory_tag);
1.69 joris 414:
415: if (cvs_noexec == 1)
416: return;
1.35 xsa 417:
1.64 joris 418: if (cf->file_type != CVS_FILE)
419: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
420:
1.143 tobias 421: tag = cvs_directory_tag;
422: if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
423: tag = cf->file_ent->ce_tag;
424:
425: branchadded = 0;
426: switch (cf->file_status) {
427: case FILE_ADDED:
428: if (cf->file_rcs == NULL && tag != NULL) {
429: branchadded = 1;
430: cvs_add_tobranch(cf, tag);
431: }
432: break;
433: case FILE_MODIFIED:
434: case FILE_REMOVED:
435: if (cf->file_rcs == NULL) {
436: cvs_log(LP_ERR, "RCS file for %s got lost",
437: cf->file_path);
438: return;
439: }
440: break;
441: default:
1.107 joris 442: cvs_log(LP_ERR, "skipping bogus file `%s'", cf->file_path);
443: return;
444: }
445:
1.112 joris 446: onbranch = 0;
447: nrev = RCS_HEAD_REV;
448: crev = NULL;
449: rrev = NULL;
1.144 joris 450: d = NULL;
1.112 joris 451:
1.115 joris 452: if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) {
1.155 fcambus 453: free(cf->file_rcs->rf_branch);
1.114 joris 454: cf->file_rcs->rf_branch = NULL;
455: }
456:
1.143 tobias 457: if (cf->file_rcs != NULL) {
1.112 joris 458: rrev = rcs_head_get(cf->file_rcs);
459: crev = rcs_head_get(cf->file_rcs);
1.116 tobias 460: if (crev == NULL || rrev == NULL)
1.142 tobias 461: fatal("no head revision in RCS file for %s",
462: cf->file_path);
1.112 joris 463:
464: if (tag != NULL) {
1.155 fcambus 465: free(crev);
466: free(rrev);
1.133 tobias 467: brev = rcs_sym_getrev(cf->file_rcs, tag);
1.112 joris 468: crev = rcs_translate_tag(tag, cf->file_rcs);
1.133 tobias 469: if (brev == NULL || crev == NULL) {
1.112 joris 470: fatal("failed to resolve existing tag: %s",
471: tag);
472: }
473:
1.133 tobias 474: rrev = rcsnum_alloc();
475: rcsnum_cpy(brev, rrev, brev->rn_len - 1);
476:
477: if (RCSNUM_ISBRANCHREV(crev) &&
478: rcsnum_cmp(crev, rrev, 0)) {
1.112 joris 479: nrev = rcsnum_alloc();
480: rcsnum_cpy(crev, nrev, 0);
481: rcsnum_inc(nrev);
482: } else if (!RCSNUM_ISBRANCH(crev)) {
483: nrev = rcsnum_brtorev(brev);
484: if (nrev == NULL)
485: fatal("failed to create branch rev");
486: } else {
487: fatal("this isnt suppose to happen, honestly");
488: }
489:
1.155 fcambus 490: free(brev);
491: free(rrev);
1.112 joris 492: rrev = rcsnum_branch_root(nrev);
493:
494: /* branch stuff was checked in cvs_commit_check_files */
495: onbranch = 1;
496: }
497:
498: rcsnum_tostr(crev, rbuf, sizeof(rbuf));
1.93 joris 499: } else {
1.61 joris 500: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.93 joris 501: }
1.61 joris 502:
1.155 fcambus 503: free(rrev);
1.67 joris 504: isnew = 0;
1.66 joris 505: if (cf->file_status == FILE_ADDED) {
1.67 joris 506: isnew = 1;
1.66 joris 507: rcsflags = RCS_CREATE;
1.143 tobias 508: openflags = O_CREAT | O_RDONLY;
1.66 joris 509: if (cf->file_rcs != NULL) {
1.143 tobias 510: if (!onbranch) {
511: if (cf->in_attic == 0)
512: cvs_log(LP_ERR, "warning: expected %s "
513: "to be in the Attic",
514: cf->file_path);
515:
516: if (cf->file_rcs->rf_dead == 0)
517: cvs_log(LP_ERR, "warning: expected %s "
518: "to be dead", cf->file_path);
519:
520: cvs_get_repository_path(cf->file_wd, repo,
1.153 deraadt 521: PATH_MAX);
522: (void)xsnprintf(rcsfile, PATH_MAX, "%s/%s%s",
1.143 tobias 523: repo, cf->file_name, RCS_FILE_EXT);
524:
525: if (rename(cf->file_rpath, rcsfile) == -1)
526: fatal("cvs_commit_local: failed to "
527: "move %s outside the Attic: %s",
528: cf->file_path, strerror(errno));
529:
1.154 nicm 530: free(cf->file_rpath);
1.143 tobias 531: cf->file_rpath = xstrdup(rcsfile);
532: isnew = 0;
533: }
1.66 joris 534:
535: rcsflags = RCS_READ | RCS_PARSE_FULLY;
536: openflags = O_RDONLY;
537: rcs_close(cf->file_rcs);
538: }
539:
540: cf->repo_fd = open(cf->file_rpath, openflags);
1.61 joris 541: if (cf->repo_fd < 0)
542: fatal("cvs_commit_local: %s", strerror(errno));
543:
544: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.103 otto 545: rcsflags, 0444);
1.61 joris 546: if (cf->file_rcs == NULL)
547: fatal("cvs_commit_local: failed to create RCS file "
548: "for %s", cf->file_path);
1.71 xsa 549:
550: commit_desc_set(cf);
1.143 tobias 551:
552: if (branchadded)
553: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.61 joris 554: }
1.36 joris 555:
1.77 reyk 556: if (verbosity > 1) {
557: cvs_printf("Checking in %s:\n", cf->file_path);
558: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
559: cvs_printf("old revision: %s; ", rbuf);
560: }
1.142 tobias 561:
562: if (isnew == 0 && cf->file_rcs->rf_head == NULL)
563: fatal("no head revision in RCS file for %s", cf->file_path);
1.7 jfb 564:
1.112 joris 565: if (isnew == 0 && onbranch == 0)
566: d = commit_diff(cf, cf->file_rcs->rf_head, 0);
1.7 jfb 567:
1.56 joris 568: if (cf->file_status == FILE_REMOVED) {
1.112 joris 569: b = rcs_rev_getbuf(cf->file_rcs, crev, 0);
570: } else if (onbranch == 1) {
571: b = commit_diff(cf, crev, 1);
1.61 joris 572: } else {
1.150 ray 573: b = buf_load_fd(cf->fd);
1.56 joris 574: }
1.7 jfb 575:
1.112 joris 576: if (isnew == 0 && onbranch == 0) {
577: if (rcs_deltatext_set(cf->file_rcs, crev, d) == -1)
1.61 joris 578: fatal("cvs_commit_local: failed to set delta");
579: }
1.3 krapht 580:
1.112 joris 581: if (rcs_rev_add(cf->file_rcs, nrev, logmsg, -1, NULL) == -1)
1.55 joris 582: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 583:
1.112 joris 584: if (nrev == RCS_HEAD_REV)
585: nrev = cf->file_rcs->rf_head;
586:
587: if (rcs_deltatext_set(cf->file_rcs, nrev, b) == -1)
1.55 joris 588: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 589:
1.56 joris 590: if (cf->file_status == FILE_REMOVED) {
1.112 joris 591: if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1)
1.56 joris 592: fatal("cvs_commit_local: failed to set state");
1.101 xsa 593: }
594:
595: if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {
1.126 tobias 596: int cf_kflag;
1.101 xsa 597:
1.126 tobias 598: cf_kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
599: rcs_kwexp_set(cf->file_rcs, cf_kflag);
1.56 joris 600: }
601:
1.55 joris 602: rcs_write(cf->file_rcs);
1.6 jfb 603:
1.56 joris 604: if (cf->file_status == FILE_REMOVED) {
1.77 reyk 605: strlcpy(nbuf, "Removed", sizeof(nbuf));
1.61 joris 606: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 607: if (cf->file_rcs->rf_dead == 1)
1.77 reyk 608: strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
1.63 joris 609: else
1.112 joris 610: rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56 joris 611: } else if (cf->file_status == FILE_MODIFIED) {
1.112 joris 612: rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56 joris 613: }
614:
1.77 reyk 615: if (verbosity > 1)
616: cvs_printf("new revision: %s\n", nbuf);
1.3 krapht 617:
1.55 joris 618: (void)unlink(cf->file_path);
619: (void)close(cf->fd);
620: cf->fd = -1;
1.56 joris 621:
622: if (cf->file_status != FILE_REMOVED) {
1.112 joris 623: cvs_checkout_file(cf, nrev, NULL, CO_COMMIT);
1.56 joris 624: } else {
625: entlist = cvs_ent_open(cf->file_wd);
626: cvs_ent_remove(entlist, cf->file_name);
1.64 joris 627:
1.153 deraadt 628: cvs_get_repository_path(cf->file_wd, repo, PATH_MAX);
1.64 joris 629:
1.153 deraadt 630: (void)xsnprintf(attic, PATH_MAX, "%s/%s",
1.102 xsa 631: repo, CVS_PATH_ATTIC);
1.64 joris 632:
633: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
634: fatal("cvs_commit_local: failed to create Attic");
635:
1.153 deraadt 636: (void)xsnprintf(attic, PATH_MAX, "%s/%s/%s%s", repo,
1.64 joris 637: CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
638:
639: if (rename(cf->file_rpath, attic) == -1)
640: fatal("cvs_commit_local: failed to move %s to Attic",
641: cf->file_path);
642:
1.85 joris 643: if (cvs_server_active == 1)
644: cvs_server_update_entry("Remove-entry", cf);
1.56 joris 645: }
1.3 krapht 646:
1.77 reyk 647: if (verbosity > 1)
648: cvs_printf("done\n");
649: else {
650: cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
651: cf->file_path, rbuf, nbuf);
1.137 joris 652: }
653:
654: if (line_list != NULL) {
655: fi = xcalloc(1, sizeof(*fi));
656: fi->file_path = xstrdup(cf->file_path);
657: fi->crevstr = xstrdup(rbuf);
658: fi->nrevstr = xstrdup(nbuf);
1.140 joris 659: if (tag != NULL)
660: fi->tag_new = xstrdup(tag);
1.137 joris 661: TAILQ_INSERT_TAIL(&files_info, fi, flist);
1.77 reyk 662: }
1.107 joris 663:
664: switch (cf->file_status) {
665: case FILE_MODIFIED:
666: histtype = CVS_HISTORY_COMMIT_MODIFIED;
667: break;
668: case FILE_ADDED:
669: histtype = CVS_HISTORY_COMMIT_ADDED;
670: break;
671: case FILE_REMOVED:
672: histtype = CVS_HISTORY_COMMIT_REMOVED;
673: break;
1.144 joris 674: default:
675: histtype = -1;
676: break;
1.107 joris 677: }
1.125 joris 678:
1.155 fcambus 679: free(crev);
1.107 joris 680:
1.144 joris 681: if (histtype != -1)
682: cvs_history_add(histtype, cf, NULL);
683: else
684: cvs_log(LP_NOTICE, "histtype was -1 for %s", cf->file_path);
1.39 xsa 685: }
686:
1.91 joris 687: static BUF *
1.112 joris 688: commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse)
1.39 xsa 689: {
1.151 nicm 690: int fd1, fd2, d;
691: char *p1, *p2;
1.122 tobias 692: BUF *b;
1.97 joris 693:
694: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
1.39 xsa 695:
1.63 joris 696: if (cf->file_status == FILE_MODIFIED ||
697: cf->file_status == FILE_ADDED) {
1.150 ray 698: b = buf_load_fd(cf->fd);
699: fd1 = buf_write_stmp(b, p1, NULL);
700: buf_free(b);
1.63 joris 701: } else {
1.131 joris 702: fd1 = rcs_rev_write_stmp(cf->file_rcs, rev, p1, 0);
1.56 joris 703: }
1.3 krapht 704:
1.97 joris 705: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
1.131 joris 706: fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
1.55 joris 707:
1.150 ray 708: b = buf_alloc(128);
1.55 joris 709:
710: diff_format = D_RCSDIFF;
1.112 joris 711:
1.151 nicm 712: if (reverse == 1)
713: d = diffreg(p2, p1, fd2, fd1, b, D_FORCEASCII);
714: else
715: d = diffreg(p1, p2, fd1, fd2, b, D_FORCEASCII);
716: if (d == D_ERROR)
1.112 joris 717: fatal("commit_diff: failed to get RCS patch");
1.131 joris 718:
719: close(fd1);
720: close(fd2);
1.96 joris 721:
1.154 nicm 722: free(p1);
723: free(p2);
1.55 joris 724:
1.122 tobias 725: return (b);
1.71 xsa 726: }
727:
728: static void
729: commit_desc_set(struct cvs_file *cf)
730: {
731: BUF *bp;
1.102 xsa 732: int fd;
1.153 deraadt 733: char desc_path[PATH_MAX], *desc;
1.71 xsa 734:
1.153 deraadt 735: (void)xsnprintf(desc_path, PATH_MAX, "%s/%s/%s%s",
1.134 tobias 736: cf->file_wd, CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
1.71 xsa 737:
1.100 otto 738: if ((fd = open(desc_path, O_RDONLY)) == -1)
1.71 xsa 739: return;
740:
1.150 ray 741: bp = buf_load_fd(fd);
742: buf_putc(bp, '\0');
743: desc = buf_release(bp);
1.71 xsa 744:
745: rcs_desc_set(cf->file_rcs, desc);
746:
1.76 joris 747: (void)close(fd);
1.71 xsa 748: (void)cvs_unlink(desc_path);
749:
1.154 nicm 750: free(desc);
1.1 jfb 751: }
![[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