Annotation of src/usr.bin/cvs/update.c, Revision 1.159
1.159 ! joris 1: /* $OpenBSD: update.c,v 1.158 2009/03/21 11:16:28 joris Exp $ */
1.1 jfb 2: /*
1.59 joris 3: * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
1.1 jfb 4: *
1.59 joris 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.
1.1 jfb 8: *
1.59 joris 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.
1.1 jfb 16: */
17:
1.97 otto 18: #include <sys/stat.h>
19:
20: #include <errno.h>
21: #include <fcntl.h>
22: #include <string.h>
23: #include <unistd.h>
1.1 jfb 24:
25: #include "cvs.h"
1.59 joris 26: #include "diff.h"
1.80 joris 27: #include "remote.h"
1.1 jfb 28:
1.60 joris 29: int prune_dirs = 0;
1.108 joris 30: int print_stdout = 0;
1.63 joris 31: int build_dirs = 0;
1.124 tobias 32: int reset_option = 0;
33: int reset_tag = 0;
1.104 joris 34: char *cvs_specified_tag = NULL;
1.136 joris 35: char *cvs_join_rev1 = NULL;
36: char *cvs_join_rev2 = NULL;
1.63 joris 37:
1.119 tobias 38: static char *koptstr;
1.125 joris 39: static char *dateflag = NULL;
1.124 tobias 40: static int Aflag = 0;
1.119 tobias 41:
1.65 joris 42: static void update_clear_conflict(struct cvs_file *);
1.136 joris 43: static void update_join_file(struct cvs_file *);
1.65 joris 44:
1.152 joris 45: extern CVSENTRIES *current_list;
46:
1.29 jfb 47: struct cvs_cmd cvs_cmd_update = {
1.116 tobias 48: CVS_OP_UPDATE, CVS_USE_WDIR, "update",
1.29 jfb 49: { "up", "upd" },
50: "Bring work tree in sync with repository",
51: "[-ACdflPpR] [-D date | -r rev] [-I ign] [-j rev] [-k mode] "
52: "[-t id] ...",
1.106 joris 53: "ACD:dfI:j:k:lPpQqRr:t:u",
1.29 jfb 54: NULL,
1.59 joris 55: cvs_update
1.18 joris 56: };
1.2 jfb 57:
1.59 joris 58: int
59: cvs_update(int argc, char **argv)
1.1 jfb 60: {
1.18 joris 61: int ch;
1.59 joris 62: char *arg = ".";
1.61 joris 63: int flags;
1.59 joris 64: struct cvs_recursion cr;
1.2 jfb 65:
1.80 joris 66: flags = CR_RECURSE_DIRS;
1.61 joris 67:
1.59 joris 68: while ((ch = getopt(argc, argv, cvs_cmd_update.cmd_opts)) != -1) {
1.1 jfb 69: switch (ch) {
70: case 'A':
1.124 tobias 71: Aflag = 1;
72: if (koptstr == NULL)
73: reset_option = 1;
74: if (cvs_specified_tag == NULL)
75: reset_tag = 1;
1.24 joris 76: break;
1.1 jfb 77: case 'C':
1.126 joris 78: break;
1.1 jfb 79: case 'D':
1.125 joris 80: dateflag = optarg;
81: cvs_specified_date = cvs_date_parse(dateflag);
1.153 tobias 82: reset_tag = 0;
1.32 xsa 83: break;
1.1 jfb 84: case 'd':
1.63 joris 85: build_dirs = 1;
1.24 joris 86: break;
1.1 jfb 87: case 'f':
1.2 jfb 88: break;
1.35 xsa 89: case 'I':
90: break;
91: case 'j':
1.136 joris 92: if (cvs_join_rev1 == NULL)
93: cvs_join_rev1 = optarg;
94: else if (cvs_join_rev2 == NULL)
95: cvs_join_rev2 = optarg;
96: else
97: fatal("too many -j options");
1.35 xsa 98: break;
99: case 'k':
1.124 tobias 100: reset_option = 0;
1.119 tobias 101: koptstr = optarg;
102: kflag = rcs_kflag_get(koptstr);
103: if (RCS_KWEXP_INVAL(kflag)) {
104: cvs_log(LP_ERR,
1.143 tobias 105: "invalid RCS keyword expansion mode");
1.135 tobias 106: fatal("%s", cvs_cmd_update.cmd_synopsis);
1.119 tobias 107: }
1.35 xsa 108: break;
1.1 jfb 109: case 'l':
1.61 joris 110: flags &= ~CR_RECURSE_DIRS;
1.2 jfb 111: break;
1.1 jfb 112: case 'P':
1.60 joris 113: prune_dirs = 1;
1.24 joris 114: break;
1.1 jfb 115: case 'p':
1.108 joris 116: print_stdout = 1;
1.79 xsa 117: cvs_noexec = 1;
1.27 xsa 118: break;
1.1 jfb 119: case 'Q':
120: case 'q':
1.2 jfb 121: break;
1.1 jfb 122: case 'R':
1.115 tobias 123: flags |= CR_RECURSE_DIRS;
1.2 jfb 124: break;
1.1 jfb 125: case 'r':
1.124 tobias 126: reset_tag = 0;
1.104 joris 127: cvs_specified_tag = optarg;
1.106 joris 128: break;
129: case 'u':
1.1 jfb 130: break;
131: default:
1.59 joris 132: fatal("%s", cvs_cmd_update.cmd_synopsis);
1.1 jfb 133: }
1.32 xsa 134: }
135:
1.59 joris 136: argc -= optind;
137: argv += optind;
1.2 jfb 138:
1.80 joris 139: if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
140: cr.enterdir = cvs_update_enterdir;
1.118 tobias 141: cr.leavedir = prune_dirs ? cvs_update_leavedir : NULL;
1.80 joris 142: cr.fileproc = cvs_update_local;
143: flags |= CR_REPO;
144: } else {
1.82 joris 145: cvs_client_connect_to_server();
1.124 tobias 146: if (Aflag)
1.80 joris 147: cvs_client_send_request("Argument -A");
1.125 joris 148: if (dateflag != NULL)
149: cvs_client_send_request("Argument -D%s", dateflag);
1.80 joris 150: if (build_dirs)
151: cvs_client_send_request("Argument -d");
1.119 tobias 152: if (kflag)
153: cvs_client_send_request("Argument -k%s", koptstr);
1.80 joris 154: if (!(flags & CR_RECURSE_DIRS))
155: cvs_client_send_request("Argument -l");
156: if (prune_dirs)
157: cvs_client_send_request("Argument -P");
1.108 joris 158: if (print_stdout)
1.80 joris 159: cvs_client_send_request("Argument -p");
160:
1.110 joris 161: if (cvs_specified_tag != NULL)
162: cvs_client_send_request("Argument -r%s",
163: cvs_specified_tag);
164:
1.80 joris 165: cr.enterdir = NULL;
166: cr.leavedir = NULL;
167: cr.fileproc = cvs_client_sendfile;
168: }
169:
1.61 joris 170: cr.flags = flags;
1.49 joris 171:
1.59 joris 172: if (argc > 0)
173: cvs_file_run(argc, argv, &cr);
174: else
175: cvs_file_run(1, &arg, &cr);
1.80 joris 176:
177: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
178: cvs_client_send_files(argv, argc);
179: cvs_client_senddir(".");
180: cvs_client_send_request("update");
181: cvs_client_get_responses();
182: }
1.35 xsa 183:
1.24 joris 184: return (0);
185: }
1.2 jfb 186:
1.59 joris 187: void
188: cvs_update_enterdir(struct cvs_file *cf)
1.2 jfb 189: {
1.59 joris 190: CVSENTRIES *entlist;
1.145 tobias 191: char *dirtag, *entry, fpath[MAXPATHLEN];
1.59 joris 192:
193: cvs_log(LP_TRACE, "cvs_update_enterdir(%s)", cf->file_path);
194:
1.145 tobias 195: cvs_file_classify(cf, NULL);
1.59 joris 196:
1.63 joris 197: if (cf->file_status == DIR_CREATE && build_dirs == 1) {
1.145 tobias 198: cvs_parse_tagfile(cf->file_wd, &dirtag, NULL, NULL);
199: cvs_mkpath(cf->file_path, cvs_specified_tag != NULL ?
200: cvs_specified_tag : dirtag);
201: if (dirtag != NULL)
202: xfree(dirtag);
203:
1.59 joris 204: if ((cf->fd = open(cf->file_path, O_RDONLY)) == -1)
1.87 xsa 205: fatal("cvs_update_enterdir: `%s': %s",
206: cf->file_path, strerror(errno));
1.140 joris 207:
208: if (cvs_server_active == 1 && cvs_cmdop != CVS_OP_CHECKOUT)
209: cvs_server_clear_sticky(cf->file_path);
1.59 joris 210:
1.114 tobias 211: if (cvs_cmdop != CVS_OP_EXPORT) {
212: (void)xasprintf(&entry, "D/%s////", cf->file_name);
1.59 joris 213:
1.114 tobias 214: entlist = cvs_ent_open(cf->file_wd);
215: cvs_ent_add(entlist, entry);
216: xfree(entry);
217: }
1.94 xsa 218: } else if ((cf->file_status == DIR_CREATE && build_dirs == 0) ||
219: cf->file_status == FILE_UNKNOWN) {
1.67 joris 220: cf->file_status = FILE_SKIP;
1.124 tobias 221: } else if (reset_tag) {
1.104 joris 222: (void)xsnprintf(fpath, MAXPATHLEN, "%s/%s",
223: cf->file_path, CVS_PATH_TAG);
224: (void)unlink(fpath);
225: } else {
1.131 joris 226: if (cvs_specified_tag != NULL || cvs_specified_date != -1)
1.104 joris 227: cvs_write_tagfile(cf->file_path,
1.120 tobias 228: cvs_specified_tag, NULL);
1.60 joris 229: }
230: }
231:
232: void
233: cvs_update_leavedir(struct cvs_file *cf)
234: {
235: long base;
236: int nbytes;
1.81 xsa 237: int isempty;
1.60 joris 238: size_t bufsize;
239: struct stat st;
240: struct dirent *dp;
241: char *buf, *ebuf, *cp;
242: CVSENTRIES *entlist;
243:
1.67 joris 244: cvs_log(LP_TRACE, "cvs_update_leavedir(%s)", cf->file_path);
1.86 joris 245:
1.105 joris 246: if (cvs_server_active == 1 && !strcmp(cf->file_name, "."))
247: return;
1.69 joris 248:
1.158 joris 249: entlist = cvs_ent_open(cf->file_path);
250: if (!TAILQ_EMPTY(&(entlist->cef_ent))) {
251: isempty = 0;
252: goto prune_it;
253: }
254:
1.60 joris 255: if (fstat(cf->fd, &st) == -1)
256: fatal("cvs_update_leavedir: %s", strerror(errno));
257:
258: bufsize = st.st_size;
259: if (bufsize < st.st_blksize)
260: bufsize = st.st_blksize;
1.139 tobias 261:
262: if (st.st_size > SIZE_MAX)
1.151 joris 263: fatal("cvs_update_leavedir: %s: file size too big",
264: cf->file_name);
1.60 joris 265:
266: isempty = 1;
267: buf = xmalloc(bufsize);
268:
1.73 joris 269: if (lseek(cf->fd, 0, SEEK_SET) == -1)
1.60 joris 270: fatal("cvs_update_leavedir: %s", strerror(errno));
271:
272: while ((nbytes = getdirentries(cf->fd, buf, bufsize, &base)) > 0) {
273: ebuf = buf + nbytes;
274: cp = buf;
275:
276: while (cp < ebuf) {
277: dp = (struct dirent *)cp;
278: if (!strcmp(dp->d_name, ".") ||
279: !strcmp(dp->d_name, "..") ||
1.95 joris 280: dp->d_fileno == 0) {
1.60 joris 281: cp += dp->d_reclen;
282: continue;
283: }
284:
1.158 joris 285: if (strcmp(dp->d_name, CVS_PATH_CVSDIR))
1.60 joris 286: isempty = 0;
287:
288: if (isempty == 0)
289: break;
290:
291: cp += dp->d_reclen;
292: }
293: }
294:
295: if (nbytes == -1)
296: fatal("cvs_update_leavedir: %s", strerror(errno));
297:
298: xfree(buf);
299:
1.158 joris 300: prune_it:
1.151 joris 301: if ((isempty == 1 && prune_dirs == 1) ||
302: (cvs_server_active == 1 && cvs_cmdop == CVS_OP_CHECKOUT)) {
1.69 joris 303: /* XXX */
1.60 joris 304: cvs_rmdir(cf->file_path);
305:
1.114 tobias 306: if (cvs_server_active == 0 && cvs_cmdop != CVS_OP_EXPORT) {
1.88 joris 307: entlist = cvs_ent_open(cf->file_wd);
308: cvs_ent_remove(entlist, cf->file_name);
309: }
1.2 jfb 310: }
311: }
312:
1.59 joris 313: void
314: cvs_update_local(struct cvs_file *cf)
1.2 jfb 315: {
1.136 joris 316: CVSENTRIES *entlist;
1.133 tobias 317: int ent_kflag, rcs_kflag, ret, flags;
1.136 joris 318: char *tag, rbuf[CVS_REV_BUFSZ];
1.59 joris 319:
320: cvs_log(LP_TRACE, "cvs_update_local(%s)", cf->file_path);
1.37 joris 321:
1.59 joris 322: if (cf->file_type == CVS_DIR) {
1.114 tobias 323: if (cf->file_status == FILE_SKIP) {
324: if (cvs_cmdop == CVS_OP_EXPORT && verbosity > 0)
325: cvs_printf("? %s\n", cf->file_path);
1.63 joris 326: return;
1.114 tobias 327: }
1.63 joris 328:
1.59 joris 329: if (cf->file_status != FILE_UNKNOWN &&
330: verbosity > 1)
1.159 ! joris 331: cvs_log(LP_ERR, "Updating %s", cf->file_path);
1.59 joris 332: return;
1.26 jfb 333: }
334:
1.70 joris 335: flags = 0;
1.112 joris 336: if (cvs_specified_tag != NULL)
337: tag = cvs_specified_tag;
1.122 joris 338: else if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
339: tag = cf->file_ent->ce_tag;
1.112 joris 340: else
341: tag = cvs_directory_tag;
342:
343: cvs_file_classify(cf, tag);
344:
1.146 tobias 345: if (kflag && cf->file_rcs != NULL)
1.119 tobias 346: rcs_kwexp_set(cf->file_rcs, kflag);
1.70 joris 347:
1.91 joris 348: if ((cf->file_status == FILE_UPTODATE ||
349: cf->file_status == FILE_MODIFIED) && cf->file_ent != NULL &&
1.124 tobias 350: cf->file_ent->ce_tag != NULL && reset_tag) {
1.91 joris 351: if (cf->file_status == FILE_MODIFIED)
352: cf->file_status = FILE_MERGE;
353: else
354: cf->file_status = FILE_CHECKOUT;
1.110 joris 355:
1.154 tobias 356: if ((cf->file_rcsrev = rcs_head_get(cf->file_rcs)) == NULL)
357: fatal("no head revision in RCS file for %s",
358: cf->file_path);
1.104 joris 359:
360: /* might be a bit overkill */
361: if (cvs_server_active == 1)
362: cvs_server_clear_sticky(cf->file_wd);
1.76 reyk 363: }
364:
1.154 tobias 365: if (print_stdout) {
366: if (cf->file_status != FILE_UNKNOWN && cf->file_rcs != NULL &&
1.155 tobias 367: cf->file_rcsrev != NULL && !cf->file_rcs->rf_dead &&
368: (cf->file_flags & FILE_HAS_TAG)) {
1.154 tobias 369: rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf));
370: if (verbosity > 1) {
371: cvs_log(LP_RCS, RCS_DIFF_DIV);
372: cvs_log(LP_RCS, "Checking out %s",
373: cf->file_path);
374: cvs_log(LP_RCS, "RCS: %s", cf->file_rpath);
375: cvs_log(LP_RCS, "VERS: %s", rbuf);
376: cvs_log(LP_RCS, "***************");
377: }
378: cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_DUMP);
1.109 tobias 379: }
1.76 reyk 380: return;
1.70 joris 381: }
1.45 joris 382:
1.119 tobias 383: if (cf->file_ent != NULL) {
384: if (cf->file_ent->ce_opts == NULL) {
385: if (kflag)
386: cf->file_status = FILE_CHECKOUT;
1.154 tobias 387: } else if (cf->file_rcs != NULL) {
1.133 tobias 388: if (strlen(cf->file_ent->ce_opts) < 3)
389: fatal("malformed option for file %s",
390: cf->file_path);
391:
392: ent_kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
393: rcs_kflag = rcs_kwexp_get(cf->file_rcs);
394:
395: if ((kflag && (kflag != ent_kflag)) ||
396: (reset_option && (ent_kflag != rcs_kflag)))
1.119 tobias 397: cf->file_status = FILE_CHECKOUT;
398: }
399: }
400:
1.59 joris 401: switch (cf->file_status) {
402: case FILE_UNKNOWN:
403: cvs_printf("? %s\n", cf->file_path);
1.45 joris 404: break;
1.59 joris 405: case FILE_MODIFIED:
1.65 joris 406: ret = update_has_conflict_markers(cf);
407: if (cf->file_ent->ce_conflict != NULL && ret == 1) {
1.59 joris 408: cvs_printf("C %s\n", cf->file_path);
1.65 joris 409: } else {
410: if (cf->file_ent->ce_conflict != NULL && ret == 0)
411: update_clear_conflict(cf);
1.59 joris 412: cvs_printf("M %s\n", cf->file_path);
1.65 joris 413: }
1.45 joris 414: break;
1.59 joris 415: case FILE_ADDED:
416: cvs_printf("A %s\n", cf->file_path);
1.45 joris 417: break;
1.59 joris 418: case FILE_REMOVED:
419: cvs_printf("R %s\n", cf->file_path);
1.45 joris 420: break;
1.59 joris 421: case FILE_CONFLICT:
422: cvs_printf("C %s\n", cf->file_path);
423: break;
424: case FILE_LOST:
425: case FILE_CHECKOUT:
426: case FILE_PATCH:
1.153 tobias 427: if (!reset_tag && (tag != NULL || cvs_specified_date != -1 ||
428: cvs_directory_date != -1 || (cf->file_ent != NULL &&
429: cf->file_ent->ce_tag != NULL)))
1.70 joris 430: flags = CO_SETSTICKY;
431:
1.112 joris 432: cvs_checkout_file(cf, cf->file_rcsrev, tag, flags);
1.65 joris 433: cvs_printf("U %s\n", cf->file_path);
1.100 joris 434: cvs_history_add(CVS_HISTORY_UPDATE_CO, cf, NULL);
1.59 joris 435: break;
436: case FILE_MERGE:
1.136 joris 437: d3rev1 = cf->file_ent->ce_rev;
438: d3rev2 = cf->file_rcsrev;
1.112 joris 439: cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_MERGE);
1.65 joris 440:
441: if (diff3_conflicts != 0) {
442: cvs_printf("C %s\n", cf->file_path);
1.100 joris 443: cvs_history_add(CVS_HISTORY_UPDATE_MERGED_ERR,
444: cf, NULL);
1.65 joris 445: } else {
446: update_clear_conflict(cf);
447: cvs_printf("M %s\n", cf->file_path);
1.100 joris 448: cvs_history_add(CVS_HISTORY_UPDATE_MERGED, cf, NULL);
1.65 joris 449: }
1.59 joris 450: break;
451: case FILE_UNLINK:
452: (void)unlink(cf->file_path);
1.102 joris 453: if (cvs_server_active == 1)
1.112 joris 454: cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_REMOVE);
1.59 joris 455: case FILE_REMOVE_ENTRY:
456: entlist = cvs_ent_open(cf->file_wd);
457: cvs_ent_remove(entlist, cf->file_name);
1.100 joris 458: cvs_history_add(CVS_HISTORY_UPDATE_REMOVE, cf, NULL);
1.110 joris 459: break;
460: case FILE_UPTODATE:
461: if (cvs_cmdop != CVS_OP_UPDATE)
462: break;
463:
1.156 joris 464: if (reset_tag != 1 && reset_option != 1)
1.130 joris 465: break;
466:
1.156 joris 467: if (cf->file_ent != NULL && cf->file_ent->ce_tag == NULL)
1.130 joris 468: break;
469:
470: if (cf->file_rcs->rf_dead != 1 &&
471: (cf->file_flags & FILE_HAS_TAG))
1.112 joris 472: cvs_checkout_file(cf, cf->file_rcsrev,
473: tag, CO_SETSTICKY);
1.45 joris 474: break;
475: default:
476: break;
477: }
1.136 joris 478:
479: if (cvs_join_rev1 != NULL)
480: update_join_file(cf);
1.65 joris 481: }
482:
483: static void
484: update_clear_conflict(struct cvs_file *cf)
485: {
486: CVSENTRIES *entlist;
1.148 tobias 487: char *entry, revbuf[CVS_REV_BUFSZ];
1.136 joris 488: char sticky[CVS_ENT_MAXLINELEN], opt[4];
1.65 joris 489:
490: cvs_log(LP_TRACE, "update_clear_conflict(%s)", cf->file_path);
491:
1.134 joris 492: rcsnum_tostr(cf->file_rcsrev, revbuf, sizeof(revbuf));
1.65 joris 493:
1.121 tobias 494: sticky[0] = '\0';
1.136 joris 495: if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
1.121 tobias 496: (void)xsnprintf(sticky, sizeof(sticky), "T%s",
497: cf->file_ent->ce_tag);
498:
1.136 joris 499: opt[0] = '\0';
500: if (cf->file_ent != NULL && cf->file_ent->ce_opts != NULL)
501: strlcpy(opt, cf->file_ent->ce_opts, sizeof(opt));
502:
1.65 joris 503: entry = xmalloc(CVS_ENT_MAXLINELEN);
1.148 tobias 504: cvs_ent_line_str(cf->file_name, revbuf, "Result of merge",
1.136 joris 505: opt[0] != '\0' ? opt : "", sticky, 0, 0,
1.129 xsa 506: entry, CVS_ENT_MAXLINELEN);
1.65 joris 507:
508: entlist = cvs_ent_open(cf->file_wd);
509: cvs_ent_add(entlist, entry);
510: xfree(entry);
511: }
512:
513: /*
514: * XXX - this is the way GNU cvs checks for outstanding conflicts
515: * in a file after a merge. It is a very very bad approach and
516: * should be looked at once opencvs is working decently.
517: */
518: int
519: update_has_conflict_markers(struct cvs_file *cf)
520: {
521: BUF *bp;
522: int conflict;
523: char *content;
524: struct cvs_line *lp;
525: struct cvs_lines *lines;
1.83 niallo 526: size_t len;
1.65 joris 527:
528: cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path);
1.78 joris 529:
1.157 joris 530: if (!(cf->file_flags & FILE_ON_DISK) || cf->file_ent == NULL)
1.78 joris 531: return (0);
1.65 joris 532:
1.132 tobias 533: bp = cvs_buf_load_fd(cf->fd);
1.65 joris 534:
535: cvs_buf_putc(bp, '\0');
1.83 niallo 536: len = cvs_buf_len(bp);
1.65 joris 537: content = cvs_buf_release(bp);
1.83 niallo 538: if ((lines = cvs_splitlines(content, len)) == NULL)
1.65 joris 539: fatal("update_has_conflict_markers: failed to split lines");
540:
541: conflict = 0;
542: TAILQ_FOREACH(lp, &(lines->l_lines), l_list) {
543: if (lp->l_line == NULL)
544: continue;
545:
546: if (!strncmp(lp->l_line, RCS_CONFLICT_MARKER1,
1.107 tobias 547: sizeof(RCS_CONFLICT_MARKER1) - 1) ||
1.65 joris 548: !strncmp(lp->l_line, RCS_CONFLICT_MARKER2,
1.107 tobias 549: sizeof(RCS_CONFLICT_MARKER2) - 1) ||
1.65 joris 550: !strncmp(lp->l_line, RCS_CONFLICT_MARKER3,
1.107 tobias 551: sizeof(RCS_CONFLICT_MARKER3) - 1)) {
1.65 joris 552: conflict = 1;
553: break;
554: }
555: }
556:
557: cvs_freelines(lines);
1.83 niallo 558: xfree(content);
1.65 joris 559: return (conflict);
1.136 joris 560: }
561:
562: void
563: update_join_file(struct cvs_file *cf)
564: {
565: int flag;
566: time_t told;
567: RCSNUM *rev1, *rev2;
568: const char *state1, *state2;
569: char rbuf[CVS_REV_BUFSZ], *jrev1, *jrev2, *p;
570:
571: rev1 = rev2 = NULL;
572: jrev1 = jrev2 = NULL;
573:
574: jrev1 = xstrdup(cvs_join_rev1);
575: if (cvs_join_rev2 != NULL)
576: jrev2 = xstrdup(cvs_join_rev2);
577:
578: if (jrev2 == NULL) {
579: jrev2 = jrev1;
580: jrev1 = NULL;
581: }
582:
583: told = cvs_specified_date;
584:
1.142 joris 585: if ((p = strchr(jrev2, ':')) != NULL) {
1.136 joris 586: (*p++) = '\0';
587: cvs_specified_date = cvs_date_parse(p);
588: }
589:
590: rev2 = rcs_translate_tag(jrev2, cf->file_rcs);
591: cvs_specified_date = told;
592:
593: if (jrev1 != NULL) {
1.142 joris 594: if ((p = strchr(jrev1, ':')) != NULL) {
1.136 joris 595: (*p++) = '\0';
596: cvs_specified_date = cvs_date_parse(p);
597: }
598:
599: rev1 = rcs_translate_tag(jrev1, cf->file_rcs);
600: cvs_specified_date = told;
601: } else {
602: if (rev2 == NULL)
603: goto out;
604:
605: rev1 = rcsnum_alloc();
606: rcsnum_cpy(cf->file_rcsrev, rev1, 0);
607: }
608:
609: state1 = state2 = RCS_STATE_DEAD;
610:
611: if (rev1 != NULL)
612: state1 = rcs_state_get(cf->file_rcs, rev1);
613: if (rev2 != NULL)
614: state2 = rcs_state_get(cf->file_rcs, rev2);
615:
616: if (rev2 == NULL || !strcmp(state2, RCS_STATE_DEAD)) {
617: if (rev1 == NULL || !strcmp(state1, RCS_STATE_DEAD))
618: goto out;
619:
620: if (cf->file_status == FILE_REMOVED ||
621: cf->file_rcs->rf_dead == 1)
622: goto out;
623:
624: if (cf->file_status == FILE_MODIFIED ||
625: cf->file_status == FILE_ADDED)
626: goto out;
627:
628: (void)unlink(cf->file_path);
629: (void)close(cf->fd);
630: cf->fd = -1;
631: cvs_remove_local(cf);
632: goto out;
633: }
634:
635: if (cf->file_ent != NULL) {
636: if (!rcsnum_cmp(cf->file_ent->ce_rev, rev2, 0))
637: goto out;
1.154 tobias 638: }
639:
640: if (cf->file_rcsrev == NULL) {
641: cvs_printf("non-mergable file: %s has no head revision!\n",
642: cf->file_path);
643: goto out;
1.136 joris 644: }
645:
646: if (rev1 == NULL || !strcmp(state1, RCS_STATE_DEAD)) {
1.157 joris 647: if (cf->file_flags & FILE_ON_DISK) {
1.136 joris 648: cvs_printf("%s exists but has been added in %s\n",
1.137 joris 649: cf->file_path, jrev2);
1.136 joris 650: } else {
1.137 joris 651: cvs_printf("A %s\n", cf->file_path);
1.136 joris 652: cvs_checkout_file(cf, cf->file_rcsrev, NULL, 0);
653: cvs_add_local(cf);
654: }
655: goto out;
656: }
657:
1.137 joris 658: if (!rcsnum_cmp(rev1, rev2, 0))
659: goto out;
660:
1.157 joris 661: if (!(cf->file_flags & FILE_ON_DISK)) {
1.137 joris 662: cvs_printf("%s does not exist but is present in %s\n",
663: cf->file_path, jrev2);
1.136 joris 664: goto out;
1.137 joris 665: }
1.136 joris 666:
667: flag = rcs_kwexp_get(cf->file_rcs);
668: if (flag & RCS_KWEXP_NONE) {
669: cvs_printf("non-mergable file: %s needs merge!\n",
670: cf->file_path);
671: goto out;
672: }
673:
674: cvs_printf("joining ");
675: rcsnum_tostr(rev1, rbuf, sizeof(rbuf));
676: cvs_printf("%s ", rbuf);
677:
678: rcsnum_tostr(rev2, rbuf, sizeof(rbuf));
679: cvs_printf("%s ", rbuf);
680:
681: rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf));
682: cvs_printf("into %s (%s)\n", cf->file_path, rbuf);
683:
684: d3rev1 = rev1;
685: d3rev2 = rev2;
686: cvs_checkout_file(cf, cf->file_rcsrev, NULL, CO_MERGE);
687:
1.138 joris 688: if (diff3_conflicts == 0)
1.136 joris 689: update_clear_conflict(cf);
690:
691: out:
692: if (rev1 != NULL)
693: rcsnum_free(rev1);
694: if (rev2 != NULL)
695: rcsnum_free(rev2);
696:
697: if (jrev1 != NULL)
698: xfree(jrev1);
699: if (jrev2 != NULL)
700: xfree(jrev2);
1.1 jfb 701: }
![[BACK]](/icons/back.gif){kind=icon}
Return to update.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs