Annotation of src/usr.bin/cvs/commit.c, Revision 1.100
1.100 ! otto 1: /* $OpenBSD: commit.c,v 1.99 2007/01/18 15:26:52 xsa 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);
1.99 xsa 128:
129: if (!(flags & CR_RECURSE_DIRS))
130: cvs_client_send_request("Argument -l");
1.80 joris 131:
132: cvs_client_send_request("Argument -m%s", logmsg);
133:
134: cvs_client_send_files(argv, argc);
135: cvs_client_senddir(".");
136: cvs_client_send_request("ci");
137: cvs_client_get_responses();
1.86 joris 138: } else {
139: cr.fileproc = cvs_commit_local;
140: cvs_file_walklist(&files_affected, &cr);
141: cvs_file_freelist(&files_affected);
1.80 joris 142: }
1.1 jfb 143:
1.18 joris 144: return (0);
145: }
1.1 jfb 146:
1.55 joris 147: void
1.86 joris 148: cvs_commit_check_files(struct cvs_file *cf)
1.18 joris 149: {
1.86 joris 150: cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path);
1.44 joris 151:
1.43 joris 152: /*
1.55 joris 153: * cvs_file_classify makes the noise for us
154: * XXX - we want that?
1.43 joris 155: */
1.65 joris 156: cvs_file_classify(cf, NULL, 1);
1.59 joris 157:
158: if (cf->file_type == CVS_DIR) {
159: if (verbosity > 1)
160: cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
161: return;
162: }
1.32 joris 163:
1.55 joris 164: if (cf->file_status == FILE_CONFLICT ||
1.79 joris 165: cf->file_status == FILE_UNLINK) {
1.55 joris 166: conflicts_found++;
1.79 joris 167: return;
168: }
1.57 joris 169:
1.63 joris 170: if (cf->file_status != FILE_REMOVED &&
171: update_has_conflict_markers(cf)) {
1.60 joris 172: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
173: "merging, please fix these first", cf->file_path);
174: conflicts_found++;
1.79 joris 175: return;
1.60 joris 176: }
177:
1.57 joris 178: if (cf->file_status == FILE_MERGE ||
1.72 joris 179: cf->file_status == FILE_PATCH ||
1.79 joris 180: cf->file_status == FILE_CHECKOUT ||
181: cf->file_status == FILE_LOST) {
1.57 joris 182: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
183: cf->file_path);
184: conflicts_found++;
1.79 joris 185: return;
1.57 joris 186: }
1.55 joris 187:
188: if (cf->file_status == FILE_ADDED ||
189: cf->file_status == FILE_REMOVED ||
190: cf->file_status == FILE_MODIFIED)
191: cvs_file_get(cf->file_path, &files_affected);
1.86 joris 192:
193: switch (cf->file_status) {
194: case FILE_ADDED:
195: cvs_file_get(cf->file_path, &files_added);
196: break;
197: case FILE_REMOVED:
198: cvs_file_get(cf->file_path, &files_removed);
199: break;
200: case FILE_MODIFIED:
201: cvs_file_get(cf->file_path, &files_modified);
202: break;
203: }
1.55 joris 204: }
1.1 jfb 205:
1.55 joris 206: void
207: cvs_commit_local(struct cvs_file *cf)
208: {
1.91 joris 209: BUF *b, *d;
1.67 joris 210: int isnew;
1.93 joris 211: RCSNUM *head;
1.66 joris 212: int l, openflags, rcsflags;
1.91 joris 213: char rbuf[24], nbuf[24];
1.56 joris 214: CVSENTRIES *entlist;
1.100 ! otto 215: char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN];
1.17 joris 216:
1.55 joris 217: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.65 joris 218: cvs_file_classify(cf, NULL, 0);
1.69 joris 219:
220: if (cvs_noexec == 1)
221: return;
1.35 xsa 222:
1.64 joris 223: if (cf->file_type != CVS_FILE)
224: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
225:
1.56 joris 226: if (cf->file_status == FILE_MODIFIED ||
1.66 joris 227: cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
1.93 joris 228: && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) {
229: head = rcs_head_get(cf->file_rcs);
230: rcsnum_tostr(head, rbuf, sizeof(rbuf));
231: rcsnum_free(head);
232: } else {
1.61 joris 233: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.93 joris 234: }
1.61 joris 235:
1.67 joris 236: isnew = 0;
1.66 joris 237: if (cf->file_status == FILE_ADDED) {
1.67 joris 238: isnew = 1;
1.66 joris 239: rcsflags = RCS_CREATE;
240: openflags = O_CREAT | O_TRUNC | O_WRONLY;
241: if (cf->file_rcs != NULL) {
242: if (cf->file_rcs->rf_inattic == 0)
243: cvs_log(LP_ERR, "warning: expected %s "
244: "to be in the Attic", cf->file_path);
245:
246: if (cf->file_rcs->rf_dead == 0)
247: cvs_log(LP_ERR, "warning: expected %s "
248: "to be dead", cf->file_path);
249:
250: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
251: l = snprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
252: repo, cf->file_name, RCS_FILE_EXT);
253: if (l == -1 || l >= MAXPATHLEN)
254: fatal("cvs_commit_local: overflow");
255:
256: if (rename(cf->file_rpath, rcsfile) == -1)
257: fatal("cvs_commit_local: failed to move %s "
258: "outside the Attic: %s", cf->file_path,
259: strerror(errno));
260:
261: xfree(cf->file_rpath);
262: cf->file_rpath = xstrdup(rcsfile);
263:
264: rcsflags = RCS_READ | RCS_PARSE_FULLY;
265: openflags = O_RDONLY;
266: rcs_close(cf->file_rcs);
1.67 joris 267: isnew = 0;
1.66 joris 268: }
269:
270: cf->repo_fd = open(cf->file_rpath, openflags);
1.61 joris 271: if (cf->repo_fd < 0)
272: fatal("cvs_commit_local: %s", strerror(errno));
273:
274: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.66 joris 275: rcsflags, 0600);
1.61 joris 276: if (cf->file_rcs == NULL)
277: fatal("cvs_commit_local: failed to create RCS file "
278: "for %s", cf->file_path);
1.71 xsa 279:
280: commit_desc_set(cf);
1.61 joris 281: }
1.36 joris 282:
1.77 reyk 283: if (verbosity > 1) {
284: cvs_printf("Checking in %s:\n", cf->file_path);
285: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
286: cvs_printf("old revision: %s; ", rbuf);
287: }
1.7 jfb 288:
1.67 joris 289: if (isnew == 0)
1.61 joris 290: d = commit_diff_file(cf);
1.7 jfb 291:
1.56 joris 292: if (cf->file_status == FILE_REMOVED) {
1.98 joris 293: b = rcs_rev_getbuf(cf->file_rcs, cf->file_rcs->rf_head, 0);
1.56 joris 294: if (b == NULL)
295: fatal("cvs_commit_local: failed to get HEAD");
1.61 joris 296: } else {
1.73 joris 297: if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 298: fatal("cvs_commit_local: failed to load file");
299: }
1.7 jfb 300:
1.67 joris 301: if (isnew == 0) {
1.61 joris 302: if (rcs_deltatext_set(cf->file_rcs,
303: cf->file_rcs->rf_head, d) == -1)
304: fatal("cvs_commit_local: failed to set delta");
305: }
1.3 krapht 306:
1.55 joris 307: if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1)
308: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 309:
1.91 joris 310: if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, b) == -1)
1.55 joris 311: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 312:
1.56 joris 313: if (cf->file_status == FILE_REMOVED) {
314: if (rcs_state_set(cf->file_rcs,
315: cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1)
316: fatal("cvs_commit_local: failed to set state");
1.68 joris 317: }
318:
319: if (cf->file_rcs->rf_branch != NULL) {
320: rcsnum_free(cf->file_rcs->rf_branch);
321: cf->file_rcs->rf_branch = NULL;
1.56 joris 322: }
323:
1.55 joris 324: rcs_write(cf->file_rcs);
1.6 jfb 325:
1.56 joris 326: if (cf->file_status == FILE_REMOVED) {
1.77 reyk 327: strlcpy(nbuf, "Removed", sizeof(nbuf));
1.61 joris 328: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 329: if (cf->file_rcs->rf_dead == 1)
1.77 reyk 330: strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
1.63 joris 331: else
332: rcsnum_tostr(cf->file_rcs->rf_head,
1.77 reyk 333: nbuf, sizeof(nbuf));
1.56 joris 334: } else if (cf->file_status == FILE_MODIFIED) {
1.77 reyk 335: rcsnum_tostr(cf->file_rcs->rf_head, nbuf, sizeof(nbuf));
1.56 joris 336: }
337:
1.77 reyk 338: if (verbosity > 1)
339: cvs_printf("new revision: %s\n", nbuf);
1.3 krapht 340:
1.55 joris 341: (void)unlink(cf->file_path);
342: (void)close(cf->fd);
343: cf->fd = -1;
1.56 joris 344:
345: if (cf->file_status != FILE_REMOVED) {
1.95 joris 346: cvs_checkout_file(cf, cf->file_rcs->rf_head, CO_COMMIT);
1.56 joris 347: } else {
348: entlist = cvs_ent_open(cf->file_wd);
349: cvs_ent_remove(entlist, cf->file_name);
350: cvs_ent_close(entlist, ENT_SYNC);
1.64 joris 351:
352: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
353:
354: l = snprintf(attic, MAXPATHLEN, "%s/%s", repo, CVS_PATH_ATTIC);
355: if (l == -1 || l >= MAXPATHLEN)
356: fatal("cvs_commit_local: overflow");
357:
358: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
359: fatal("cvs_commit_local: failed to create Attic");
360:
361: l = snprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
362: CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
363: if (l == -1 || l >= MAXPATHLEN)
364: fatal("cvs_commit_local: overflow");
365:
366: if (rename(cf->file_rpath, attic) == -1)
367: fatal("cvs_commit_local: failed to move %s to Attic",
368: cf->file_path);
369:
1.85 joris 370: if (cvs_server_active == 1)
371: cvs_server_update_entry("Remove-entry", cf);
1.56 joris 372: }
1.3 krapht 373:
1.77 reyk 374: if (verbosity > 1)
375: cvs_printf("done\n");
376: else {
377: cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
378: cf->file_path, rbuf, nbuf);
379: }
1.39 xsa 380: }
381:
1.91 joris 382: static BUF *
1.55 joris 383: commit_diff_file(struct cvs_file *cf)
1.39 xsa 384: {
1.91 joris 385: char *p1, *p2;
1.97 joris 386: BUF *b1, *b2;
387:
388: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
1.39 xsa 389:
1.63 joris 390: if (cf->file_status == FILE_MODIFIED ||
391: cf->file_status == FILE_ADDED) {
1.73 joris 392: if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 393: fatal("commit_diff_file: failed to load '%s'",
394: cf->file_path);
1.97 joris 395: cvs_buf_write_stmp(b1, p1, NULL);
396: cvs_buf_free(b1);
1.63 joris 397: } else {
1.97 joris 398: rcs_rev_write_stmp(cf->file_rcs, cf->file_rcs->rf_head, p1, 0);
1.56 joris 399: }
1.3 krapht 400:
1.97 joris 401: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
402: rcs_rev_write_stmp(cf->file_rcs, cf->file_rcs->rf_head, p2, 0);
1.55 joris 403:
1.97 joris 404: if ((b2 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
1.55 joris 405: fatal("commit_diff_file: failed to create diff buf");
406:
407: diff_format = D_RCSDIFF;
1.97 joris 408: if (cvs_diffreg(p1, p2, b2) == D_ERROR)
1.55 joris 409: fatal("commit_diff_file: failed to get RCS patch");
1.96 joris 410:
411: xfree(p1);
412: xfree(p2);
1.55 joris 413:
1.97 joris 414: return (b2);
1.71 xsa 415: }
416:
417: static void
418: commit_desc_set(struct cvs_file *cf)
419: {
420: BUF *bp;
1.76 joris 421: int l, fd;
1.100 ! otto 422: char desc_path[MAXPATHLEN], *desc;
1.71 xsa 423:
424: l = snprintf(desc_path, MAXPATHLEN, "%s/%s%s",
425: CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
426: if (l == -1 || l >= MAXPATHLEN)
427: fatal("commit_desc_set: overflow");
428:
1.100 ! otto 429: if ((fd = open(desc_path, O_RDONLY)) == -1)
1.71 xsa 430: return;
431:
1.78 joris 432: bp = cvs_buf_load_fd(fd, BUF_AUTOEXT);
1.71 xsa 433: cvs_buf_putc(bp, '\0');
434: desc = cvs_buf_release(bp);
435:
436: rcs_desc_set(cf->file_rcs, desc);
437:
1.76 joris 438: (void)close(fd);
1.71 xsa 439: (void)cvs_unlink(desc_path);
440:
441: xfree(desc);
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