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