Annotation of src/usr.bin/cvs/commit.c, Revision 1.107
1.107 ! joris 1: /* $OpenBSD: commit.c,v 1.106 2007/06/01 17:47:47 niallo 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.105 otto 19: #include <sys/stat.h>
20:
21: #include <errno.h>
22: #include <fcntl.h>
23: #include <string.h>
24: #include <unistd.h>
1.1 jfb 25:
26: #include "cvs.h"
1.55 joris 27: #include "diff.h"
1.80 joris 28: #include "remote.h"
1.1 jfb 29:
1.55 joris 30: void cvs_commit_local(struct cvs_file *);
1.86 joris 31: void cvs_commit_check_files(struct cvs_file *);
1.55 joris 32:
1.91 joris 33: static BUF *commit_diff_file(struct cvs_file *);
1.71 xsa 34: static void commit_desc_set(struct cvs_file *);
1.55 joris 35:
36: struct cvs_flisthead files_affected;
1.86 joris 37: struct cvs_flisthead files_added;
38: struct cvs_flisthead files_removed;
39: struct cvs_flisthead files_modified;
40:
1.55 joris 41: int conflicts_found;
1.86 joris 42: char *logmsg = NULL;
1.34 jfb 43:
44: struct cvs_cmd cvs_cmd_commit = {
1.74 joris 45: CVS_OP_COMMIT, 0, "commit",
1.55 joris 46: { "ci", "com" },
1.34 jfb 47: "Check files into the repository",
48: "[-flR] [-F logfile | -m msg] [-r rev] ...",
49: "F:flm:Rr:",
1.18 joris 50: NULL,
1.55 joris 51: cvs_commit
1.18 joris 52: };
1.1 jfb 53:
1.55 joris 54: int
55: cvs_commit(int argc, char **argv)
1.1 jfb 56: {
1.18 joris 57: int ch;
1.55 joris 58: char *arg = ".";
1.58 joris 59: int flags;
1.55 joris 60: struct cvs_recursion cr;
1.3 krapht 61:
1.58 joris 62: flags = CR_RECURSE_DIRS;
63:
1.55 joris 64: while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) {
1.1 jfb 65: switch (ch) {
66: case 'F':
1.88 joris 67: logmsg = cvs_logmsg_read(optarg);
1.1 jfb 68: break;
1.82 xsa 69: case 'f':
70: break;
1.1 jfb 71: case 'l':
1.58 joris 72: flags &= ~CR_RECURSE_DIRS;
1.1 jfb 73: break;
74: case 'm':
1.55 joris 75: logmsg = xstrdup(optarg);
76: break;
1.82 xsa 77: case 'R':
78: break;
1.55 joris 79: case 'r':
1.1 jfb 80: break;
81: default:
1.55 joris 82: fatal("%s", cvs_cmd_commit.cmd_synopsis);
1.1 jfb 83: }
84: }
85:
1.55 joris 86: argc -= optind;
87: argv += optind;
1.1 jfb 88:
1.86 joris 89: TAILQ_INIT(&files_affected);
90: TAILQ_INIT(&files_added);
91: TAILQ_INIT(&files_removed);
92: TAILQ_INIT(&files_modified);
93: conflicts_found = 0;
94:
95: cr.enterdir = NULL;
96: cr.leavedir = NULL;
97: cr.fileproc = cvs_commit_check_files;
98: cr.flags = flags;
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);
1.92 joris 108:
109: if (TAILQ_EMPTY(&files_affected))
110: return (0);
1.86 joris 111:
112: if (logmsg == NULL && cvs_server_active == 0) {
113: logmsg = cvs_logmsg_create(&files_added, &files_removed,
114: &files_modified);
115: }
116:
1.55 joris 117: if (logmsg == NULL)
1.86 joris 118: fatal("This shouldnt happen, honestly!");
1.87 joris 119:
120: cvs_file_freelist(&files_modified);
121: cvs_file_freelist(&files_removed);
122: cvs_file_freelist(&files_added);
1.80 joris 123:
124: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.89 joris 125: cvs_client_connect_to_server();
1.80 joris 126: cr.fileproc = cvs_client_sendfile;
127:
128: if (argc > 0)
129: cvs_file_run(argc, argv, &cr);
130: else
131: cvs_file_run(1, &arg, &cr);
1.99 xsa 132:
133: if (!(flags & CR_RECURSE_DIRS))
134: cvs_client_send_request("Argument -l");
1.80 joris 135:
136: cvs_client_send_request("Argument -m%s", logmsg);
137:
138: cvs_client_send_files(argv, argc);
139: cvs_client_senddir(".");
140: cvs_client_send_request("ci");
141: cvs_client_get_responses();
1.86 joris 142: } else {
143: cr.fileproc = cvs_commit_local;
144: cvs_file_walklist(&files_affected, &cr);
145: cvs_file_freelist(&files_affected);
1.80 joris 146: }
1.1 jfb 147:
1.18 joris 148: return (0);
149: }
1.1 jfb 150:
1.55 joris 151: void
1.86 joris 152: cvs_commit_check_files(struct cvs_file *cf)
1.18 joris 153: {
1.86 joris 154: cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path);
1.44 joris 155:
1.104 joris 156: cvs_file_classify(cf, NULL);
1.59 joris 157:
158: if (cf->file_type == CVS_DIR) {
159: if (verbosity > 1)
160: cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
161: return;
162: }
1.32 joris 163:
1.55 joris 164: if (cf->file_status == FILE_CONFLICT ||
1.79 joris 165: cf->file_status == FILE_UNLINK) {
1.55 joris 166: conflicts_found++;
1.79 joris 167: return;
168: }
1.57 joris 169:
1.63 joris 170: if (cf->file_status != FILE_REMOVED &&
171: update_has_conflict_markers(cf)) {
1.60 joris 172: cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from "
173: "merging, please fix these first", cf->file_path);
174: conflicts_found++;
1.79 joris 175: return;
1.60 joris 176: }
177:
1.57 joris 178: if (cf->file_status == FILE_MERGE ||
1.72 joris 179: cf->file_status == FILE_PATCH ||
1.79 joris 180: cf->file_status == FILE_CHECKOUT ||
181: cf->file_status == FILE_LOST) {
1.57 joris 182: cvs_log(LP_ERR, "conflict: %s is not up-to-date",
183: cf->file_path);
184: conflicts_found++;
1.79 joris 185: return;
1.57 joris 186: }
1.55 joris 187:
188: if (cf->file_status == FILE_ADDED ||
189: cf->file_status == FILE_REMOVED ||
190: cf->file_status == FILE_MODIFIED)
191: cvs_file_get(cf->file_path, &files_affected);
1.86 joris 192:
193: switch (cf->file_status) {
194: case FILE_ADDED:
195: cvs_file_get(cf->file_path, &files_added);
196: break;
197: case FILE_REMOVED:
198: cvs_file_get(cf->file_path, &files_removed);
199: break;
200: case FILE_MODIFIED:
201: cvs_file_get(cf->file_path, &files_modified);
202: break;
203: }
1.55 joris 204: }
1.1 jfb 205:
1.55 joris 206: void
207: cvs_commit_local(struct cvs_file *cf)
208: {
1.91 joris 209: BUF *b, *d;
1.107 ! joris 210: int isnew, histtype;
1.93 joris 211: RCSNUM *head;
1.102 xsa 212: int openflags, rcsflags;
1.91 joris 213: char rbuf[24], nbuf[24];
1.56 joris 214: CVSENTRIES *entlist;
1.100 otto 215: char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN];
1.17 joris 216:
1.55 joris 217: cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path);
1.104 joris 218: cvs_file_classify(cf, NULL);
1.69 joris 219:
220: if (cvs_noexec == 1)
221: return;
1.35 xsa 222:
1.64 joris 223: if (cf->file_type != CVS_FILE)
224: fatal("cvs_commit_local: '%s' is not a file", cf->file_path);
225:
1.107 ! joris 226: if (cf->file_status != FILE_MODIFIED &&
! 227: cf->file_status != FILE_ADDED &&
! 228: cf->file_status != FILE_REMOVED) {
! 229: cvs_log(LP_ERR, "skipping bogus file `%s'", cf->file_path);
! 230: return;
! 231: }
! 232:
1.56 joris 233: if (cf->file_status == FILE_MODIFIED ||
1.66 joris 234: cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED
1.93 joris 235: && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) {
236: head = rcs_head_get(cf->file_rcs);
237: rcsnum_tostr(head, rbuf, sizeof(rbuf));
238: rcsnum_free(head);
239: } else {
1.61 joris 240: strlcpy(rbuf, "Non-existent", sizeof(rbuf));
1.93 joris 241: }
1.61 joris 242:
1.67 joris 243: isnew = 0;
1.66 joris 244: if (cf->file_status == FILE_ADDED) {
1.67 joris 245: isnew = 1;
1.66 joris 246: rcsflags = RCS_CREATE;
247: openflags = O_CREAT | O_TRUNC | O_WRONLY;
248: if (cf->file_rcs != NULL) {
1.106 niallo 249: if (cf->in_attic == 0)
1.66 joris 250: cvs_log(LP_ERR, "warning: expected %s "
251: "to be in the Attic", cf->file_path);
252:
253: if (cf->file_rcs->rf_dead == 0)
254: cvs_log(LP_ERR, "warning: expected %s "
255: "to be dead", cf->file_path);
256:
257: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
1.102 xsa 258: (void)xsnprintf(rcsfile, MAXPATHLEN, "%s/%s%s",
1.66 joris 259: repo, cf->file_name, RCS_FILE_EXT);
260:
261: if (rename(cf->file_rpath, rcsfile) == -1)
262: fatal("cvs_commit_local: failed to move %s "
263: "outside the Attic: %s", cf->file_path,
264: strerror(errno));
265:
266: xfree(cf->file_rpath);
267: cf->file_rpath = xstrdup(rcsfile);
268:
269: rcsflags = RCS_READ | RCS_PARSE_FULLY;
270: openflags = O_RDONLY;
271: rcs_close(cf->file_rcs);
1.67 joris 272: isnew = 0;
1.66 joris 273: }
274:
275: cf->repo_fd = open(cf->file_rpath, openflags);
1.61 joris 276: if (cf->repo_fd < 0)
277: fatal("cvs_commit_local: %s", strerror(errno));
278:
279: cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd,
1.103 otto 280: rcsflags, 0444);
1.61 joris 281: if (cf->file_rcs == NULL)
282: fatal("cvs_commit_local: failed to create RCS file "
283: "for %s", cf->file_path);
1.71 xsa 284:
285: commit_desc_set(cf);
1.61 joris 286: }
1.36 joris 287:
1.77 reyk 288: if (verbosity > 1) {
289: cvs_printf("Checking in %s:\n", cf->file_path);
290: cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path);
291: cvs_printf("old revision: %s; ", rbuf);
292: }
1.7 jfb 293:
1.67 joris 294: if (isnew == 0)
1.61 joris 295: d = commit_diff_file(cf);
1.7 jfb 296:
1.56 joris 297: if (cf->file_status == FILE_REMOVED) {
1.98 joris 298: b = rcs_rev_getbuf(cf->file_rcs, cf->file_rcs->rf_head, 0);
1.56 joris 299: if (b == NULL)
300: fatal("cvs_commit_local: failed to get HEAD");
1.61 joris 301: } else {
1.73 joris 302: if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 303: fatal("cvs_commit_local: failed to load file");
304: }
1.7 jfb 305:
1.67 joris 306: if (isnew == 0) {
1.61 joris 307: if (rcs_deltatext_set(cf->file_rcs,
308: cf->file_rcs->rf_head, d) == -1)
309: fatal("cvs_commit_local: failed to set delta");
310: }
1.3 krapht 311:
1.55 joris 312: if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1)
313: fatal("cvs_commit_local: failed to add new revision");
1.3 krapht 314:
1.91 joris 315: if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, b) == -1)
1.55 joris 316: fatal("cvs_commit_local: failed to set new HEAD delta");
1.3 krapht 317:
1.56 joris 318: if (cf->file_status == FILE_REMOVED) {
319: if (rcs_state_set(cf->file_rcs,
320: cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1)
321: fatal("cvs_commit_local: failed to set state");
1.68 joris 322: }
323:
324: if (cf->file_rcs->rf_branch != NULL) {
325: rcsnum_free(cf->file_rcs->rf_branch);
326: cf->file_rcs->rf_branch = NULL;
1.101 xsa 327: }
328:
329: if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) {
330: int kflag;
331:
332: kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
333: rcs_kwexp_set(cf->file_rcs, kflag);
1.56 joris 334: }
335:
1.55 joris 336: rcs_write(cf->file_rcs);
1.6 jfb 337:
1.56 joris 338: if (cf->file_status == FILE_REMOVED) {
1.77 reyk 339: strlcpy(nbuf, "Removed", sizeof(nbuf));
1.61 joris 340: } else if (cf->file_status == FILE_ADDED) {
1.66 joris 341: if (cf->file_rcs->rf_dead == 1)
1.77 reyk 342: strlcpy(nbuf, "Initial Revision", sizeof(nbuf));
1.63 joris 343: else
344: rcsnum_tostr(cf->file_rcs->rf_head,
1.77 reyk 345: nbuf, sizeof(nbuf));
1.56 joris 346: } else if (cf->file_status == FILE_MODIFIED) {
1.77 reyk 347: rcsnum_tostr(cf->file_rcs->rf_head, nbuf, sizeof(nbuf));
1.56 joris 348: }
349:
1.77 reyk 350: if (verbosity > 1)
351: cvs_printf("new revision: %s\n", nbuf);
1.3 krapht 352:
1.55 joris 353: (void)unlink(cf->file_path);
354: (void)close(cf->fd);
355: cf->fd = -1;
1.56 joris 356:
357: if (cf->file_status != FILE_REMOVED) {
1.95 joris 358: cvs_checkout_file(cf, cf->file_rcs->rf_head, CO_COMMIT);
1.56 joris 359: } else {
360: entlist = cvs_ent_open(cf->file_wd);
361: cvs_ent_remove(entlist, cf->file_name);
362: cvs_ent_close(entlist, ENT_SYNC);
1.64 joris 363:
364: cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN);
365:
1.102 xsa 366: (void)xsnprintf(attic, MAXPATHLEN, "%s/%s",
367: repo, CVS_PATH_ATTIC);
1.64 joris 368:
369: if (mkdir(attic, 0755) == -1 && errno != EEXIST)
370: fatal("cvs_commit_local: failed to create Attic");
371:
1.102 xsa 372: (void)xsnprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo,
1.64 joris 373: CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT);
374:
375: if (rename(cf->file_rpath, attic) == -1)
376: fatal("cvs_commit_local: failed to move %s to Attic",
377: cf->file_path);
378:
1.85 joris 379: if (cvs_server_active == 1)
380: cvs_server_update_entry("Remove-entry", cf);
1.56 joris 381: }
1.3 krapht 382:
1.77 reyk 383: if (verbosity > 1)
384: cvs_printf("done\n");
385: else {
386: cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s",
387: cf->file_path, rbuf, nbuf);
388: }
1.107 ! joris 389:
! 390: switch (cf->file_status) {
! 391: case FILE_MODIFIED:
! 392: histtype = CVS_HISTORY_COMMIT_MODIFIED;
! 393: break;
! 394: case FILE_ADDED:
! 395: histtype = CVS_HISTORY_COMMIT_ADDED;
! 396: break;
! 397: case FILE_REMOVED:
! 398: histtype = CVS_HISTORY_COMMIT_REMOVED;
! 399: break;
! 400: }
! 401:
! 402: cvs_history_add(histtype, cf, NULL);
1.39 xsa 403: }
404:
1.91 joris 405: static BUF *
1.55 joris 406: commit_diff_file(struct cvs_file *cf)
1.39 xsa 407: {
1.91 joris 408: char *p1, *p2;
1.97 joris 409: BUF *b1, *b2;
410:
411: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
1.39 xsa 412:
1.63 joris 413: if (cf->file_status == FILE_MODIFIED ||
414: cf->file_status == FILE_ADDED) {
1.73 joris 415: if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.56 joris 416: fatal("commit_diff_file: failed to load '%s'",
417: cf->file_path);
1.97 joris 418: cvs_buf_write_stmp(b1, p1, NULL);
419: cvs_buf_free(b1);
1.63 joris 420: } else {
1.97 joris 421: rcs_rev_write_stmp(cf->file_rcs, cf->file_rcs->rf_head, p1, 0);
1.56 joris 422: }
1.3 krapht 423:
1.97 joris 424: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
425: rcs_rev_write_stmp(cf->file_rcs, cf->file_rcs->rf_head, p2, 0);
1.55 joris 426:
1.97 joris 427: if ((b2 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
1.55 joris 428: fatal("commit_diff_file: failed to create diff buf");
429:
430: diff_format = D_RCSDIFF;
1.97 joris 431: if (cvs_diffreg(p1, p2, b2) == D_ERROR)
1.55 joris 432: fatal("commit_diff_file: failed to get RCS patch");
1.96 joris 433:
434: xfree(p1);
435: xfree(p2);
1.55 joris 436:
1.97 joris 437: return (b2);
1.71 xsa 438: }
439:
440: static void
441: commit_desc_set(struct cvs_file *cf)
442: {
443: BUF *bp;
1.102 xsa 444: int fd;
1.100 otto 445: char desc_path[MAXPATHLEN], *desc;
1.71 xsa 446:
1.102 xsa 447: (void)xsnprintf(desc_path, MAXPATHLEN, "%s/%s%s",
1.71 xsa 448: CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT);
449:
1.100 otto 450: if ((fd = open(desc_path, O_RDONLY)) == -1)
1.71 xsa 451: return;
452:
1.78 joris 453: bp = cvs_buf_load_fd(fd, BUF_AUTOEXT);
1.71 xsa 454: cvs_buf_putc(bp, '\0');
455: desc = cvs_buf_release(bp);
456:
457: rcs_desc_set(cf->file_rcs, desc);
458:
1.76 joris 459: (void)close(fd);
1.71 xsa 460: (void)cvs_unlink(desc_path);
461:
462: xfree(desc);
1.1 jfb 463: }
![[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