Annotation of src/usr.bin/cvs/commit.c, Revision 1.68
1.68 ! joris 1: /* $OpenBSD: commit.c,v 1.67 2006/05/31 23:27:38 joris Exp $ */
1.1 jfb 2: /*
1.55 joris 3: * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
1.1 jfb 4: *
1.55 joris 5: * Permission to use, copy, modify, and distribute this software for any
6: * purpose with or without fee is hereby granted, provided that the above
7: * copyright notice and this permission notice appear in all copies.
1.1 jfb 8: *
1.55 joris 9: * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10: * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11: * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12: * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13: * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14: * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15: * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1.1 jfb 16: */
17:
1.51 xsa 18: #include "includes.h"
1.1 jfb 19:
20: #include "cvs.h"
1.55 joris 21: #include "diff.h"
1.1 jfb 22: #include "log.h"
1.2 jfb 23: #include "proto.h"
1.1 jfb 24:
1.55 joris 25: int cvs_commit(int, char **);
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 *);
30:
31: struct cvs_flisthead files_affected;
32: int conflicts_found;
33: char *logmsg;
1.34 jfb 34:
35: struct cvs_cmd cvs_cmd_commit = {
36: CVS_OP_COMMIT, CVS_REQ_CI, "commit",
1.55 joris 37: { "ci", "com" },
1.34 jfb 38: "Check files into the repository",
39: "[-flR] [-F logfile | -m msg] [-r rev] ...",
40: "F:flm:Rr:",
1.18 joris 41: NULL,
1.55 joris 42: cvs_commit
1.18 joris 43: };
1.1 jfb 44:
1.55 joris 45: int
46: cvs_commit(int argc, char **argv)
1.1 jfb 47: {
1.18 joris 48: int ch;
1.55 joris 49: char *arg = ".";
1.58 joris 50: int flags;
1.55 joris 51: struct cvs_recursion cr;
1.3 krapht 52:
1.58 joris 53: flags = CR_RECURSE_DIRS;
54:
1.55 joris 55: while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
1.1 jfb 56: switch (ch) {
1.55 joris 57: case 'f':
58: break;
1.1 jfb 59: case 'F':
60: break;
61: case 'l':
1.58 joris 62: flags &= ~CR_RECURSE_DIRS;
1.1 jfb 63: break;
64: case 'm':
1.55 joris 65: logmsg = xstrdup(optarg);
66: break;
67: case 'r':
1.1 jfb 68: break;
69: case 'R':
1.35 xsa 70: break;
1.1 jfb 71: default:
1.55 joris 72: fatal("%s", cvs_cmd_commit.cmd_synopsis);
1.1 jfb 73: }
74: }
75:
1.55 joris 76: argc -= optind;
77: argv += optind;
1.1 jfb 78:
1.55 joris 79: if (logmsg == NULL)
80: fatal("please use -m to specify a log message for now");
1.1 jfb 81:
1.55 joris 82: TAILQ_INIT(&files_affected);
83: conflicts_found = 0;
1.32 joris 84:
1.55 joris 85: cr.enterdir = NULL;
86: cr.leavedir = NULL;
87: cr.local = cvs_commit_check_conflicts;
88: cr.remote = NULL;
1.58 joris 89: cr.flags = flags;
1.55 joris 90:
91: if (argc > 0)
92: cvs_file_run(argc, argv, &cr);
93: else
94: cvs_file_run(1, &arg, &cr);
95:
96: if (conflicts_found != 0)
97: fatal("%d conflicts found, please correct these first",
98: conflicts_found);
99:
100: cr.local = cvs_commit_local;
101: cvs_file_walklist(&files_affected, &cr);
102: cvs_file_freelist(&files_affected);
1.32 joris 103:
1.18 joris 104: return (0);
105: }
1.1 jfb 106:
1.55 joris 107: void
108: cvs_commit_check_conflicts(struct cvs_file *cf)
1.18 joris 109: {
1.55 joris 110: cvs_log(LP_TRACE, "cvs_commit_check_conflicts(%s)", cf->file_path);
1.44 joris 111:
1.43 joris 112: /*
1.55 joris 113: * cvs_file_classify makes the noise for us
114: * XXX - we want that?
1.43 joris 115: */
1.65 joris 116: cvs_file_classify(cf, NULL, 1);
1.59 joris 117:
118: if (cf->file_type == CVS_DIR) {
119: if (verbosity > 1)
120: cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
121: return;
122: }
1.32 joris 123:
1.55 joris 124: if (cf->file_status == FILE_CONFLICT ||
125: cf->file_status == FILE_LOST ||
126: cf->file_status == FILE_UNLINK)
127: conflicts_found++;
1.57 joris 128:
1.63 joris 129: if (cf->file_status != FILE_REMOVED &&
130: update_has_conflict_markers(cf)) {
1.60 joris 131: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
132: "merging, please fix these first", cf->file_path);
133: conflicts_found++;
134: }
135:
1.57 joris 136: if (cf->file_status == FILE_MERGE ||
137: cf->file_status == FILE_PATCH) {
138: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
139: cf->file_path);
140: conflicts_found++;
141: }
1.55 joris 142:
143: if (cf->file_status == FILE_ADDED ||
144: cf->file_status == FILE_REMOVED ||
145: cf->file_status == FILE_MODIFIED)
146: cvs_file_get(cf->file_path, &files_affected);
147: }
1.1 jfb 148:
1.55 joris 149: void
150: cvs_commit_local(struct cvs_file *cf)
151: {
152: BUF *b;
1.67 joris 153: int isnew;
1.66 joris 154: int l, openflags, rcsflags;
1.61 joris 155: char *d, *f, rbuf[24];
1.56 joris 156: CVSENTRIES *entlist;
1.66 joris 157: char *attic, *repo, *rcsfile;
1.17 joris 158:
1.55 joris 159: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.65 joris 160: cvs_file_classify(cf, NULL, 0);
1.35 xsa 161:
1.64 joris 162: if (cf->file_type != CVS_FILE)
163: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
164:
1.56 joris 165: if (cf->file_status == FILE_MODIFIED ||
1.66 joris 166: cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
167: && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1))
1.68 ! joris 168: rcsnum_tostr(rcs_head_get(cf->file_rcs), rbuf, sizeof(rbuf));
1.61 joris 169: else
170: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
171:
1.67 joris 172: isnew = 0;
1.66 joris 173: if (cf->file_status == FILE_ADDED) {
1.67 joris 174: isnew = 1;
1.66 joris 175: rcsflags = RCS_CREATE;
176: openflags = O_CREAT | O_TRUNC | O_WRONLY;
177: if (cf->file_rcs != NULL) {
178: if (cf->file_rcs->rf_inattic == 0)
179: cvs_log(LP_ERR, "warning: expected %s "
180: "to be in the Attic", cf->file_path);
181:
182: if (cf->file_rcs->rf_dead == 0)
183: cvs_log(LP_ERR, "warning: expected %s "
184: "to be dead", cf->file_path);
185:
186: rcsfile = xmalloc(MAXPATHLEN);
187: repo = xmalloc(MAXPATHLEN);
188: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
189: l = snprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
190: repo, cf->file_name, RCS_FILE_EXT);
191: if (l == -1 || l >= MAXPATHLEN)
192: fatal("cvs_commit_local: overflow");
193:
194: if (rename(cf->file_rpath, rcsfile) == -1)
195: fatal("cvs_commit_local: failed to move %s "
196: "outside the Attic: %s", cf->file_path,
197: strerror(errno));
198:
199: xfree(cf->file_rpath);
200: cf->file_rpath = xstrdup(rcsfile);
201: xfree(rcsfile);
202: xfree(repo);
203:
204: rcsflags = RCS_READ | RCS_PARSE_FULLY;
205: openflags = O_RDONLY;
206: rcs_close(cf->file_rcs);
1.67 joris 207: isnew = 0;
1.66 joris 208: }
209:
210: cf->repo_fd = open(cf->file_rpath, openflags);
1.61 joris 211: if (cf->repo_fd < 0)
212: fatal("cvs_commit_local: %s", strerror(errno));
213:
214: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.66 joris 215: rcsflags, 0600);
1.61 joris 216: if (cf->file_rcs == NULL)
217: fatal("cvs_commit_local: failed to create RCS file "
218: "for %s", cf->file_path);
219: }
1.36 joris 220:
1.55 joris 221: cvs_printf("Checking in %s:\n", cf->file_path);
222: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
223: cvs_printf("old revision: %s; ", rbuf);
1.7 jfb 224:
1.67 joris 225: if (isnew == 0)
1.61 joris 226: d = commit_diff_file(cf);
1.7 jfb 227:
1.56 joris 228: if (cf->file_status == FILE_REMOVED) {
229: b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
230: if (b == NULL)
231: fatal("cvs_commit_local: failed to get HEAD");
1.61 joris 232: } else {
1.56 joris 233: if ((b = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)
234: fatal("cvs_commit_local: failed to load file");
235: }
1.7 jfb 236:
1.55 joris 237: cvs_buf_putc(b, '\0');
238: f = cvs_buf_release(b);
1.7 jfb 239:
1.67 joris 240: if (isnew == 0) {
1.61 joris 241: if (rcs_deltatext_set(cf->file_rcs,
242: cf->file_rcs->rf_head, d) == -1)
243: fatal("cvs_commit_local: failed to set delta");
244: }
1.3 krapht 245:
1.55 joris 246: if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1)
247: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 248:
1.55 joris 249: if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, f) == -1)
250: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 251:
1.55 joris 252: xfree(f);
1.61 joris 253:
1.67 joris 254: if (isnew == 0)
1.61 joris 255: xfree(d);
1.6 jfb 256:
1.56 joris 257: if (cf->file_status == FILE_REMOVED) {
258: if (rcs_state_set(cf->file_rcs,
259: cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1)
260: fatal("cvs_commit_local: failed to set state");
1.68 ! joris 261: }
! 262:
! 263: if (cf->file_rcs->rf_branch != NULL) {
! 264: rcsnum_free(cf->file_rcs->rf_branch);
! 265: cf->file_rcs->rf_branch = NULL;
1.56 joris 266: }
267:
1.55 joris 268: rcs_write(cf->file_rcs);
1.6 jfb 269:
1.56 joris 270: if (cf->file_status == FILE_REMOVED) {
271: strlcpy(rbuf, "Removed", sizeof(rbuf));
1.61 joris 272: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 273: if (cf->file_rcs->rf_dead == 1)
1.63 joris 274: strlcpy(rbuf, "Initial Revision", sizeof(rbuf));
275: else
276: rcsnum_tostr(cf->file_rcs->rf_head,
277: rbuf, sizeof(rbuf));
1.56 joris 278: } else if (cf->file_status == FILE_MODIFIED) {
279: rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
280: }
281:
1.55 joris 282: cvs_printf("new revision: %s\n", rbuf);
1.3 krapht 283:
1.55 joris 284: (void)unlink(cf->file_path);
285: (void)close(cf->fd);
286: cf->fd = -1;
1.56 joris 287:
288: if (cf->file_status != FILE_REMOVED) {
1.60 joris 289: b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
290: if (b == NULL)
291: fatal("cvs_commit_local: failed to get HEAD");
292:
293: cvs_checkout_file(cf, cf->file_rcs->rf_head, b, 0);
1.56 joris 294: } else {
295: entlist = cvs_ent_open(cf->file_wd);
296: cvs_ent_remove(entlist, cf->file_name);
297: cvs_ent_close(entlist, ENT_SYNC);
1.64 joris 298:
299: repo = xmalloc(MAXPATHLEN);
300: attic = xmalloc(MAXPATHLEN);
301: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
302:
303: l = snprintf(attic, MAXPATHLEN, "%s/%s", repo, CVS_PATH_ATTIC);
304: if (l == -1 || l >= MAXPATHLEN)
305: fatal("cvs_commit_local: overflow");
306:
307: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
308: fatal("cvs_commit_local: failed to create Attic");
309:
310: l = snprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
311: CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
312: if (l == -1 || l >= MAXPATHLEN)
313: fatal("cvs_commit_local: overflow");
314:
315: if (rename(cf->file_rpath, attic) == -1)
316: fatal("cvs_commit_local: failed to move %s to Attic",
317: cf->file_path);
318:
319: xfree(repo);
320: xfree(attic);
1.56 joris 321: }
1.3 krapht 322:
1.55 joris 323: cvs_printf("done\n");
1.16 joris 324:
1.39 xsa 325: }
326:
1.55 joris 327: static char *
328: commit_diff_file(struct cvs_file *cf)
1.39 xsa 329: {
1.55 joris 330: char*delta, *p1, *p2;
331: BUF *b1, *b2, *b3;
1.39 xsa 332:
1.63 joris 333: if (cf->file_status == FILE_MODIFIED ||
334: cf->file_status == FILE_ADDED) {
1.56 joris 335: if ((b1 = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)
336: fatal("commit_diff_file: failed to load '%s'",
337: cf->file_path);
1.63 joris 338: } else {
1.56 joris 339: b1 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
340: if (b1 == NULL)
341: fatal("commit_diff_file: failed to load HEAD");
342: b1 = rcs_kwexp_buf(b1, cf->file_rcs, cf->file_rcs->rf_head);
343: }
1.3 krapht 344:
1.55 joris 345: if ((b2 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head)) == NULL)
346: fatal("commit_diff_file: failed to load HEAD for '%s'",
347: cf->file_path);
348:
349: if ((b3 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
350: fatal("commit_diff_file: failed to create diff buf");
351:
352: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
353: cvs_buf_write_stmp(b1, p1, 0600, NULL);
354: cvs_buf_free(b1);
355:
356: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
357: cvs_buf_write_stmp(b2, p2, 0600, NULL);
358: cvs_buf_free(b2);
359:
360: diff_format = D_RCSDIFF;
361: if (cvs_diffreg(p1, p2, b3) == D_ERROR)
362: fatal("commit_diff_file: failed to get RCS patch");
363:
364: cvs_buf_putc(b3, '\0');
365: delta = cvs_buf_release(b3);
366: return (delta);
1.1 jfb 367: }
![[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