Annotation of src/usr.bin/cvs/commit.c, Revision 1.123
1.123 ! tobias 1: /* $OpenBSD: commit.c,v 1.122 2008/01/28 21:32:00 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>
23: #include <string.h>
24: #include <unistd.h>
1.1 jfb 25:
26: #include "cvs.h"
1.55 joris 27: #include "diff.h"
1.80 joris 28: #include "remote.h"
1.1 jfb 29:
1.55 joris 30: void cvs_commit_local(struct cvs_file *);
1.86 joris 31: void cvs_commit_check_files(struct cvs_file *);
1.55 joris 32:
1.112 joris 33: static BUF *commit_diff(struct cvs_file *, RCSNUM *, int);
1.71 xsa 34: static void commit_desc_set(struct cvs_file *);
1.55 joris 35:
36: struct cvs_flisthead files_affected;
1.86 joris 37: struct cvs_flisthead files_added;
38: struct cvs_flisthead files_removed;
39: struct cvs_flisthead files_modified;
40:
1.55 joris 41: int conflicts_found;
1.86 joris 42: char *logmsg = NULL;
1.34 jfb 43:
44: struct cvs_cmd cvs_cmd_commit = {
1.74 joris 45: CVS_OP_COMMIT, 0, "commit",
1.55 joris 46: { "ci", "com" },
1.34 jfb 47: "Check files into the repository",
48: "[-flR] [-F logfile | -m msg] [-r rev] ...",
49: "F:flm:Rr:",
1.18 joris 50: NULL,
1.55 joris 51: cvs_commit
1.18 joris 52: };
1.1 jfb 53:
1.55 joris 54: int
55: cvs_commit(int argc, char **argv)
1.1 jfb 56: {
1.121 tobias 57: int ch, Fflag, mflag;
1.55 joris 58: char *arg = ".";
1.58 joris 59: int flags;
1.55 joris 60: struct cvs_recursion cr;
1.3 krapht 61:
1.58 joris 62: flags = CR_RECURSE_DIRS;
1.121 tobias 63: Fflag = mflag = 0;
1.58 joris 64:
1.55 joris 65: while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
1.1 jfb 66: switch (ch) {
67: case 'F':
1.121 tobias 68: /* free previously assigned value */
69: if (logmsg != NULL)
70: xfree(logmsg);
1.88 joris 71: logmsg = cvs_logmsg_read(optarg);
1.121 tobias 72: Fflag = 1;
1.1 jfb 73: break;
1.82 xsa 74: case 'f':
75: break;
1.1 jfb 76: case 'l':
1.58 joris 77: flags &= ~CR_RECURSE_DIRS;
1.1 jfb 78: break;
79: case 'm':
1.121 tobias 80: /* free previously assigned value */
81: if (logmsg != NULL)
82: xfree(logmsg);
1.55 joris 83: logmsg = xstrdup(optarg);
1.121 tobias 84: mflag = 1;
1.55 joris 85: break;
1.82 xsa 86: case 'R':
1.120 tobias 87: flags |= CR_RECURSE_DIRS;
1.82 xsa 88: break;
1.55 joris 89: case 'r':
1.1 jfb 90: break;
91: default:
1.55 joris 92: fatal("%s", cvs_cmd_commit.cmd_synopsis);
1.1 jfb 93: }
94: }
95:
1.55 joris 96: argc -= optind;
97: argv += optind;
1.121 tobias 98:
99: /* -F and -m are mutually exclusive */
100: if (Fflag && mflag)
101: fatal("cannot specify both a log file and a message");
1.1 jfb 102:
1.86 joris 103: TAILQ_INIT(&files_affected);
104: TAILQ_INIT(&files_added);
105: TAILQ_INIT(&files_removed);
106: TAILQ_INIT(&files_modified);
107: conflicts_found = 0;
108:
109: cr.enterdir = NULL;
110: cr.leavedir = NULL;
111: cr.fileproc = cvs_commit_check_files;
112: cr.flags = flags;
113:
114: if (argc > 0)
115: cvs_file_run(argc, argv, &cr);
116: else
117: cvs_file_run(1, &arg, &cr);
118:
119: if (conflicts_found != 0)
120: fatal("%d conflicts found, please correct these first",
121: conflicts_found);
1.92 joris 122:
123: if (TAILQ_EMPTY(&files_affected))
124: return (0);
1.86 joris 125:
126: if (logmsg == NULL && cvs_server_active == 0) {
127: logmsg = cvs_logmsg_create(&files_added, &files_removed,
128: &files_modified);
129: }
130:
1.55 joris 131: if (logmsg == NULL)
1.86 joris 132: fatal("This shouldnt happen, honestly!");
1.87 joris 133:
134: cvs_file_freelist(&files_modified);
135: cvs_file_freelist(&files_removed);
136: cvs_file_freelist(&files_added);
1.80 joris 137:
138: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.89 joris 139: cvs_client_connect_to_server();
1.80 joris 140: cr.fileproc = cvs_client_sendfile;
141:
142: if (argc > 0)
143: cvs_file_run(argc, argv, &cr);
144: else
145: cvs_file_run(1, &arg, &cr);
1.99 xsa 146:
147: if (!(flags & CR_RECURSE_DIRS))
148: cvs_client_send_request("Argument -l");
1.80 joris 149:
1.123 ! tobias 150: cvs_client_send_logmsg(logmsg);
1.80 joris 151: cvs_client_send_files(argv, argc);
152: cvs_client_senddir(".");
153: cvs_client_send_request("ci");
154: cvs_client_get_responses();
1.86 joris 155: } else {
156: cr.fileproc = cvs_commit_local;
157: cvs_file_walklist(&files_affected, &cr);
158: cvs_file_freelist(&files_affected);
1.80 joris 159: }
1.1 jfb 160:
1.123 ! tobias 161: xfree(logmsg);
1.18 joris 162: return (0);
163: }
1.1 jfb 164:
1.55 joris 165: void
1.86 joris 166: cvs_commit_check_files(struct cvs_file *cf)
1.18 joris 167: {
1.112 joris 168: char *tag;
169: RCSNUM *branch, *brev;
170: char rev[CVS_REV_BUFSZ];
171:
1.123 ! tobias 172: branch = brev = NULL;
! 173:
1.86 joris 174: cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path);
1.44 joris 175:
1.108 joris 176: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL)
177: cvs_remote_classify_file(cf);
178: else
1.110 joris 179: cvs_file_classify(cf, cvs_directory_tag);
1.59 joris 180:
181: if (cf->file_type == CVS_DIR) {
182: if (verbosity > 1)
183: cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
184: return;
185: }
1.32 joris 186:
1.55 joris 187: if (cf->file_status == FILE_CONFLICT ||
1.79 joris 188: cf->file_status == FILE_UNLINK) {
1.55 joris 189: conflicts_found++;
1.79 joris 190: return;
191: }
1.57 joris 192:
1.63 joris 193: if (cf->file_status != FILE_REMOVED &&
194: update_has_conflict_markers(cf)) {
1.60 joris 195: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
196: "merging, please fix these first", cf->file_path);
197: conflicts_found++;
1.79 joris 198: return;
1.60 joris 199: }
200:
1.57 joris 201: if (cf->file_status == FILE_MERGE ||
1.72 joris 202: cf->file_status == FILE_PATCH ||
1.79 joris 203: cf->file_status == FILE_CHECKOUT ||
204: cf->file_status == FILE_LOST) {
1.57 joris 205: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
206: cf->file_path);
207: conflicts_found++;
1.79 joris 208: return;
1.57 joris 209: }
1.55 joris 210:
1.112 joris 211: if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
212: tag = cvs_directory_tag;
213: if (cf->file_ent != NULL)
214: tag = cf->file_ent->ce_tag;
215:
216: if (tag != NULL && cf->file_rcs != NULL) {
217: brev = rcs_sym_getrev(cf->file_rcs, tag);
218: if (brev != NULL) {
219: if (RCSNUM_ISBRANCH(brev))
220: goto next;
221: }
222:
223: brev = rcs_translate_tag(tag, cf->file_rcs);
224:
225: if (brev == NULL) {
226: fatal("failed to resolve tag: %s",
227: cf->file_ent->ce_tag);
228: }
229:
230: rcsnum_tostr(brev, rev, sizeof(rev));
231: if ((branch = rcsnum_revtobr(brev)) == NULL) {
232: cvs_log(LP_ERR, "%s is not a branch revision",
233: rev);
234: conflicts_found++;
1.123 ! tobias 235: rcsnum_free(brev);
1.112 joris 236: return;
237: }
238:
239: if (!RCSNUM_ISBRANCHREV(brev)) {
240: cvs_log(LP_ERR, "%s is not a branch revision",
241: rev);
242: conflicts_found++;
1.123 ! tobias 243: rcsnum_free(branch);
! 244: rcsnum_free(brev);
1.112 joris 245: return;
246: }
247:
248: rcsnum_tostr(branch, rev, sizeof(rev));
249: if (!RCSNUM_ISBRANCH(branch)) {
250: cvs_log(LP_ERR, "%s (%s) is not a branch",
251: cf->file_ent->ce_tag, rev);
252: conflicts_found++;
1.123 ! tobias 253: rcsnum_free(branch);
! 254: rcsnum_free(brev);
1.112 joris 255: return;
256: }
257: }
258: }
259:
260: next:
1.123 ! tobias 261: if (branch != NULL)
! 262: rcsnum_free(branch);
! 263: if (brev != NULL)
! 264: rcsnum_free(brev);
! 265:
1.55 joris 266: if (cf->file_status == FILE_ADDED ||
267: cf->file_status == FILE_REMOVED ||
268: cf->file_status == FILE_MODIFIED)
1.110 joris 269: cvs_file_get(cf->file_path, 0, &files_affected);
1.86 joris 270:
271: switch (cf->file_status) {
272: case FILE_ADDED:
1.110 joris 273: cvs_file_get(cf->file_path, 0, &files_added);
1.86 joris 274: break;
275: case FILE_REMOVED:
1.110 joris 276: cvs_file_get(cf->file_path, 0, &files_removed);
1.86 joris 277: break;
278: case FILE_MODIFIED:
1.110 joris 279: cvs_file_get(cf->file_path, 0, &files_modified);
1.86 joris 280: break;
281: }
1.55 joris 282: }
1.1 jfb 283:
1.55 joris 284: void
285: cvs_commit_local(struct cvs_file *cf)
286: {
1.112 joris 287: char *tag;
1.91 joris 288: BUF *b, *d;
1.112 joris 289: int onbranch, isnew, histtype;
290: RCSNUM *nrev, *crev, *rrev, *brev;
1.102 xsa 291: int openflags, rcsflags;
1.119 tobias 292: char rbuf[CVS_REV_BUFSZ], nbuf[CVS_REV_BUFSZ];
1.56 joris 293: CVSENTRIES *entlist;
1.100 otto 294: char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN];
1.17 joris 295:
1.55 joris 296: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.110 joris 297: cvs_file_classify(cf, cvs_directory_tag);
1.69 joris 298:
299: if (cvs_noexec == 1)
300: return;
1.35 xsa 301:
1.64 joris 302: if (cf->file_type != CVS_FILE)
303: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
304:
1.107 joris 305: if (cf->file_status != FILE_MODIFIED &&
306: cf->file_status != FILE_ADDED &&
307: cf->file_status != FILE_REMOVED) {
308: cvs_log(LP_ERR, "skipping bogus file `%s'", cf->file_path);
309: return;
310: }
311:
1.112 joris 312: onbranch = 0;
313: nrev = RCS_HEAD_REV;
314: crev = NULL;
315: rrev = NULL;
316:
1.115 joris 317: if (cf->file_rcs != NULL && cf->file_rcs->rf_branch != NULL) {
1.114 joris 318: rcsnum_free(cf->file_rcs->rf_branch);
319: cf->file_rcs->rf_branch = NULL;
320: }
321:
1.56 joris 322: if (cf->file_status == FILE_MODIFIED ||
1.66 joris 323: cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
1.93 joris 324: && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) {
1.112 joris 325: rrev = rcs_head_get(cf->file_rcs);
326: crev = rcs_head_get(cf->file_rcs);
1.116 tobias 327: if (crev == NULL || rrev == NULL)
328: fatal("RCS head empty or missing in %s\n",
329: cf->file_rcs->rf_path);
1.112 joris 330:
331: tag = cvs_directory_tag;
332: if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
333: tag = cf->file_ent->ce_tag;
334:
335: if (tag != NULL) {
336: rcsnum_free(crev);
337: crev = rcs_translate_tag(tag, cf->file_rcs);
338: if (crev == NULL) {
339: fatal("failed to resolve existing tag: %s",
340: tag);
341: }
342:
343: if (RCSNUM_ISBRANCHREV(crev)) {
344: nrev = rcsnum_alloc();
345: rcsnum_cpy(crev, nrev, 0);
346: rcsnum_inc(nrev);
347: } else if (!RCSNUM_ISBRANCH(crev)) {
348: brev = rcs_sym_getrev(cf->file_rcs, tag);
349: if (brev == NULL)
350: fatal("no more tag?");
351: nrev = rcsnum_brtorev(brev);
352: if (nrev == NULL)
353: fatal("failed to create branch rev");
1.123 ! tobias 354: rcsnum_free(brev);
1.112 joris 355: } else {
356: fatal("this isnt suppose to happen, honestly");
357: }
358:
359: rcsnum_free(rrev);
360: rrev = rcsnum_branch_root(nrev);
361:
362: /* branch stuff was checked in cvs_commit_check_files */
363: onbranch = 1;
364: }
365:
366: rcsnum_tostr(crev, rbuf, sizeof(rbuf));
1.93 joris 367: } else {
1.61 joris 368: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.93 joris 369: }
1.61 joris 370:
1.123 ! tobias 371: if (rrev != NULL)
! 372: rcsnum_free(rrev);
1.67 joris 373: isnew = 0;
1.66 joris 374: if (cf->file_status == FILE_ADDED) {
1.67 joris 375: isnew = 1;
1.66 joris 376: rcsflags = RCS_CREATE;
377: openflags = O_CREAT | O_TRUNC | O_WRONLY;
378: if (cf->file_rcs != NULL) {
1.106 niallo 379: if (cf->in_attic == 0)
1.66 joris 380: cvs_log(LP_ERR, "warning: expected %s "
381: "to be in the Attic", cf->file_path);
382:
383: if (cf->file_rcs->rf_dead == 0)
384: cvs_log(LP_ERR, "warning: expected %s "
385: "to be dead", cf->file_path);
386:
387: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
1.102 xsa 388: (void)xsnprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
1.66 joris 389: repo, cf->file_name, RCS_FILE_EXT);
390:
391: if (rename(cf->file_rpath, rcsfile) == -1)
392: fatal("cvs_commit_local: failed to move %s "
393: "outside the Attic: %s", cf->file_path,
394: strerror(errno));
395:
396: xfree(cf->file_rpath);
397: cf->file_rpath = xstrdup(rcsfile);
398:
399: rcsflags = RCS_READ | RCS_PARSE_FULLY;
400: openflags = O_RDONLY;
401: rcs_close(cf->file_rcs);
1.67 joris 402: isnew = 0;
1.66 joris 403: }
404:
405: cf->repo_fd = open(cf->file_rpath, openflags);
1.61 joris 406: if (cf->repo_fd < 0)
407: fatal("cvs_commit_local: %s", strerror(errno));
408:
409: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.103 otto 410: rcsflags, 0444);
1.61 joris 411: if (cf->file_rcs == NULL)
412: fatal("cvs_commit_local: failed to create RCS file "
413: "for %s", cf->file_path);
1.71 xsa 414:
415: commit_desc_set(cf);
1.61 joris 416: }
1.36 joris 417:
1.77 reyk 418: if (verbosity > 1) {
419: cvs_printf("Checking in %s:\n", cf->file_path);
420: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
421: cvs_printf("old revision: %s; ", rbuf);
422: }
1.7 jfb 423:
1.112 joris 424: if (isnew == 0 && onbranch == 0)
425: d = commit_diff(cf, cf->file_rcs->rf_head, 0);
1.7 jfb 426:
1.56 joris 427: if (cf->file_status == FILE_REMOVED) {
1.112 joris 428: b = rcs_rev_getbuf(cf->file_rcs, crev, 0);
1.56 joris 429: if (b == NULL)
1.112 joris 430: fatal("cvs_commit_local: failed to get crev");
431: } else if (onbranch == 1) {
432: b = commit_diff(cf, crev, 1);
1.61 joris 433: } else {
1.73 joris 434: if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 435: fatal("cvs_commit_local: failed to load file");
436: }
1.7 jfb 437:
1.112 joris 438: if (isnew == 0 && onbranch == 0) {
439: if (rcs_deltatext_set(cf->file_rcs, crev, d) == -1)
1.61 joris 440: fatal("cvs_commit_local: failed to set delta");
441: }
1.3 krapht 442:
1.112 joris 443: if (rcs_rev_add(cf->file_rcs, nrev, logmsg, -1, NULL) == -1)
1.55 joris 444: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 445:
1.112 joris 446: if (nrev == RCS_HEAD_REV)
447: nrev = cf->file_rcs->rf_head;
448:
449: if (rcs_deltatext_set(cf->file_rcs, nrev, b) == -1)
1.55 joris 450: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 451:
1.56 joris 452: if (cf->file_status == FILE_REMOVED) {
1.112 joris 453: if (rcs_state_set(cf->file_rcs, nrev, RCS_STATE_DEAD) == -1)
1.56 joris 454: fatal("cvs_commit_local: failed to set state");
1.101 xsa 455: }
456:
457: if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {
458: int kflag;
459:
460: kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
461: rcs_kwexp_set(cf->file_rcs, kflag);
1.56 joris 462: }
463:
1.55 joris 464: rcs_write(cf->file_rcs);
1.6 jfb 465:
1.56 joris 466: if (cf->file_status == FILE_REMOVED) {
1.77 reyk 467: strlcpy(nbuf, "Removed", sizeof(nbuf));
1.61 joris 468: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 469: if (cf->file_rcs->rf_dead == 1)
1.77 reyk 470: strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
1.63 joris 471: else
1.112 joris 472: rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56 joris 473: } else if (cf->file_status == FILE_MODIFIED) {
1.112 joris 474: rcsnum_tostr(nrev, nbuf, sizeof(nbuf));
1.56 joris 475: }
476:
1.77 reyk 477: if (verbosity > 1)
478: cvs_printf("new revision: %s\n", nbuf);
1.3 krapht 479:
1.55 joris 480: (void)unlink(cf->file_path);
481: (void)close(cf->fd);
482: cf->fd = -1;
1.56 joris 483:
484: if (cf->file_status != FILE_REMOVED) {
1.112 joris 485: cvs_checkout_file(cf, nrev, NULL, CO_COMMIT);
1.56 joris 486: } else {
487: entlist = cvs_ent_open(cf->file_wd);
488: cvs_ent_remove(entlist, cf->file_name);
489: cvs_ent_close(entlist, ENT_SYNC);
1.64 joris 490:
491: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
492:
1.102 xsa 493: (void)xsnprintf(attic, MAXPATHLEN, "%s/%s",
494: repo, CVS_PATH_ATTIC);
1.64 joris 495:
496: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
497: fatal("cvs_commit_local: failed to create Attic");
498:
1.102 xsa 499: (void)xsnprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
1.64 joris 500: CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
501:
502: if (rename(cf->file_rpath, attic) == -1)
503: fatal("cvs_commit_local: failed to move %s to Attic",
504: cf->file_path);
505:
1.85 joris 506: if (cvs_server_active == 1)
507: cvs_server_update_entry("Remove-entry", cf);
1.56 joris 508: }
1.3 krapht 509:
1.77 reyk 510: if (verbosity > 1)
511: cvs_printf("done\n");
512: else {
513: cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
514: cf->file_path, rbuf, nbuf);
515: }
1.107 joris 516:
517: switch (cf->file_status) {
518: case FILE_MODIFIED:
519: histtype = CVS_HISTORY_COMMIT_MODIFIED;
520: break;
521: case FILE_ADDED:
522: histtype = CVS_HISTORY_COMMIT_ADDED;
523: break;
524: case FILE_REMOVED:
525: histtype = CVS_HISTORY_COMMIT_REMOVED;
526: break;
527: }
528:
529: cvs_history_add(histtype, cf, NULL);
1.39 xsa 530: }
531:
1.91 joris 532: static BUF *
1.112 joris 533: commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse)
1.39 xsa 534: {
1.112 joris 535: char *p1, *p2, *p;
1.122 tobias 536: BUF *b;
1.97 joris 537:
538: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
1.39 xsa 539:
1.63 joris 540: if (cf->file_status == FILE_MODIFIED ||
541: cf->file_status == FILE_ADDED) {
1.122 tobias 542: if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.118 tobias 543: fatal("commit_diff: failed to load '%s'",
1.56 joris 544: cf->file_path);
1.122 tobias 545: cvs_buf_write_stmp(b, p1, NULL);
546: cvs_buf_free(b);
1.63 joris 547: } else {
1.112 joris 548: rcs_rev_write_stmp(cf->file_rcs, rev, p1, 0);
1.56 joris 549: }
1.3 krapht 550:
1.97 joris 551: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
1.117 tobias 552: rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
1.55 joris 553:
1.122 tobias 554: if ((b = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
1.112 joris 555: fatal("commit_diff: failed to create diff buf");
1.55 joris 556:
557: diff_format = D_RCSDIFF;
1.112 joris 558:
559: if (reverse == 1) {
560: p = p1;
561: p1 = p2;
562: p2 = p;
563: }
564:
1.122 tobias 565: if (cvs_diffreg(p1, p2, b) == D_ERROR)
1.112 joris 566: fatal("commit_diff: failed to get RCS patch");
1.96 joris 567:
568: xfree(p1);
569: xfree(p2);
1.55 joris 570:
1.122 tobias 571: return (b);
1.71 xsa 572: }
573:
574: static void
575: commit_desc_set(struct cvs_file *cf)
576: {
577: BUF *bp;
1.102 xsa 578: int fd;
1.100 otto 579: char desc_path[MAXPATHLEN], *desc;
1.71 xsa 580:
1.102 xsa 581: (void)xsnprintf(desc_path, MAXPATHLEN, "%s/%s%s",
1.71 xsa 582: CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
583:
1.100 otto 584: if ((fd = open(desc_path, O_RDONLY)) == -1)
1.71 xsa 585: return;
586:
1.78 joris 587: bp = cvs_buf_load_fd(fd, BUF_AUTOEXT);
1.71 xsa 588: cvs_buf_putc(bp, '\0');
589: desc = cvs_buf_release(bp);
590:
591: rcs_desc_set(cf->file_rcs, desc);
592:
1.76 joris 593: (void)close(fd);
1.71 xsa 594: (void)cvs_unlink(desc_path);
595:
596: xfree(desc);
1.1 jfb 597: }
![[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