Annotation of src/usr.bin/cvs/commit.c, Revision 1.141
1.141 ! joris 1: /* $OpenBSD: commit.c,v 1.140 2008/06/10 19:00:17 joris 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) {
369: fatal("failed to resolve tag: %s",
370: cf->file_ent->ce_tag);
371: }
372:
373: if ((branch = rcsnum_revtobr(brev)) == NULL) {
1.136 tobias 374: cvs_log(LP_ERR, "sticky tag %s is not "
375: "a branch for file %s", tag,
376: cf->file_path);
1.112 joris 377: conflicts_found++;
1.123 tobias 378: rcsnum_free(brev);
1.112 joris 379: return;
380: }
381:
382: if (!RCSNUM_ISBRANCHREV(brev)) {
1.136 tobias 383: cvs_log(LP_ERR, "sticky tag %s is not "
384: "a branch for file %s", tag,
385: cf->file_path);
1.112 joris 386: conflicts_found++;
1.123 tobias 387: rcsnum_free(branch);
388: rcsnum_free(brev);
1.112 joris 389: return;
390: }
391:
392: if (!RCSNUM_ISBRANCH(branch)) {
1.136 tobias 393: cvs_log(LP_ERR, "sticky tag %s is not "
394: "a branch for file %s", tag,
395: cf->file_path);
1.112 joris 396: conflicts_found++;
1.123 tobias 397: rcsnum_free(branch);
398: rcsnum_free(brev);
1.112 joris 399: return;
400: }
401: }
402: }
403:
404: next:
1.123 tobias 405: if (branch != NULL)
406: rcsnum_free(branch);
407: if (brev != NULL)
408: rcsnum_free(brev);
409:
1.135 tobias 410: if (cf->file_status != FILE_ADDED &&
411: cf->file_status != FILE_REMOVED &&
412: cf->file_status != FILE_MODIFIED)
413: return;
1.86 joris 414:
1.139 joris 415: cvs_file_get(cf->file_path, 0, &files_affected);
1.135 tobias 416:
1.86 joris 417: switch (cf->file_status) {
418: case FILE_ADDED:
1.139 joris 419: cvs_file_get(cf->file_path, 0, &files_added);
1.86 joris 420: break;
421: case FILE_REMOVED:
1.139 joris 422: cvs_file_get(cf->file_path, 0, &files_removed);
1.86 joris 423: break;
424: case FILE_MODIFIED:
1.139 joris 425: cvs_file_get(cf->file_path, 0, &files_modified);
1.86 joris 426: break;
427: }
1.55 joris 428: }
1.1 jfb 429:
1.55 joris 430: void
431: cvs_commit_local(struct cvs_file *cf)
432: {
1.112 joris 433: char *tag;
1.91 joris 434: BUF *b, *d;
1.112 joris 435: int onbranch, isnew, histtype;
436: RCSNUM *nrev, *crev, *rrev, *brev;
1.102 xsa 437: int openflags, rcsflags;
1.119 tobias 438: char rbuf[CVS_REV_BUFSZ], nbuf[CVS_REV_BUFSZ];
1.56 joris 439: CVSENTRIES *entlist;
1.100 otto 440: char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN];
1.137 joris 441: struct file_info *fi;
1.17 joris 442:
1.55 joris 443: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.110 joris 444: cvs_file_classify(cf, cvs_directory_tag);
1.69 joris 445:
446: if (cvs_noexec == 1)
447: return;
1.35 xsa 448:
1.64 joris 449: if (cf->file_type != CVS_FILE)
450: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
451:
1.107 joris 452: if (cf->file_status != FILE_MODIFIED &&
453: cf->file_status != FILE_ADDED &&
454: cf->file_status != FILE_REMOVED) {
455: cvs_log(LP_ERR, "skipping bogus file `%s'", cf->file_path);
456: return;
457: }
458:
1.112 joris 459: onbranch = 0;
460: nrev = RCS_HEAD_REV;
461: crev = NULL;
462: rrev = NULL;
463:
1.115 joris 464: if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) {
1.114 joris 465: rcsnum_free(cf->file_rcs->rf_branch);
466: cf->file_rcs->rf_branch = NULL;
467: }
468:
1.56 joris 469: if (cf->file_status == FILE_MODIFIED ||
1.66 joris 470: cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
1.93 joris 471: && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) {
1.112 joris 472: rrev = rcs_head_get(cf->file_rcs);
473: crev = rcs_head_get(cf->file_rcs);
1.116 tobias 474: if (crev == NULL || rrev == NULL)
475: fatal("RCS head empty or missing in %s\n",
476: cf->file_rcs->rf_path);
1.112 joris 477:
478: tag = cvs_directory_tag;
479: if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
480: tag = cf->file_ent->ce_tag;
481:
482: if (tag != NULL) {
483: rcsnum_free(crev);
1.133 tobias 484: rcsnum_free(rrev);
485: brev = rcs_sym_getrev(cf->file_rcs, tag);
1.112 joris 486: crev = rcs_translate_tag(tag, cf->file_rcs);
1.133 tobias 487: if (brev == NULL || crev == NULL) {
1.112 joris 488: fatal("failed to resolve existing tag: %s",
489: tag);
490: }
491:
1.133 tobias 492: rrev = rcsnum_alloc();
493: rcsnum_cpy(brev, rrev, brev->rn_len - 1);
494:
495: if (RCSNUM_ISBRANCHREV(crev) &&
496: rcsnum_cmp(crev, rrev, 0)) {
1.112 joris 497: nrev = rcsnum_alloc();
498: rcsnum_cpy(crev, nrev, 0);
499: rcsnum_inc(nrev);
500: } else if (!RCSNUM_ISBRANCH(crev)) {
501: nrev = rcsnum_brtorev(brev);
502: if (nrev == NULL)
503: fatal("failed to create branch rev");
504: } else {
505: fatal("this isnt suppose to happen, honestly");
506: }
507:
1.133 tobias 508: rcsnum_free(brev);
1.112 joris 509: rcsnum_free(rrev);
510: rrev = rcsnum_branch_root(nrev);
511:
512: /* branch stuff was checked in cvs_commit_check_files */
513: onbranch = 1;
514: }
515:
516: rcsnum_tostr(crev, rbuf, sizeof(rbuf));
1.93 joris 517: } else {
1.61 joris 518: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.93 joris 519: }
1.61 joris 520:
1.123 tobias 521: if (rrev != NULL)
522: rcsnum_free(rrev);
1.67 joris 523: isnew = 0;
1.66 joris 524: if (cf->file_status == FILE_ADDED) {
1.67 joris 525: isnew = 1;
1.66 joris 526: rcsflags = RCS_CREATE;
527: openflags = O_CREAT | O_TRUNC | O_WRONLY;
528: if (cf->file_rcs != NULL) {
1.106 niallo 529: if (cf->in_attic == 0)
1.66 joris 530: cvs_log(LP_ERR, "warning: expected %s "
531: "to be in the Attic", cf->file_path);
532:
533: if (cf->file_rcs->rf_dead == 0)
534: cvs_log(LP_ERR, "warning: expected %s "
535: "to be dead", cf->file_path);
536:
537: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
1.102 xsa 538: (void)xsnprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
1.66 joris 539: repo, cf->file_name, RCS_FILE_EXT);
540:
541: if (rename(cf->file_rpath, rcsfile) == -1)
542: fatal("cvs_commit_local: failed to move %s "
543: "outside the Attic: %s", cf->file_path,
544: strerror(errno));
545:
546: xfree(cf->file_rpath);
547: cf->file_rpath = xstrdup(rcsfile);
548:
549: rcsflags = RCS_READ | RCS_PARSE_FULLY;
550: openflags = O_RDONLY;
551: rcs_close(cf->file_rcs);
1.67 joris 552: isnew = 0;
1.66 joris 553: }
554:
555: cf->repo_fd = open(cf->file_rpath, openflags);
1.61 joris 556: if (cf->repo_fd < 0)
557: fatal("cvs_commit_local: %s", strerror(errno));
558:
559: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.103 otto 560: rcsflags, 0444);
1.61 joris 561: if (cf->file_rcs == NULL)
562: fatal("cvs_commit_local: failed to create RCS file "
563: "for %s", cf->file_path);
1.71 xsa 564:
565: commit_desc_set(cf);
1.61 joris 566: }
1.36 joris 567:
1.77 reyk 568: if (verbosity > 1) {
569: cvs_printf("Checking in %s:\n", cf->file_path);
570: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
571: cvs_printf("old revision: %s; ", rbuf);
572: }
1.7 jfb 573:
1.112 joris 574: if (isnew == 0 && onbranch == 0)
575: d = commit_diff(cf, cf->file_rcs->rf_head, 0);
1.7 jfb 576:
1.56 joris 577: if (cf->file_status == FILE_REMOVED) {
1.112 joris 578: b = rcs_rev_getbuf(cf->file_rcs, crev, 0);
579: } else if (onbranch == 1) {
580: b = commit_diff(cf, crev, 1);
1.61 joris 581: } else {
1.129 tobias 582: b = cvs_buf_load_fd(cf->fd);
1.56 joris 583: }
1.7 jfb 584:
1.112 joris 585: if (isnew == 0 && onbranch == 0) {
586: if (rcs_deltatext_set(cf->file_rcs, crev, d) == -1)
1.61 joris 587: fatal("cvs_commit_local: failed to set delta");
588: }
1.3 krapht 589:
1.112 joris 590: if (rcs_rev_add(cf->file_rcs, nrev, logmsg, -1, NULL) == -1)
1.55 joris 591: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 592:
1.112 joris 593: if (nrev == RCS_HEAD_REV)
594: nrev = cf->file_rcs->rf_head;
595:
596: if (rcs_deltatext_set(cf->file_rcs, nrev, b) == -1)
1.55 joris 597: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 598:
1.56 joris 599: if (cf->file_status == FILE_REMOVED) {
1.112 joris 600: if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1)
1.56 joris 601: fatal("cvs_commit_local: failed to set state");
1.101 xsa 602: }
603:
604: if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {
1.126 tobias 605: int cf_kflag;
1.101 xsa 606:
1.126 tobias 607: cf_kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
608: rcs_kwexp_set(cf->file_rcs, cf_kflag);
1.56 joris 609: }
610:
1.55 joris 611: rcs_write(cf->file_rcs);
1.6 jfb 612:
1.56 joris 613: if (cf->file_status == FILE_REMOVED) {
1.77 reyk 614: strlcpy(nbuf, "Removed", sizeof(nbuf));
1.61 joris 615: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 616: if (cf->file_rcs->rf_dead == 1)
1.77 reyk 617: strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
1.63 joris 618: else
1.112 joris 619: rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56 joris 620: } else if (cf->file_status == FILE_MODIFIED) {
1.112 joris 621: rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56 joris 622: }
623:
1.77 reyk 624: if (verbosity > 1)
625: cvs_printf("new revision: %s\n", nbuf);
1.3 krapht 626:
1.55 joris 627: (void)unlink(cf->file_path);
628: (void)close(cf->fd);
629: cf->fd = -1;
1.56 joris 630:
631: if (cf->file_status != FILE_REMOVED) {
1.112 joris 632: cvs_checkout_file(cf, nrev, NULL, CO_COMMIT);
1.56 joris 633: } else {
634: entlist = cvs_ent_open(cf->file_wd);
635: cvs_ent_remove(entlist, cf->file_name);
1.64 joris 636:
637: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
638:
1.102 xsa 639: (void)xsnprintf(attic, MAXPATHLEN, "%s/%s",
640: repo, CVS_PATH_ATTIC);
1.64 joris 641:
642: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
643: fatal("cvs_commit_local: failed to create Attic");
644:
1.102 xsa 645: (void)xsnprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
1.64 joris 646: CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
647:
648: if (rename(cf->file_rpath, attic) == -1)
649: fatal("cvs_commit_local: failed to move %s to Attic",
650: cf->file_path);
651:
1.85 joris 652: if (cvs_server_active == 1)
653: cvs_server_update_entry("Remove-entry", cf);
1.56 joris 654: }
1.3 krapht 655:
1.77 reyk 656: if (verbosity > 1)
657: cvs_printf("done\n");
658: else {
659: cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
660: cf->file_path, rbuf, nbuf);
1.137 joris 661: }
662:
663: if (line_list != NULL) {
664: fi = xcalloc(1, sizeof(*fi));
665: fi->file_path = xstrdup(cf->file_path);
666: fi->crevstr = xstrdup(rbuf);
667: fi->nrevstr = xstrdup(nbuf);
1.140 joris 668: if (tag != NULL)
669: fi->tag_new = xstrdup(tag);
1.137 joris 670: TAILQ_INSERT_TAIL(&files_info, fi, flist);
1.77 reyk 671: }
1.107 joris 672:
673: switch (cf->file_status) {
674: case FILE_MODIFIED:
675: histtype = CVS_HISTORY_COMMIT_MODIFIED;
676: break;
677: case FILE_ADDED:
678: histtype = CVS_HISTORY_COMMIT_ADDED;
679: break;
680: case FILE_REMOVED:
681: histtype = CVS_HISTORY_COMMIT_REMOVED;
682: break;
683: }
1.125 joris 684:
685: if (crev != NULL)
686: rcsnum_free(crev);
1.107 joris 687:
688: cvs_history_add(histtype, cf, NULL);
1.39 xsa 689: }
690:
1.91 joris 691: static BUF *
1.112 joris 692: commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse)
1.39 xsa 693: {
1.131 joris 694: int fd1, fd2, f;
1.112 joris 695: char *p1, *p2, *p;
1.122 tobias 696: BUF *b;
1.97 joris 697:
698: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
1.39 xsa 699:
1.63 joris 700: if (cf->file_status == FILE_MODIFIED ||
701: cf->file_status == FILE_ADDED) {
1.129 tobias 702: b = cvs_buf_load_fd(cf->fd);
1.131 joris 703: fd1 = cvs_buf_write_stmp(b, p1, NULL);
1.122 tobias 704: cvs_buf_free(b);
1.63 joris 705: } else {
1.131 joris 706: fd1 = rcs_rev_write_stmp(cf->file_rcs, rev, p1, 0);
1.56 joris 707: }
1.3 krapht 708:
1.97 joris 709: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
1.131 joris 710: fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
1.55 joris 711:
1.129 tobias 712: b = cvs_buf_alloc(128);
1.55 joris 713:
714: diff_format = D_RCSDIFF;
1.112 joris 715:
716: if (reverse == 1) {
717: p = p1;
718: p1 = p2;
719: p2 = p;
1.131 joris 720:
721: f = fd1;
722: fd1 = fd2;
723: fd2 = f;
1.112 joris 724: }
725:
1.131 joris 726: if (cvs_diffreg(p1, p2, fd1, fd2, b) == D_ERROR)
1.112 joris 727: fatal("commit_diff: failed to get RCS patch");
1.131 joris 728:
729: close(fd1);
730: close(fd2);
1.96 joris 731:
732: xfree(p1);
733: xfree(p2);
1.55 joris 734:
1.122 tobias 735: return (b);
1.71 xsa 736: }
737:
738: static void
739: commit_desc_set(struct cvs_file *cf)
740: {
741: BUF *bp;
1.102 xsa 742: int fd;
1.100 otto 743: char desc_path[MAXPATHLEN], *desc;
1.71 xsa 744:
1.134 tobias 745: (void)xsnprintf(desc_path, MAXPATHLEN, "%s/%s/%s%s",
746: cf->file_wd, CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
1.71 xsa 747:
1.100 otto 748: if ((fd = open(desc_path, O_RDONLY)) == -1)
1.71 xsa 749: return;
750:
1.129 tobias 751: bp = cvs_buf_load_fd(fd);
1.71 xsa 752: cvs_buf_putc(bp, '\0');
753: desc = cvs_buf_release(bp);
754:
755: rcs_desc_set(cf->file_rcs, desc);
756:
1.76 joris 757: (void)close(fd);
1.71 xsa 758: (void)cvs_unlink(desc_path);
759:
760: xfree(desc);
1.1 jfb 761: }
![[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