Annotation of src/usr.bin/cvs/commit.c, Revision 1.80
1.80 ! joris 1: /* $OpenBSD: commit.c,v 1.79 2006/07/02 21:01:48 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.51 xsa 19: #include "includes.h"
1.1 jfb 20:
21: #include "cvs.h"
1.55 joris 22: #include "diff.h"
1.1 jfb 23: #include "log.h"
1.80 ! joris 24: #include "remote.h"
1.1 jfb 25:
1.55 joris 26: void cvs_commit_local(struct cvs_file *);
27: void cvs_commit_check_conflicts(struct cvs_file *);
28:
29: static char *commit_diff_file(struct cvs_file *);
1.71 xsa 30: static void commit_desc_set(struct cvs_file *);
1.55 joris 31:
32: struct cvs_flisthead files_affected;
33: int conflicts_found;
34: char *logmsg;
1.34 jfb 35:
36: struct cvs_cmd cvs_cmd_commit = {
1.74 joris 37: CVS_OP_COMMIT, 0, "commit",
1.55 joris 38: { "ci", "com" },
1.34 jfb 39: "Check files into the repository",
40: "[-flR] [-F logfile | -m msg] [-r rev] ...",
41: "F:flm:Rr:",
1.18 joris 42: NULL,
1.55 joris 43: cvs_commit
1.18 joris 44: };
1.1 jfb 45:
1.55 joris 46: int
47: cvs_commit(int argc, char **argv)
1.1 jfb 48: {
1.18 joris 49: int ch;
1.70 joris 50: BUF *bp;
1.55 joris 51: char *arg = ".";
1.58 joris 52: int flags;
1.55 joris 53: struct cvs_recursion cr;
1.3 krapht 54:
1.58 joris 55: flags = CR_RECURSE_DIRS;
56:
1.55 joris 57: while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
1.1 jfb 58: switch (ch) {
1.55 joris 59: case 'f':
60: break;
1.1 jfb 61: case 'F':
1.70 joris 62: bp = cvs_buf_load(optarg, BUF_AUTOEXT);
63: if (bp == NULL)
64: fatal("failed to load commit message %s",
65: optarg);
66: cvs_buf_putc(bp, '\0');
67: logmsg = cvs_buf_release(bp);
1.1 jfb 68: break;
69: case 'l':
1.58 joris 70: flags &= ~CR_RECURSE_DIRS;
1.1 jfb 71: break;
72: case 'm':
1.55 joris 73: logmsg = xstrdup(optarg);
74: break;
75: case 'r':
1.1 jfb 76: break;
77: case 'R':
1.35 xsa 78: break;
1.1 jfb 79: default:
1.55 joris 80: fatal("%s", cvs_cmd_commit.cmd_synopsis);
1.1 jfb 81: }
82: }
83:
1.55 joris 84: argc -= optind;
85: argv += optind;
1.1 jfb 86:
1.55 joris 87: if (logmsg == NULL)
1.72 joris 88: fatal("please use -m or -F to specify a log message for now");
1.80 ! joris 89:
! 90: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
! 91: cr.enterdir = NULL;
! 92: cr.leavedir = NULL;
! 93: cr.fileproc = cvs_client_sendfile;
! 94: cr.flags = flags;
! 95:
! 96: if (argc > 0)
! 97: cvs_file_run(argc, argv, &cr);
! 98: else
! 99: cvs_file_run(1, &arg, &cr);
! 100:
! 101: cvs_client_send_request("Argument -m%s", logmsg);
! 102:
! 103: cvs_client_send_files(argv, argc);
! 104: cvs_client_senddir(".");
! 105: cvs_client_send_request("ci");
! 106: cvs_client_get_responses();
! 107: return (0);
! 108: }
1.1 jfb 109:
1.55 joris 110: TAILQ_INIT(&files_affected);
111: conflicts_found = 0;
1.32 joris 112:
1.55 joris 113: cr.enterdir = NULL;
114: cr.leavedir = NULL;
1.75 joris 115: cr.fileproc = cvs_commit_check_conflicts;
1.58 joris 116: cr.flags = flags;
1.55 joris 117:
118: if (argc > 0)
119: cvs_file_run(argc, argv, &cr);
120: else
121: cvs_file_run(1, &arg, &cr);
122:
123: if (conflicts_found != 0)
124: fatal("%d conflicts found, please correct these first",
125: conflicts_found);
126:
1.75 joris 127: cr.fileproc = cvs_commit_local;
1.55 joris 128: cvs_file_walklist(&files_affected, &cr);
129: cvs_file_freelist(&files_affected);
1.32 joris 130:
1.18 joris 131: return (0);
132: }
1.1 jfb 133:
1.55 joris 134: void
135: cvs_commit_check_conflicts(struct cvs_file *cf)
1.18 joris 136: {
1.55 joris 137: cvs_log(LP_TRACE, "cvs_commit_check_conflicts(%s)", cf->file_path);
1.44 joris 138:
1.43 joris 139: /*
1.55 joris 140: * cvs_file_classify makes the noise for us
141: * XXX - we want that?
1.43 joris 142: */
1.65 joris 143: cvs_file_classify(cf, NULL, 1);
1.59 joris 144:
145: if (cf->file_type == CVS_DIR) {
146: if (verbosity > 1)
147: cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
148: return;
149: }
1.32 joris 150:
1.55 joris 151: if (cf->file_status == FILE_CONFLICT ||
1.79 joris 152: cf->file_status == FILE_UNLINK) {
1.55 joris 153: conflicts_found++;
1.79 joris 154: return;
155: }
1.57 joris 156:
1.63 joris 157: if (cf->file_status != FILE_REMOVED &&
158: update_has_conflict_markers(cf)) {
1.60 joris 159: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
160: "merging, please fix these first", cf->file_path);
161: conflicts_found++;
1.79 joris 162: return;
1.60 joris 163: }
164:
1.57 joris 165: if (cf->file_status == FILE_MERGE ||
1.72 joris 166: cf->file_status == FILE_PATCH ||
1.79 joris 167: cf->file_status == FILE_CHECKOUT ||
168: cf->file_status == FILE_LOST) {
1.57 joris 169: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
170: cf->file_path);
171: conflicts_found++;
1.79 joris 172: return;
1.57 joris 173: }
1.55 joris 174:
175: if (cf->file_status == FILE_ADDED ||
176: cf->file_status == FILE_REMOVED ||
177: cf->file_status == FILE_MODIFIED)
178: cvs_file_get(cf->file_path, &files_affected);
179: }
1.1 jfb 180:
1.55 joris 181: void
182: cvs_commit_local(struct cvs_file *cf)
183: {
184: BUF *b;
1.67 joris 185: int isnew;
1.66 joris 186: int l, openflags, rcsflags;
1.77 reyk 187: char *d, *f, rbuf[24], nbuf[24];
1.56 joris 188: CVSENTRIES *entlist;
1.66 joris 189: char *attic, *repo, *rcsfile;
1.17 joris 190:
1.55 joris 191: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.65 joris 192: cvs_file_classify(cf, NULL, 0);
1.69 joris 193:
194: if (cvs_noexec == 1)
195: return;
1.35 xsa 196:
1.64 joris 197: if (cf->file_type != CVS_FILE)
198: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
199:
1.56 joris 200: if (cf->file_status == FILE_MODIFIED ||
1.66 joris 201: cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
202: && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1))
1.68 joris 203: rcsnum_tostr(rcs_head_get(cf->file_rcs), rbuf, sizeof(rbuf));
1.61 joris 204: else
205: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
206:
1.67 joris 207: isnew = 0;
1.66 joris 208: if (cf->file_status == FILE_ADDED) {
1.67 joris 209: isnew = 1;
1.66 joris 210: rcsflags = RCS_CREATE;
211: openflags = O_CREAT | O_TRUNC | O_WRONLY;
212: if (cf->file_rcs != NULL) {
213: if (cf->file_rcs->rf_inattic == 0)
214: cvs_log(LP_ERR, "warning: expected %s "
215: "to be in the Attic", cf->file_path);
216:
217: if (cf->file_rcs->rf_dead == 0)
218: cvs_log(LP_ERR, "warning: expected %s "
219: "to be dead", cf->file_path);
220:
221: rcsfile = xmalloc(MAXPATHLEN);
222: repo = xmalloc(MAXPATHLEN);
223: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
224: l = snprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
225: repo, cf->file_name, RCS_FILE_EXT);
226: if (l == -1 || l >= MAXPATHLEN)
227: fatal("cvs_commit_local: overflow");
228:
229: if (rename(cf->file_rpath, rcsfile) == -1)
230: fatal("cvs_commit_local: failed to move %s "
231: "outside the Attic: %s", cf->file_path,
232: strerror(errno));
233:
234: xfree(cf->file_rpath);
235: cf->file_rpath = xstrdup(rcsfile);
236: xfree(rcsfile);
237: xfree(repo);
238:
239: rcsflags = RCS_READ | RCS_PARSE_FULLY;
240: openflags = O_RDONLY;
241: rcs_close(cf->file_rcs);
1.67 joris 242: isnew = 0;
1.66 joris 243: }
244:
245: cf->repo_fd = open(cf->file_rpath, openflags);
1.61 joris 246: if (cf->repo_fd < 0)
247: fatal("cvs_commit_local: %s", strerror(errno));
248:
249: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.66 joris 250: rcsflags, 0600);
1.61 joris 251: if (cf->file_rcs == NULL)
252: fatal("cvs_commit_local: failed to create RCS file "
253: "for %s", cf->file_path);
1.71 xsa 254:
255: commit_desc_set(cf);
1.61 joris 256: }
1.36 joris 257:
1.77 reyk 258: if (verbosity > 1) {
259: cvs_printf("Checking in %s:\n", cf->file_path);
260: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
261: cvs_printf("old revision: %s; ", rbuf);
262: }
1.7 jfb 263:
1.67 joris 264: if (isnew == 0)
1.61 joris 265: d = commit_diff_file(cf);
1.7 jfb 266:
1.56 joris 267: if (cf->file_status == FILE_REMOVED) {
268: b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
269: if (b == NULL)
270: fatal("cvs_commit_local: failed to get HEAD");
1.61 joris 271: } else {
1.73 joris 272: if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 273: fatal("cvs_commit_local: failed to load file");
274: }
1.7 jfb 275:
1.55 joris 276: cvs_buf_putc(b, '\0');
277: f = cvs_buf_release(b);
1.7 jfb 278:
1.67 joris 279: if (isnew == 0) {
1.61 joris 280: if (rcs_deltatext_set(cf->file_rcs,
281: cf->file_rcs->rf_head, d) == -1)
282: fatal("cvs_commit_local: failed to set delta");
283: }
1.3 krapht 284:
1.55 joris 285: if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1)
286: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 287:
1.55 joris 288: if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, f) == -1)
289: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 290:
1.55 joris 291: xfree(f);
1.61 joris 292:
1.67 joris 293: if (isnew == 0)
1.61 joris 294: xfree(d);
1.6 jfb 295:
1.56 joris 296: if (cf->file_status == FILE_REMOVED) {
297: if (rcs_state_set(cf->file_rcs,
298: cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1)
299: fatal("cvs_commit_local: failed to set state");
1.68 joris 300: }
301:
302: if (cf->file_rcs->rf_branch != NULL) {
303: rcsnum_free(cf->file_rcs->rf_branch);
304: cf->file_rcs->rf_branch = NULL;
1.56 joris 305: }
306:
1.55 joris 307: rcs_write(cf->file_rcs);
1.6 jfb 308:
1.56 joris 309: if (cf->file_status == FILE_REMOVED) {
1.77 reyk 310: strlcpy(nbuf, "Removed", sizeof(nbuf));
1.61 joris 311: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 312: if (cf->file_rcs->rf_dead == 1)
1.77 reyk 313: strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
1.63 joris 314: else
315: rcsnum_tostr(cf->file_rcs->rf_head,
1.77 reyk 316: nbuf, sizeof(nbuf));
1.56 joris 317: } else if (cf->file_status == FILE_MODIFIED) {
1.77 reyk 318: rcsnum_tostr(cf->file_rcs->rf_head, nbuf, sizeof(nbuf));
1.56 joris 319: }
320:
1.77 reyk 321: if (verbosity > 1)
322: cvs_printf("new revision: %s\n", nbuf);
1.3 krapht 323:
1.55 joris 324: (void)unlink(cf->file_path);
325: (void)close(cf->fd);
326: cf->fd = -1;
1.56 joris 327:
328: if (cf->file_status != FILE_REMOVED) {
1.60 joris 329: b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
330: if (b == NULL)
331: fatal("cvs_commit_local: failed to get HEAD");
332:
333: cvs_checkout_file(cf, cf->file_rcs->rf_head, b, 0);
1.56 joris 334: } else {
335: entlist = cvs_ent_open(cf->file_wd);
336: cvs_ent_remove(entlist, cf->file_name);
337: cvs_ent_close(entlist, ENT_SYNC);
1.64 joris 338:
339: repo = xmalloc(MAXPATHLEN);
340: attic = xmalloc(MAXPATHLEN);
341: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
342:
343: l = snprintf(attic, MAXPATHLEN, "%s/%s", repo, CVS_PATH_ATTIC);
344: if (l == -1 || l >= MAXPATHLEN)
345: fatal("cvs_commit_local: overflow");
346:
347: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
348: fatal("cvs_commit_local: failed to create Attic");
349:
350: l = snprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
351: CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
352: if (l == -1 || l >= MAXPATHLEN)
353: fatal("cvs_commit_local: overflow");
354:
355: if (rename(cf->file_rpath, attic) == -1)
356: fatal("cvs_commit_local: failed to move %s to Attic",
357: cf->file_path);
358:
359: xfree(repo);
360: xfree(attic);
1.56 joris 361: }
1.3 krapht 362:
1.77 reyk 363: if (verbosity > 1)
364: cvs_printf("done\n");
365: else {
366: cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
367: cf->file_path, rbuf, nbuf);
368: }
1.39 xsa 369: }
370:
1.55 joris 371: static char *
372: commit_diff_file(struct cvs_file *cf)
1.39 xsa 373: {
1.55 joris 374: char*delta, *p1, *p2;
375: BUF *b1, *b2, *b3;
1.39 xsa 376:
1.63 joris 377: if (cf->file_status == FILE_MODIFIED ||
378: cf->file_status == FILE_ADDED) {
1.73 joris 379: if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 380: fatal("commit_diff_file: failed to load '%s'",
381: cf->file_path);
1.63 joris 382: } else {
1.56 joris 383: b1 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
384: if (b1 == NULL)
385: fatal("commit_diff_file: failed to load HEAD");
386: b1 = rcs_kwexp_buf(b1, cf->file_rcs, cf->file_rcs->rf_head);
387: }
1.3 krapht 388:
1.55 joris 389: if ((b2 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head)) == NULL)
390: fatal("commit_diff_file: failed to load HEAD for '%s'",
391: cf->file_path);
392:
393: if ((b3 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
394: fatal("commit_diff_file: failed to create diff buf");
395:
396: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
397: cvs_buf_write_stmp(b1, p1, 0600, NULL);
398: cvs_buf_free(b1);
399:
400: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
401: cvs_buf_write_stmp(b2, p2, 0600, NULL);
402: cvs_buf_free(b2);
403:
404: diff_format = D_RCSDIFF;
405: if (cvs_diffreg(p1, p2, b3) == D_ERROR)
406: fatal("commit_diff_file: failed to get RCS patch");
407:
408: cvs_buf_putc(b3, '\0');
409: delta = cvs_buf_release(b3);
410: return (delta);
1.71 xsa 411: }
412:
413: static void
414: commit_desc_set(struct cvs_file *cf)
415: {
416: BUF *bp;
1.76 joris 417: int l, fd;
1.71 xsa 418: char *desc_path, *desc;
419:
420: desc_path = xmalloc(MAXPATHLEN);
421: l = snprintf(desc_path, MAXPATHLEN, "%s/%s%s",
422: CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
423: if (l == -1 || l >= MAXPATHLEN)
424: fatal("commit_desc_set: overflow");
425:
1.76 joris 426: if ((fd = open(desc_path, O_RDONLY)) == -1) {
1.71 xsa 427: xfree(desc_path);
428: return;
429: }
430:
1.78 joris 431: bp = cvs_buf_load_fd(fd, BUF_AUTOEXT);
1.71 xsa 432: cvs_buf_putc(bp, '\0');
433: desc = cvs_buf_release(bp);
434:
435: rcs_desc_set(cf->file_rcs, desc);
436:
1.76 joris 437: (void)close(fd);
1.71 xsa 438: (void)cvs_unlink(desc_path);
439:
440: xfree(desc);
441: xfree(desc_path);
1.1 jfb 442: }
![[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