Annotation of src/usr.bin/cvs/commit.c, Revision 1.74
1.74 ! joris 1: /* $OpenBSD: commit.c,v 1.73 2006/06/14 14:10:50 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"
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 *);
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.1 jfb 89:
1.55 joris 90: TAILQ_INIT(&files_affected);
91: conflicts_found = 0;
1.32 joris 92:
1.55 joris 93: cr.enterdir = NULL;
94: cr.leavedir = NULL;
95: cr.local = cvs_commit_check_conflicts;
96: cr.remote = NULL;
1.58 joris 97: cr.flags = flags;
1.55 joris 98:
99: if (argc > 0)
100: cvs_file_run(argc, argv, &cr);
101: else
102: cvs_file_run(1, &arg, &cr);
103:
104: if (conflicts_found != 0)
105: fatal("%d conflicts found, please correct these first",
106: conflicts_found);
107:
108: cr.local = cvs_commit_local;
109: cvs_file_walklist(&files_affected, &cr);
110: cvs_file_freelist(&files_affected);
1.32 joris 111:
1.18 joris 112: return (0);
113: }
1.1 jfb 114:
1.55 joris 115: void
116: cvs_commit_check_conflicts(struct cvs_file *cf)
1.18 joris 117: {
1.55 joris 118: cvs_log(LP_TRACE, "cvs_commit_check_conflicts(%s)", cf->file_path);
1.44 joris 119:
1.43 joris 120: /*
1.55 joris 121: * cvs_file_classify makes the noise for us
122: * XXX - we want that?
1.43 joris 123: */
1.65 joris 124: cvs_file_classify(cf, NULL, 1);
1.59 joris 125:
126: if (cf->file_type == CVS_DIR) {
127: if (verbosity > 1)
128: cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
129: return;
130: }
1.32 joris 131:
1.55 joris 132: if (cf->file_status == FILE_CONFLICT ||
133: cf->file_status == FILE_LOST ||
134: cf->file_status == FILE_UNLINK)
135: conflicts_found++;
1.57 joris 136:
1.63 joris 137: if (cf->file_status != FILE_REMOVED &&
138: update_has_conflict_markers(cf)) {
1.60 joris 139: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
140: "merging, please fix these first", cf->file_path);
141: conflicts_found++;
142: }
143:
1.57 joris 144: if (cf->file_status == FILE_MERGE ||
1.72 joris 145: cf->file_status == FILE_PATCH ||
146: cf->file_status == FILE_CHECKOUT) {
1.57 joris 147: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
148: cf->file_path);
149: conflicts_found++;
150: }
1.55 joris 151:
152: if (cf->file_status == FILE_ADDED ||
153: cf->file_status == FILE_REMOVED ||
154: cf->file_status == FILE_MODIFIED)
155: cvs_file_get(cf->file_path, &files_affected);
156: }
1.1 jfb 157:
1.55 joris 158: void
159: cvs_commit_local(struct cvs_file *cf)
160: {
161: BUF *b;
1.67 joris 162: int isnew;
1.66 joris 163: int l, openflags, rcsflags;
1.61 joris 164: char *d, *f, rbuf[24];
1.56 joris 165: CVSENTRIES *entlist;
1.66 joris 166: char *attic, *repo, *rcsfile;
1.17 joris 167:
1.55 joris 168: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.65 joris 169: cvs_file_classify(cf, NULL, 0);
1.69 joris 170:
171: if (cvs_noexec == 1)
172: return;
1.35 xsa 173:
1.64 joris 174: if (cf->file_type != CVS_FILE)
175: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
176:
1.56 joris 177: if (cf->file_status == FILE_MODIFIED ||
1.66 joris 178: cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
179: && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1))
1.68 joris 180: rcsnum_tostr(rcs_head_get(cf->file_rcs), rbuf, sizeof(rbuf));
1.61 joris 181: else
182: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
183:
1.67 joris 184: isnew = 0;
1.66 joris 185: if (cf->file_status == FILE_ADDED) {
1.67 joris 186: isnew = 1;
1.66 joris 187: rcsflags = RCS_CREATE;
188: openflags = O_CREAT | O_TRUNC | O_WRONLY;
189: if (cf->file_rcs != NULL) {
190: if (cf->file_rcs->rf_inattic == 0)
191: cvs_log(LP_ERR, "warning: expected %s "
192: "to be in the Attic", cf->file_path);
193:
194: if (cf->file_rcs->rf_dead == 0)
195: cvs_log(LP_ERR, "warning: expected %s "
196: "to be dead", cf->file_path);
197:
198: rcsfile = xmalloc(MAXPATHLEN);
199: repo = xmalloc(MAXPATHLEN);
200: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
201: l = snprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
202: repo, cf->file_name, RCS_FILE_EXT);
203: if (l == -1 || l >= MAXPATHLEN)
204: fatal("cvs_commit_local: overflow");
205:
206: if (rename(cf->file_rpath, rcsfile) == -1)
207: fatal("cvs_commit_local: failed to move %s "
208: "outside the Attic: %s", cf->file_path,
209: strerror(errno));
210:
211: xfree(cf->file_rpath);
212: cf->file_rpath = xstrdup(rcsfile);
213: xfree(rcsfile);
214: xfree(repo);
215:
216: rcsflags = RCS_READ | RCS_PARSE_FULLY;
217: openflags = O_RDONLY;
218: rcs_close(cf->file_rcs);
1.67 joris 219: isnew = 0;
1.66 joris 220: }
221:
222: cf->repo_fd = open(cf->file_rpath, openflags);
1.61 joris 223: if (cf->repo_fd < 0)
224: fatal("cvs_commit_local: %s", strerror(errno));
225:
226: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.66 joris 227: rcsflags, 0600);
1.61 joris 228: if (cf->file_rcs == NULL)
229: fatal("cvs_commit_local: failed to create RCS file "
230: "for %s", cf->file_path);
1.71 xsa 231:
232: commit_desc_set(cf);
1.61 joris 233: }
1.36 joris 234:
1.55 joris 235: cvs_printf("Checking in %s:\n", cf->file_path);
236: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
237: cvs_printf("old revision: %s; ", rbuf);
1.7 jfb 238:
1.67 joris 239: if (isnew == 0)
1.61 joris 240: d = commit_diff_file(cf);
1.7 jfb 241:
1.56 joris 242: if (cf->file_status == FILE_REMOVED) {
243: b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
244: if (b == NULL)
245: fatal("cvs_commit_local: failed to get HEAD");
1.61 joris 246: } else {
1.73 joris 247: if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 248: fatal("cvs_commit_local: failed to load file");
249: }
1.7 jfb 250:
1.55 joris 251: cvs_buf_putc(b, '\0');
252: f = cvs_buf_release(b);
1.7 jfb 253:
1.67 joris 254: if (isnew == 0) {
1.61 joris 255: if (rcs_deltatext_set(cf->file_rcs,
256: cf->file_rcs->rf_head, d) == -1)
257: fatal("cvs_commit_local: failed to set delta");
258: }
1.3 krapht 259:
1.55 joris 260: if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1)
261: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 262:
1.55 joris 263: if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, f) == -1)
264: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 265:
1.55 joris 266: xfree(f);
1.61 joris 267:
1.67 joris 268: if (isnew == 0)
1.61 joris 269: xfree(d);
1.6 jfb 270:
1.56 joris 271: if (cf->file_status == FILE_REMOVED) {
272: if (rcs_state_set(cf->file_rcs,
273: cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1)
274: fatal("cvs_commit_local: failed to set state");
1.68 joris 275: }
276:
277: if (cf->file_rcs->rf_branch != NULL) {
278: rcsnum_free(cf->file_rcs->rf_branch);
279: cf->file_rcs->rf_branch = NULL;
1.56 joris 280: }
281:
1.55 joris 282: rcs_write(cf->file_rcs);
1.6 jfb 283:
1.56 joris 284: if (cf->file_status == FILE_REMOVED) {
285: strlcpy(rbuf, "Removed", sizeof(rbuf));
1.61 joris 286: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 287: if (cf->file_rcs->rf_dead == 1)
1.63 joris 288: strlcpy(rbuf, "Initial Revision", sizeof(rbuf));
289: else
290: rcsnum_tostr(cf->file_rcs->rf_head,
291: rbuf, sizeof(rbuf));
1.56 joris 292: } else if (cf->file_status == FILE_MODIFIED) {
293: rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
294: }
295:
1.55 joris 296: cvs_printf("new revision: %s\n", rbuf);
1.3 krapht 297:
1.55 joris 298: (void)unlink(cf->file_path);
299: (void)close(cf->fd);
300: cf->fd = -1;
1.56 joris 301:
302: if (cf->file_status != FILE_REMOVED) {
1.60 joris 303: b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
304: if (b == NULL)
305: fatal("cvs_commit_local: failed to get HEAD");
306:
307: cvs_checkout_file(cf, cf->file_rcs->rf_head, b, 0);
1.56 joris 308: } else {
309: entlist = cvs_ent_open(cf->file_wd);
310: cvs_ent_remove(entlist, cf->file_name);
311: cvs_ent_close(entlist, ENT_SYNC);
1.64 joris 312:
313: repo = xmalloc(MAXPATHLEN);
314: attic = xmalloc(MAXPATHLEN);
315: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
316:
317: l = snprintf(attic, MAXPATHLEN, "%s/%s", repo, CVS_PATH_ATTIC);
318: if (l == -1 || l >= MAXPATHLEN)
319: fatal("cvs_commit_local: overflow");
320:
321: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
322: fatal("cvs_commit_local: failed to create Attic");
323:
324: l = snprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
325: CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
326: if (l == -1 || l >= MAXPATHLEN)
327: fatal("cvs_commit_local: overflow");
328:
329: if (rename(cf->file_rpath, attic) == -1)
330: fatal("cvs_commit_local: failed to move %s to Attic",
331: cf->file_path);
332:
333: xfree(repo);
334: xfree(attic);
1.56 joris 335: }
1.3 krapht 336:
1.55 joris 337: cvs_printf("done\n");
1.16 joris 338:
1.39 xsa 339: }
340:
1.55 joris 341: static char *
342: commit_diff_file(struct cvs_file *cf)
1.39 xsa 343: {
1.55 joris 344: char*delta, *p1, *p2;
345: BUF *b1, *b2, *b3;
1.39 xsa 346:
1.63 joris 347: if (cf->file_status == FILE_MODIFIED ||
348: cf->file_status == FILE_ADDED) {
1.73 joris 349: if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 350: fatal("commit_diff_file: failed to load '%s'",
351: cf->file_path);
1.63 joris 352: } else {
1.56 joris 353: b1 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
354: if (b1 == NULL)
355: fatal("commit_diff_file: failed to load HEAD");
356: b1 = rcs_kwexp_buf(b1, cf->file_rcs, cf->file_rcs->rf_head);
357: }
1.3 krapht 358:
1.55 joris 359: if ((b2 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head)) == NULL)
360: fatal("commit_diff_file: failed to load HEAD for '%s'",
361: cf->file_path);
362:
363: if ((b3 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
364: fatal("commit_diff_file: failed to create diff buf");
365:
366: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
367: cvs_buf_write_stmp(b1, p1, 0600, NULL);
368: cvs_buf_free(b1);
369:
370: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
371: cvs_buf_write_stmp(b2, p2, 0600, NULL);
372: cvs_buf_free(b2);
373:
374: diff_format = D_RCSDIFF;
375: if (cvs_diffreg(p1, p2, b3) == D_ERROR)
376: fatal("commit_diff_file: failed to get RCS patch");
377:
378: cvs_buf_putc(b3, '\0');
379: delta = cvs_buf_release(b3);
380: return (delta);
1.71 xsa 381: }
382:
383: static void
384: commit_desc_set(struct cvs_file *cf)
385: {
386: BUF *bp;
387: int l;
388: char *desc_path, *desc;
389:
390: desc_path = xmalloc(MAXPATHLEN);
391: l = snprintf(desc_path, MAXPATHLEN, "%s/%s%s",
392: CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
393: if (l == -1 || l >= MAXPATHLEN)
394: fatal("commit_desc_set: overflow");
395:
396: if ((bp = cvs_buf_load(desc_path, BUF_AUTOEXT)) == NULL) {
397: xfree(desc_path);
398: return;
399: }
400:
401: cvs_buf_putc(bp, '\0');
402: desc = cvs_buf_release(bp);
403:
404: rcs_desc_set(cf->file_rcs, desc);
405:
406: (void)cvs_unlink(desc_path);
407:
408: xfree(desc);
409: xfree(desc_path);
1.1 jfb 410: }
![[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