/* $OpenBSD: commit.c,v 1.105 2007/02/22 06:42:09 otto Exp $ */ /* * Copyright (c) 2006 Joris Vink * Copyright (c) 2006 Xavier Santolaria * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include #include #include #include #include #include "cvs.h" #include "diff.h" #include "remote.h" void cvs_commit_local(struct cvs_file *); void cvs_commit_check_files(struct cvs_file *); static BUF *commit_diff_file(struct cvs_file *); static void commit_desc_set(struct cvs_file *); struct cvs_flisthead files_affected; struct cvs_flisthead files_added; struct cvs_flisthead files_removed; struct cvs_flisthead files_modified; int conflicts_found; char *logmsg = NULL; struct cvs_cmd cvs_cmd_commit = { CVS_OP_COMMIT, 0, "commit", { "ci", "com" }, "Check files into the repository", "[-flR] [-F logfile | -m msg] [-r rev] ...", "F:flm:Rr:", NULL, cvs_commit }; int cvs_commit(int argc, char **argv) { int ch; char *arg = "."; int flags; struct cvs_recursion cr; flags = CR_RECURSE_DIRS; while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) { switch (ch) { case 'F': logmsg = cvs_logmsg_read(optarg); break; case 'f': break; case 'l': flags &= ~CR_RECURSE_DIRS; break; case 'm': logmsg = xstrdup(optarg); break; case 'R': break; case 'r': break; default: fatal("%s", cvs_cmd_commit.cmd_synopsis); } } argc -= optind; argv += optind; TAILQ_INIT(&files_affected); TAILQ_INIT(&files_added); TAILQ_INIT(&files_removed); TAILQ_INIT(&files_modified); conflicts_found = 0; cr.enterdir = NULL; cr.leavedir = NULL; cr.fileproc = cvs_commit_check_files; cr.flags = flags; if (argc > 0) cvs_file_run(argc, argv, &cr); else cvs_file_run(1, &arg, &cr); if (conflicts_found != 0) fatal("%d conflicts found, please correct these first", conflicts_found); if (TAILQ_EMPTY(&files_affected)) return (0); if (logmsg == NULL && cvs_server_active == 0) { logmsg = cvs_logmsg_create(&files_added, &files_removed, &files_modified); } if (logmsg == NULL) fatal("This shouldnt happen, honestly!"); cvs_file_freelist(&files_modified); cvs_file_freelist(&files_removed); cvs_file_freelist(&files_added); if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) { cvs_client_connect_to_server(); cr.fileproc = cvs_client_sendfile; if (argc > 0) cvs_file_run(argc, argv, &cr); else cvs_file_run(1, &arg, &cr); if (!(flags & CR_RECURSE_DIRS)) cvs_client_send_request("Argument -l"); cvs_client_send_request("Argument -m%s", logmsg); cvs_client_send_files(argv, argc); cvs_client_senddir("."); cvs_client_send_request("ci"); cvs_client_get_responses(); } else { cr.fileproc = cvs_commit_local; cvs_file_walklist(&files_affected, &cr); cvs_file_freelist(&files_affected); } return (0); } void cvs_commit_check_files(struct cvs_file *cf) { cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path); cvs_file_classify(cf, NULL); if (cf->file_type == CVS_DIR) { if (verbosity > 1) cvs_log(LP_NOTICE, "Examining %s", cf->file_path); return; } if (cf->file_status == FILE_CONFLICT || cf->file_status == FILE_UNLINK) { conflicts_found++; return; } if (cf->file_status != FILE_REMOVED && update_has_conflict_markers(cf)) { cvs_log(LP_ERR, "conflict: unresolved conflicts in %s from " "merging, please fix these first", cf->file_path); conflicts_found++; return; } if (cf->file_status == FILE_MERGE || cf->file_status == FILE_PATCH || cf->file_status == FILE_CHECKOUT || cf->file_status == FILE_LOST) { cvs_log(LP_ERR, "conflict: %s is not up-to-date", cf->file_path); conflicts_found++; return; } if (cf->file_status == FILE_ADDED || cf->file_status == FILE_REMOVED || cf->file_status == FILE_MODIFIED) cvs_file_get(cf->file_path, &files_affected); switch (cf->file_status) { case FILE_ADDED: cvs_file_get(cf->file_path, &files_added); break; case FILE_REMOVED: cvs_file_get(cf->file_path, &files_removed); break; case FILE_MODIFIED: cvs_file_get(cf->file_path, &files_modified); break; } } void cvs_commit_local(struct cvs_file *cf) { BUF *b, *d; int isnew; RCSNUM *head; int openflags, rcsflags; char rbuf[24], nbuf[24]; CVSENTRIES *entlist; char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN]; cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path); cvs_file_classify(cf, NULL); if (cvs_noexec == 1) return; if (cf->file_type != CVS_FILE) fatal("cvs_commit_local: '%s' is not a file", cf->file_path); if (cf->file_status == FILE_MODIFIED || cf->file_status == FILE_REMOVED || (cf->file_status == FILE_ADDED && cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1)) { head = rcs_head_get(cf->file_rcs); rcsnum_tostr(head, rbuf, sizeof(rbuf)); rcsnum_free(head); } else { strlcpy(rbuf, "Non-existent", sizeof(rbuf)); } isnew = 0; if (cf->file_status == FILE_ADDED) { isnew = 1; rcsflags = RCS_CREATE; openflags = O_CREAT | O_TRUNC | O_WRONLY; if (cf->file_rcs != NULL) { if (cf->file_rcs->rf_inattic == 0) cvs_log(LP_ERR, "warning: expected %s " "to be in the Attic", cf->file_path); if (cf->file_rcs->rf_dead == 0) cvs_log(LP_ERR, "warning: expected %s " "to be dead", cf->file_path); cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN); (void)xsnprintf(rcsfile, MAXPATHLEN, "%s/%s%s", repo, cf->file_name, RCS_FILE_EXT); if (rename(cf->file_rpath, rcsfile) == -1) fatal("cvs_commit_local: failed to move %s " "outside the Attic: %s", cf->file_path, strerror(errno)); xfree(cf->file_rpath); cf->file_rpath = xstrdup(rcsfile); rcsflags = RCS_READ | RCS_PARSE_FULLY; openflags = O_RDONLY; rcs_close(cf->file_rcs); isnew = 0; } cf->repo_fd = open(cf->file_rpath, openflags); if (cf->repo_fd < 0) fatal("cvs_commit_local: %s", strerror(errno)); cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd, rcsflags, 0444); if (cf->file_rcs == NULL) fatal("cvs_commit_local: failed to create RCS file " "for %s", cf->file_path); commit_desc_set(cf); } if (verbosity > 1) { cvs_printf("Checking in %s:\n", cf->file_path); cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path); cvs_printf("old revision: %s; ", rbuf); } if (isnew == 0) d = commit_diff_file(cf); if (cf->file_status == FILE_REMOVED) { b = rcs_rev_getbuf(cf->file_rcs, cf->file_rcs->rf_head, 0); if (b == NULL) fatal("cvs_commit_local: failed to get HEAD"); } else { if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL) fatal("cvs_commit_local: failed to load file"); } if (isnew == 0) { if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, d) == -1) fatal("cvs_commit_local: failed to set delta"); } if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1) fatal("cvs_commit_local: failed to add new revision"); if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, b) == -1) fatal("cvs_commit_local: failed to set new HEAD delta"); if (cf->file_status == FILE_REMOVED) { if (rcs_state_set(cf->file_rcs, cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1) fatal("cvs_commit_local: failed to set state"); } if (cf->file_rcs->rf_branch != NULL) { rcsnum_free(cf->file_rcs->rf_branch); cf->file_rcs->rf_branch = NULL; } if (cf->file_status == FILE_ADDED && cf->file_ent->ce_opts != NULL) { int kflag; kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2); rcs_kwexp_set(cf->file_rcs, kflag); } rcs_write(cf->file_rcs); if (cf->file_status == FILE_REMOVED) { strlcpy(nbuf, "Removed", sizeof(nbuf)); } else if (cf->file_status == FILE_ADDED) { if (cf->file_rcs->rf_dead == 1) strlcpy(nbuf, "Initial Revision", sizeof(nbuf)); else rcsnum_tostr(cf->file_rcs->rf_head, nbuf, sizeof(nbuf)); } else if (cf->file_status == FILE_MODIFIED) { rcsnum_tostr(cf->file_rcs->rf_head, nbuf, sizeof(nbuf)); } if (verbosity > 1) cvs_printf("new revision: %s\n", nbuf); (void)unlink(cf->file_path); (void)close(cf->fd); cf->fd = -1; if (cf->file_status != FILE_REMOVED) { cvs_checkout_file(cf, cf->file_rcs->rf_head, CO_COMMIT); } else { entlist = cvs_ent_open(cf->file_wd); cvs_ent_remove(entlist, cf->file_name); cvs_ent_close(entlist, ENT_SYNC); cvs_get_repository_path(cf->file_wd, repo, MAXPATHLEN); (void)xsnprintf(attic, MAXPATHLEN, "%s/%s", repo, CVS_PATH_ATTIC); if (mkdir(attic, 0755) == -1 && errno != EEXIST) fatal("cvs_commit_local: failed to create Attic"); (void)xsnprintf(attic, MAXPATHLEN, "%s/%s/%s%s", repo, CVS_PATH_ATTIC, cf->file_name, RCS_FILE_EXT); if (rename(cf->file_rpath, attic) == -1) fatal("cvs_commit_local: failed to move %s to Attic", cf->file_path); if (cvs_server_active == 1) cvs_server_update_entry("Remove-entry", cf); } if (verbosity > 1) cvs_printf("done\n"); else { cvs_log(LP_NOTICE, "checking in '%s'; revision %s -> %s", cf->file_path, rbuf, nbuf); } } static BUF * commit_diff_file(struct cvs_file *cf) { char *p1, *p2; BUF *b1, *b2; (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir); if (cf->file_status == FILE_MODIFIED || cf->file_status == FILE_ADDED) { if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL) fatal("commit_diff_file: failed to load '%s'", cf->file_path); cvs_buf_write_stmp(b1, p1, NULL); cvs_buf_free(b1); } else { rcs_rev_write_stmp(cf->file_rcs, cf->file_rcs->rf_head, p1, 0); } (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir); rcs_rev_write_stmp(cf->file_rcs, cf->file_rcs->rf_head, p2, 0); if ((b2 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL) fatal("commit_diff_file: failed to create diff buf"); diff_format = D_RCSDIFF; if (cvs_diffreg(p1, p2, b2) == D_ERROR) fatal("commit_diff_file: failed to get RCS patch"); xfree(p1); xfree(p2); return (b2); } static void commit_desc_set(struct cvs_file *cf) { BUF *bp; int fd; char desc_path[MAXPATHLEN], *desc; (void)xsnprintf(desc_path, MAXPATHLEN, "%s/%s%s", CVS_PATH_CVSDIR, cf->file_name, CVS_DESCR_FILE_EXT); if ((fd = open(desc_path, O_RDONLY)) == -1) return; bp = cvs_buf_load_fd(fd, BUF_AUTOEXT); cvs_buf_putc(bp, '\0'); desc = cvs_buf_release(bp); rcs_desc_set(cf->file_rcs, desc); (void)close(fd); (void)cvs_unlink(desc_path); xfree(desc); }