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