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