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