1 /* $OpenBSD: commit.c,v 1.60 2006/05/28 01:24:28 joris Exp $ */ 2 /* 3 * Copyright (c) 2006 Joris Vink <joris@openbsd.org> 4 * 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. 8 * 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. 16 */ 17 18 #include "includes.h" 19 20 #include "cvs.h" 21 #include "diff.h" 22 #include "log.h" 23 #include "proto.h" 24 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; 34 35 struct cvs_cmd cvs_cmd_commit = { 36 CVS_OP_COMMIT, CVS_REQ_CI, "commit", 37 { "ci", "com" }, 38 "Check files into the repository", 39 "[-flR] [-F logfile | -m msg] [-r rev] ...", 40 "F:flm:Rr:", 41 NULL, 42 cvs_commit 43 }; 44 45 int 46 cvs_commit(int argc, char **argv) 47 { 48 int ch; 49 char *arg = "."; 50 int flags; 51 struct cvs_recursion cr; 52 53 flags = CR_RECURSE_DIRS; 54 55 while ((ch = getopt(argc, argv, cvs_cmd_commit.cmd_opts)) != -1) { 56 switch (ch) { 57 case 'f': 58 break; 59 case 'F': 60 break; 61 case 'l': 62 flags &= ~CR_RECURSE_DIRS; 63 break; 64 case 'm': 65 logmsg = xstrdup(optarg); 66 break; 67 case 'r': 68 break; 69 case 'R': 70 break; 71 default: 72 fatal("%s", cvs_cmd_commit.cmd_synopsis); 73 } 74 } 75 76 argc -= optind; 77 argv += optind; 78 79 if (logmsg == NULL) 80 fatal("please use -m to specify a log message for now"); 81 82 TAILQ_INIT(&files_affected); 83 conflicts_found = 0; 84 85 cr.enterdir = NULL; 86 cr.leavedir = NULL; 87 cr.local = cvs_commit_check_conflicts; 88 cr.remote = NULL; 89 cr.flags = flags; 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); 103 104 return (0); 105 } 106 107 void 108 cvs_commit_check_conflicts(struct cvs_file *cf) 109 { 110 cvs_log(LP_TRACE, "cvs_commit_check_conflicts(%s)", cf->file_path); 111 112 /* 113 * cvs_file_classify makes the noise for us 114 * XXX - we want that? 115 */ 116 cvs_file_classify(cf); 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 } 123 124 if (cf->file_status == FILE_CONFLICT || 125 cf->file_status == FILE_LOST || 126 cf->file_status == FILE_UNLINK) 127 conflicts_found++; 128 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 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 } 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 } 147 148 void 149 cvs_commit_local(struct cvs_file *cf) 150 { 151 BUF *b; 152 char *d, *f, rbuf[16]; 153 CVSENTRIES *entlist; 154 155 cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path); 156 cvs_file_classify(cf); 157 158 if (cf->file_status == FILE_MODIFIED || 159 cf->file_status == FILE_REMOVED) 160 rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf)); 161 162 cvs_printf("Checking in %s:\n", cf->file_path); 163 cvs_printf("%s <- %s\n", cf->file_rpath, cf->file_path); 164 cvs_printf("old revision: %s; ", rbuf); 165 166 d = commit_diff_file(cf); 167 168 if (cf->file_status == FILE_REMOVED) { 169 b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head); 170 if (b == NULL) 171 fatal("cvs_commit_local: failed to get HEAD"); 172 } else if (cf->file_status == FILE_MODIFIED) { 173 if ((b = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL) 174 fatal("cvs_commit_local: failed to load file"); 175 } 176 177 cvs_buf_putc(b, '\0'); 178 f = cvs_buf_release(b); 179 180 if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, d) == -1) 181 fatal("cvs_commit_local: failed to set delta"); 182 183 if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, logmsg, -1, NULL) == -1) 184 fatal("cvs_commit_local: failed to add new revision"); 185 186 if (rcs_deltatext_set(cf->file_rcs, cf->file_rcs->rf_head, f) == -1) 187 fatal("cvs_commit_local: failed to set new HEAD delta"); 188 189 xfree(f); 190 xfree(d); 191 192 if (cf->file_status == FILE_REMOVED) { 193 if (rcs_state_set(cf->file_rcs, 194 cf->file_rcs->rf_head, RCS_STATE_DEAD) == -1) 195 fatal("cvs_commit_local: failed to set state"); 196 } 197 198 rcs_write(cf->file_rcs); 199 200 if (cf->file_status == FILE_REMOVED) { 201 strlcpy(rbuf, "Removed", sizeof(rbuf)); 202 } else if (cf->file_status == FILE_MODIFIED) { 203 rcsnum_tostr(cf->file_rcs->rf_head, rbuf, sizeof(rbuf)); 204 } 205 206 cvs_printf("new revision: %s\n", rbuf); 207 208 (void)unlink(cf->file_path); 209 (void)close(cf->fd); 210 cf->fd = -1; 211 212 if (cf->file_status != FILE_REMOVED) { 213 b = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head); 214 if (b == NULL) 215 fatal("cvs_commit_local: failed to get HEAD"); 216 217 cvs_checkout_file(cf, cf->file_rcs->rf_head, b, 0); 218 } else { 219 entlist = cvs_ent_open(cf->file_wd); 220 cvs_ent_remove(entlist, cf->file_name); 221 cvs_ent_close(entlist, ENT_SYNC); 222 } 223 224 cvs_printf("done\n"); 225 226 } 227 228 static char * 229 commit_diff_file(struct cvs_file *cf) 230 { 231 char*delta, *p1, *p2; 232 BUF *b1, *b2, *b3; 233 234 if (cf->file_status == FILE_MODIFIED) { 235 if ((b1 = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL) 236 fatal("commit_diff_file: failed to load '%s'", 237 cf->file_path); 238 } else if (cf->file_status == FILE_REMOVED) { 239 b1 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head); 240 if (b1 == NULL) 241 fatal("commit_diff_file: failed to load HEAD"); 242 b1 = rcs_kwexp_buf(b1, cf->file_rcs, cf->file_rcs->rf_head); 243 } 244 245 if ((b2 = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head)) == NULL) 246 fatal("commit_diff_file: failed to load HEAD for '%s'", 247 cf->file_path); 248 249 if ((b3 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL) 250 fatal("commit_diff_file: failed to create diff buf"); 251 252 (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir); 253 cvs_buf_write_stmp(b1, p1, 0600, NULL); 254 cvs_buf_free(b1); 255 256 (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir); 257 cvs_buf_write_stmp(b2, p2, 0600, NULL); 258 cvs_buf_free(b2); 259 260 diff_format = D_RCSDIFF; 261 if (cvs_diffreg(p1, p2, b3) == D_ERROR) 262 fatal("commit_diff_file: failed to get RCS patch"); 263 264 cvs_buf_putc(b3, '\0'); 265 delta = cvs_buf_release(b3); 266 return (delta); 267 } 268