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