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