Annotation of src/usr.bin/cvs/commit.c, Revision 1.62
1.62 ! joris 1: /* $OpenBSD: commit.c,v 1.61 2006/05/28 04:32:54 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.62 ! joris 116: cvs_file_classify(cf, 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.60 joris 129: if (update_has_conflict_markers(cf)) {
130: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
131: "merging, please fix these first", cf->file_path);
132: conflicts_found++;
133: }
134:
1.57 joris 135: if (cf->file_status == FILE_MERGE ||
136: cf->file_status == FILE_PATCH) {
137: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
138: cf->file_path);
139: conflicts_found++;
140: }
1.55 joris 141:
142: if (cf->file_status == FILE_ADDED ||
143: cf->file_status == FILE_REMOVED ||
144: cf->file_status == FILE_MODIFIED)
145: cvs_file_get(cf->file_path, &files_affected);
146: }
1.1 jfb 147:
1.55 joris 148: void
149: cvs_commit_local(struct cvs_file *cf)
150: {
151: BUF *b;
1.61 joris 152: char *d, *f, rbuf[24];
1.56 joris 153: CVSENTRIES *entlist;
1.17 joris 154:
1.55 joris 155: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.62 ! joris 156: cvs_file_classify(cf, 0);
1.35 xsa 157:
1.56 joris 158: if (cf->file_status == FILE_MODIFIED ||
159: cf->file_status == FILE_REMOVED)
160: rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
1.61 joris 161: else
162: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
163:
164: if (cf->file_status == FILE_ADDED) {
165: cf->repo_fd = open(cf->file_rpath, O_CREAT|O_TRUNC|O_WRONLY);
166: if (cf->repo_fd < 0)
167: fatal("cvs_commit_local: %s", strerror(errno));
168:
169: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
170: RCS_CREATE, 0600);
171: if (cf->file_rcs == NULL)
172: fatal("cvs_commit_local: failed to create RCS file "
173: "for %s", cf->file_path);
174: }
1.36 joris 175:
1.55 joris 176: cvs_printf("Checking in %s:\n", cf->file_path);
177: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
178: cvs_printf("old revision: %s; ", rbuf);
1.7 jfb 179:
1.61 joris 180: if (cf->file_status != FILE_ADDED)
181: d = commit_diff_file(cf);
1.7 jfb 182:
1.56 joris 183: if (cf->file_status == FILE_REMOVED) {
184: b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
185: if (b == NULL)
186: fatal("cvs_commit_local: failed to get HEAD");
1.61 joris 187: } else {
1.56 joris 188: if ((b = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)
189: fatal("cvs_commit_local: failed to load file");
190: }
1.7 jfb 191:
1.55 joris 192: cvs_buf_putc(b, '\0');
193: f = cvs_buf_release(b);
1.7 jfb 194:
1.61 joris 195: if (cf->file_status != FILE_ADDED) {
196: if (rcs_deltatext_set(cf->file_rcs,
197: cf->file_rcs->rf_head, d) == -1)
198: fatal("cvs_commit_local: failed to set delta");
199: }
1.3 krapht 200:
1.55 joris 201: if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1)
202: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 203:
1.55 joris 204: if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, f) == -1)
205: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 206:
1.55 joris 207: xfree(f);
1.61 joris 208:
209: if (cf->file_status != FILE_ADDED)
210: xfree(d);
1.6 jfb 211:
1.56 joris 212: if (cf->file_status == FILE_REMOVED) {
213: if (rcs_state_set(cf->file_rcs,
214: cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1)
215: fatal("cvs_commit_local: failed to set state");
216: }
217:
1.55 joris 218: rcs_write(cf->file_rcs);
1.6 jfb 219:
1.56 joris 220: if (cf->file_status == FILE_REMOVED) {
221: strlcpy(rbuf, "Removed", sizeof(rbuf));
1.61 joris 222: } else if (cf->file_status == FILE_ADDED) {
223: strlcpy(rbuf, "Initial Revision", sizeof(rbuf));
1.56 joris 224: } else if (cf->file_status == FILE_MODIFIED) {
225: rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf));
226: }
227:
1.55 joris 228: cvs_printf("new revision: %s\n", rbuf);
1.3 krapht 229:
1.55 joris 230: (void)unlink(cf->file_path);
231: (void)close(cf->fd);
232: cf->fd = -1;
1.56 joris 233:
234: if (cf->file_status != FILE_REMOVED) {
1.60 joris 235: b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
236: if (b == NULL)
237: fatal("cvs_commit_local: failed to get HEAD");
238:
239: cvs_checkout_file(cf, cf->file_rcs->rf_head, b, 0);
1.56 joris 240: } else {
241: entlist = cvs_ent_open(cf->file_wd);
242: cvs_ent_remove(entlist, cf->file_name);
243: cvs_ent_close(entlist, ENT_SYNC);
244: }
1.3 krapht 245:
1.55 joris 246: cvs_printf("done\n");
1.16 joris 247:
1.39 xsa 248: }
249:
1.55 joris 250: static char *
251: commit_diff_file(struct cvs_file *cf)
1.39 xsa 252: {
1.55 joris 253: char*delta, *p1, *p2;
254: BUF *b1, *b2, *b3;
1.39 xsa 255:
1.56 joris 256: if (cf->file_status == FILE_MODIFIED) {
257: if ((b1 = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)
258: fatal("commit_diff_file: failed to load '%s'",
259: cf->file_path);
260: } else if (cf->file_status == FILE_REMOVED) {
261: b1 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
262: if (b1 == NULL)
263: fatal("commit_diff_file: failed to load HEAD");
264: b1 = rcs_kwexp_buf(b1, cf->file_rcs, cf->file_rcs->rf_head);
265: }
1.3 krapht 266:
1.55 joris 267: if ((b2 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head)) == NULL)
268: fatal("commit_diff_file: failed to load HEAD for '%s'",
269: cf->file_path);
270:
271: if ((b3 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
272: fatal("commit_diff_file: failed to create diff buf");
273:
274: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
275: cvs_buf_write_stmp(b1, p1, 0600, NULL);
276: cvs_buf_free(b1);
277:
278: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
279: cvs_buf_write_stmp(b2, p2, 0600, NULL);
280: cvs_buf_free(b2);
281:
282: diff_format = D_RCSDIFF;
283: if (cvs_diffreg(p1, p2, b3) == D_ERROR)
284: fatal("commit_diff_file: failed to get RCS patch");
285:
286: cvs_buf_putc(b3, '\0');
287: delta = cvs_buf_release(b3);
288: return (delta);
1.1 jfb 289: }
![[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