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