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