Annotation of src/usr.bin/cvs/update.c, Revision 1.154
1.154 ! tobias 1: /* $OpenBSD: update.c,v 1.153 2008/06/14 03:58:29 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.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.60 joris 249: if (fstat(cf->fd, &st) == -1)
250: fatal("cvs_update_leavedir: %s", strerror(errno));
251:
252: bufsize = st.st_size;
253: if (bufsize < st.st_blksize)
254: bufsize = st.st_blksize;
1.139 tobias 255:
256: if (st.st_size > SIZE_MAX)
1.151 joris 257: fatal("cvs_update_leavedir: %s: file size too big",
258: cf->file_name);
1.60 joris 259:
260: isempty = 1;
261: buf = xmalloc(bufsize);
262:
1.73 joris 263: if (lseek(cf->fd, 0, SEEK_SET) == -1)
1.60 joris 264: fatal("cvs_update_leavedir: %s", strerror(errno));
265:
266: while ((nbytes = getdirentries(cf->fd, buf, bufsize, &base)) > 0) {
267: ebuf = buf + nbytes;
268: cp = buf;
269:
270: while (cp < ebuf) {
271: dp = (struct dirent *)cp;
272: if (!strcmp(dp->d_name, ".") ||
273: !strcmp(dp->d_name, "..") ||
1.95 joris 274: dp->d_fileno == 0) {
1.60 joris 275: cp += dp->d_reclen;
276: continue;
277: }
278:
279: if (!strcmp(dp->d_name, CVS_PATH_CVSDIR)) {
280: entlist = cvs_ent_open(cf->file_path);
1.141 joris 281: if (!TAILQ_EMPTY(&(entlist->cef_ent)))
282: isempty = 0;
1.60 joris 283: } else {
284: isempty = 0;
285: }
286:
287: if (isempty == 0)
288: break;
289:
290: cp += dp->d_reclen;
291: }
292: }
293:
294: if (nbytes == -1)
295: fatal("cvs_update_leavedir: %s", strerror(errno));
296:
297: xfree(buf);
298:
1.151 joris 299: if ((isempty == 1 && prune_dirs == 1) ||
300: (cvs_server_active == 1 && cvs_cmdop == CVS_OP_CHECKOUT)) {
1.69 joris 301: /* XXX */
1.60 joris 302: cvs_rmdir(cf->file_path);
303:
1.114 tobias 304: if (cvs_server_active == 0 && cvs_cmdop != CVS_OP_EXPORT) {
1.88 joris 305: entlist = cvs_ent_open(cf->file_wd);
306: cvs_ent_remove(entlist, cf->file_name);
307: }
1.2 jfb 308: }
309: }
310:
1.59 joris 311: void
312: cvs_update_local(struct cvs_file *cf)
1.2 jfb 313: {
1.136 joris 314: CVSENTRIES *entlist;
1.133 tobias 315: int ent_kflag, rcs_kflag, ret, flags;
1.136 joris 316: char *tag, rbuf[CVS_REV_BUFSZ];
1.59 joris 317:
318: cvs_log(LP_TRACE, "cvs_update_local(%s)", cf->file_path);
1.37 joris 319:
1.59 joris 320: if (cf->file_type == CVS_DIR) {
1.114 tobias 321: if (cf->file_status == FILE_SKIP) {
322: if (cvs_cmdop == CVS_OP_EXPORT && verbosity > 0)
323: cvs_printf("? %s\n", cf->file_path);
1.63 joris 324: return;
1.114 tobias 325: }
1.63 joris 326:
1.59 joris 327: if (cf->file_status != FILE_UNKNOWN &&
328: verbosity > 1)
329: cvs_log(LP_NOTICE, "Updating %s", cf->file_path);
330: return;
1.26 jfb 331: }
332:
1.70 joris 333: flags = 0;
1.112 joris 334: if (cvs_specified_tag != NULL)
335: tag = cvs_specified_tag;
1.122 joris 336: else if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
337: tag = cf->file_ent->ce_tag;
1.112 joris 338: else
339: tag = cvs_directory_tag;
340:
341: cvs_file_classify(cf, tag);
342:
1.146 tobias 343: if (kflag && cf->file_rcs != NULL)
1.119 tobias 344: rcs_kwexp_set(cf->file_rcs, kflag);
1.70 joris 345:
1.91 joris 346: if ((cf->file_status == FILE_UPTODATE ||
347: cf->file_status == FILE_MODIFIED) && cf->file_ent != NULL &&
1.124 tobias 348: cf->file_ent->ce_tag != NULL && reset_tag) {
1.91 joris 349: if (cf->file_status == FILE_MODIFIED)
350: cf->file_status = FILE_MERGE;
351: else
352: cf->file_status = FILE_CHECKOUT;
1.110 joris 353:
1.154 ! tobias 354: if ((cf->file_rcsrev = rcs_head_get(cf->file_rcs)) == NULL)
! 355: fatal("no head revision in RCS file for %s",
! 356: cf->file_path);
1.104 joris 357:
358: /* might be a bit overkill */
359: if (cvs_server_active == 1)
360: cvs_server_clear_sticky(cf->file_wd);
1.76 reyk 361: }
362:
1.154 ! tobias 363: if (print_stdout) {
! 364: if (cf->file_status != FILE_UNKNOWN && cf->file_rcs != NULL &&
! 365: cf->file_rcsrev != NULL && !cf->file_rcs->rf_dead) {
! 366: rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf));
! 367: if (verbosity > 1) {
! 368: cvs_log(LP_RCS, RCS_DIFF_DIV);
! 369: cvs_log(LP_RCS, "Checking out %s",
! 370: cf->file_path);
! 371: cvs_log(LP_RCS, "RCS: %s", cf->file_rpath);
! 372: cvs_log(LP_RCS, "VERS: %s", rbuf);
! 373: cvs_log(LP_RCS, "***************");
! 374: }
! 375: cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_DUMP);
1.109 tobias 376: }
1.76 reyk 377: return;
1.70 joris 378: }
1.45 joris 379:
1.119 tobias 380: if (cf->file_ent != NULL) {
381: if (cf->file_ent->ce_opts == NULL) {
382: if (kflag)
383: cf->file_status = FILE_CHECKOUT;
1.154 ! tobias 384: } else if (cf->file_rcs != NULL) {
1.133 tobias 385: if (strlen(cf->file_ent->ce_opts) < 3)
386: fatal("malformed option for file %s",
387: cf->file_path);
388:
389: ent_kflag = rcs_kflag_get(cf->file_ent->ce_opts + 2);
390: rcs_kflag = rcs_kwexp_get(cf->file_rcs);
391:
392: if ((kflag && (kflag != ent_kflag)) ||
393: (reset_option && (ent_kflag != rcs_kflag)))
1.119 tobias 394: cf->file_status = FILE_CHECKOUT;
395: }
396: }
397:
1.59 joris 398: switch (cf->file_status) {
399: case FILE_UNKNOWN:
400: cvs_printf("? %s\n", cf->file_path);
1.45 joris 401: break;
1.59 joris 402: case FILE_MODIFIED:
1.65 joris 403: ret = update_has_conflict_markers(cf);
404: if (cf->file_ent->ce_conflict != NULL && ret == 1) {
1.59 joris 405: cvs_printf("C %s\n", cf->file_path);
1.65 joris 406: } else {
407: if (cf->file_ent->ce_conflict != NULL && ret == 0)
408: update_clear_conflict(cf);
1.59 joris 409: cvs_printf("M %s\n", cf->file_path);
1.65 joris 410: }
1.45 joris 411: break;
1.59 joris 412: case FILE_ADDED:
413: cvs_printf("A %s\n", cf->file_path);
1.45 joris 414: break;
1.59 joris 415: case FILE_REMOVED:
416: cvs_printf("R %s\n", cf->file_path);
1.45 joris 417: break;
1.59 joris 418: case FILE_CONFLICT:
419: cvs_printf("C %s\n", cf->file_path);
420: break;
421: case FILE_LOST:
422: case FILE_CHECKOUT:
423: case FILE_PATCH:
1.153 tobias 424: if (!reset_tag && (tag != NULL || cvs_specified_date != -1 ||
425: cvs_directory_date != -1 || (cf->file_ent != NULL &&
426: cf->file_ent->ce_tag != NULL)))
1.70 joris 427: flags = CO_SETSTICKY;
428:
1.112 joris 429: cvs_checkout_file(cf, cf->file_rcsrev, tag, flags);
1.65 joris 430: cvs_printf("U %s\n", cf->file_path);
1.100 joris 431: cvs_history_add(CVS_HISTORY_UPDATE_CO, cf, NULL);
1.59 joris 432: break;
433: case FILE_MERGE:
1.136 joris 434: d3rev1 = cf->file_ent->ce_rev;
435: d3rev2 = cf->file_rcsrev;
1.112 joris 436: cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_MERGE);
1.65 joris 437:
438: if (diff3_conflicts != 0) {
439: cvs_printf("C %s\n", cf->file_path);
1.100 joris 440: cvs_history_add(CVS_HISTORY_UPDATE_MERGED_ERR,
441: cf, NULL);
1.65 joris 442: } else {
443: update_clear_conflict(cf);
444: cvs_printf("M %s\n", cf->file_path);
1.100 joris 445: cvs_history_add(CVS_HISTORY_UPDATE_MERGED, cf, NULL);
1.65 joris 446: }
1.59 joris 447: break;
448: case FILE_UNLINK:
449: (void)unlink(cf->file_path);
1.102 joris 450: if (cvs_server_active == 1)
1.112 joris 451: cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_REMOVE);
1.59 joris 452: case FILE_REMOVE_ENTRY:
453: entlist = cvs_ent_open(cf->file_wd);
454: cvs_ent_remove(entlist, cf->file_name);
1.100 joris 455: cvs_history_add(CVS_HISTORY_UPDATE_REMOVE, cf, NULL);
1.110 joris 456: break;
457: case FILE_UPTODATE:
458: if (cvs_cmdop != CVS_OP_UPDATE)
459: break;
460:
1.130 joris 461: if (cf->file_rcsrev == NULL)
462: break;
463:
1.153 tobias 464: if (tag == NULL && cvs_specified_date == -1 &&
465: cvs_directory_date == -1 && !reset_tag &&
466: !reset_option)
1.130 joris 467: break;
468:
469: if (cf->file_rcs->rf_dead != 1 &&
470: (cf->file_flags & FILE_HAS_TAG))
1.112 joris 471: cvs_checkout_file(cf, cf->file_rcsrev,
472: tag, CO_SETSTICKY);
1.45 joris 473: break;
474: default:
475: break;
476: }
1.136 joris 477:
478: if (cvs_join_rev1 != NULL)
479: update_join_file(cf);
1.65 joris 480: }
481:
482: static void
483: update_clear_conflict(struct cvs_file *cf)
484: {
485: CVSENTRIES *entlist;
1.148 tobias 486: char *entry, revbuf[CVS_REV_BUFSZ];
1.136 joris 487: char sticky[CVS_ENT_MAXLINELEN], opt[4];
1.65 joris 488:
489: cvs_log(LP_TRACE, "update_clear_conflict(%s)", cf->file_path);
490:
1.134 joris 491: rcsnum_tostr(cf->file_rcsrev, revbuf, sizeof(revbuf));
1.65 joris 492:
1.121 tobias 493: sticky[0] = '\0';
1.136 joris 494: if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL)
1.121 tobias 495: (void)xsnprintf(sticky, sizeof(sticky), "T%s",
496: cf->file_ent->ce_tag);
497:
1.136 joris 498: opt[0] = '\0';
499: if (cf->file_ent != NULL && cf->file_ent->ce_opts != NULL)
500: strlcpy(opt, cf->file_ent->ce_opts, sizeof(opt));
501:
1.65 joris 502: entry = xmalloc(CVS_ENT_MAXLINELEN);
1.148 tobias 503: cvs_ent_line_str(cf->file_name, revbuf, "Result of merge",
1.136 joris 504: opt[0] != '\0' ? opt : "", sticky, 0, 0,
1.129 xsa 505: entry, CVS_ENT_MAXLINELEN);
1.65 joris 506:
507: entlist = cvs_ent_open(cf->file_wd);
508: cvs_ent_add(entlist, entry);
509: xfree(entry);
510: }
511:
512: /*
513: * XXX - this is the way GNU cvs checks for outstanding conflicts
514: * in a file after a merge. It is a very very bad approach and
515: * should be looked at once opencvs is working decently.
516: */
517: int
518: update_has_conflict_markers(struct cvs_file *cf)
519: {
520: BUF *bp;
521: int conflict;
522: char *content;
523: struct cvs_line *lp;
524: struct cvs_lines *lines;
1.83 niallo 525: size_t len;
1.65 joris 526:
527: cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path);
1.78 joris 528:
1.147 tobias 529: if (cf->fd == -1 || cf->file_ent == NULL)
1.78 joris 530: return (0);
1.65 joris 531:
1.132 tobias 532: bp = cvs_buf_load_fd(cf->fd);
1.65 joris 533:
534: cvs_buf_putc(bp, '\0');
1.83 niallo 535: len = cvs_buf_len(bp);
1.65 joris 536: content = cvs_buf_release(bp);
1.83 niallo 537: if ((lines = cvs_splitlines(content, len)) == NULL)
1.65 joris 538: fatal("update_has_conflict_markers: failed to split lines");
539:
540: conflict = 0;
541: TAILQ_FOREACH(lp, &(lines->l_lines), l_list) {
542: if (lp->l_line == NULL)
543: continue;
544:
545: if (!strncmp(lp->l_line, RCS_CONFLICT_MARKER1,
1.107 tobias 546: sizeof(RCS_CONFLICT_MARKER1) - 1) ||
1.65 joris 547: !strncmp(lp->l_line, RCS_CONFLICT_MARKER2,
1.107 tobias 548: sizeof(RCS_CONFLICT_MARKER2) - 1) ||
1.65 joris 549: !strncmp(lp->l_line, RCS_CONFLICT_MARKER3,
1.107 tobias 550: sizeof(RCS_CONFLICT_MARKER3) - 1)) {
1.65 joris 551: conflict = 1;
552: break;
553: }
554: }
555:
556: cvs_freelines(lines);
1.83 niallo 557: xfree(content);
1.65 joris 558: return (conflict);
1.136 joris 559: }
560:
561: void
562: update_join_file(struct cvs_file *cf)
563: {
564: int flag;
565: time_t told;
566: RCSNUM *rev1, *rev2;
567: const char *state1, *state2;
568: char rbuf[CVS_REV_BUFSZ], *jrev1, *jrev2, *p;
569:
570: rev1 = rev2 = NULL;
571: jrev1 = jrev2 = NULL;
572:
573: jrev1 = xstrdup(cvs_join_rev1);
574: if (cvs_join_rev2 != NULL)
575: jrev2 = xstrdup(cvs_join_rev2);
576:
577: if (jrev2 == NULL) {
578: jrev2 = jrev1;
579: jrev1 = NULL;
580: }
581:
582: told = cvs_specified_date;
583:
1.142 joris 584: if ((p = strchr(jrev2, ':')) != NULL) {
1.136 joris 585: (*p++) = '\0';
586: cvs_specified_date = cvs_date_parse(p);
587: }
588:
589: rev2 = rcs_translate_tag(jrev2, cf->file_rcs);
590: cvs_specified_date = told;
591:
592: if (jrev1 != NULL) {
1.142 joris 593: if ((p = strchr(jrev1, ':')) != NULL) {
1.136 joris 594: (*p++) = '\0';
595: cvs_specified_date = cvs_date_parse(p);
596: }
597:
598: rev1 = rcs_translate_tag(jrev1, cf->file_rcs);
599: cvs_specified_date = told;
600: } else {
601: if (rev2 == NULL)
602: goto out;
603:
604: rev1 = rcsnum_alloc();
605: rcsnum_cpy(cf->file_rcsrev, rev1, 0);
606: }
607:
608: state1 = state2 = RCS_STATE_DEAD;
609:
610: if (rev1 != NULL)
611: state1 = rcs_state_get(cf->file_rcs, rev1);
612: if (rev2 != NULL)
613: state2 = rcs_state_get(cf->file_rcs, rev2);
614:
615: if (rev2 == NULL || !strcmp(state2, RCS_STATE_DEAD)) {
616: if (rev1 == NULL || !strcmp(state1, RCS_STATE_DEAD))
617: goto out;
618:
619: if (cf->file_status == FILE_REMOVED ||
620: cf->file_rcs->rf_dead == 1)
621: goto out;
622:
623: if (cf->file_status == FILE_MODIFIED ||
624: cf->file_status == FILE_ADDED)
625: goto out;
626:
627: (void)unlink(cf->file_path);
628: (void)close(cf->fd);
629: cf->fd = -1;
630: cvs_remove_local(cf);
631: goto out;
632: }
633:
634: if (cf->file_ent != NULL) {
635: if (!rcsnum_cmp(cf->file_ent->ce_rev, rev2, 0))
636: goto out;
1.154 ! tobias 637: }
! 638:
! 639: if (cf->file_rcsrev == NULL) {
! 640: cvs_printf("non-mergable file: %s has no head revision!\n",
! 641: cf->file_path);
! 642: goto out;
1.136 joris 643: }
644:
645: if (rev1 == NULL || !strcmp(state1, RCS_STATE_DEAD)) {
646: if (cf->fd != -1) {
647: cvs_printf("%s exists but has been added in %s\n",
1.137 joris 648: cf->file_path, jrev2);
1.136 joris 649: } else {
1.137 joris 650: cvs_printf("A %s\n", cf->file_path);
1.136 joris 651: cvs_checkout_file(cf, cf->file_rcsrev, NULL, 0);
652: cvs_add_local(cf);
653: }
654: goto out;
655: }
656:
1.137 joris 657: if (!rcsnum_cmp(rev1, rev2, 0))
658: goto out;
659:
660: if (cf->fd == -1) {
661: cvs_printf("%s does not exist but is present in %s\n",
662: cf->file_path, jrev2);
1.136 joris 663: goto out;
1.137 joris 664: }
1.136 joris 665:
666: flag = rcs_kwexp_get(cf->file_rcs);
667: if (flag & RCS_KWEXP_NONE) {
668: cvs_printf("non-mergable file: %s needs merge!\n",
669: cf->file_path);
670: goto out;
671: }
672:
673: cvs_printf("joining ");
674: rcsnum_tostr(rev1, rbuf, sizeof(rbuf));
675: cvs_printf("%s ", rbuf);
676:
677: rcsnum_tostr(rev2, rbuf, sizeof(rbuf));
678: cvs_printf("%s ", rbuf);
679:
680: rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf));
681: cvs_printf("into %s (%s)\n", cf->file_path, rbuf);
682:
683: d3rev1 = rev1;
684: d3rev2 = rev2;
685: cvs_checkout_file(cf, cf->file_rcsrev, NULL, CO_MERGE);
686:
1.138 joris 687: if (diff3_conflicts == 0)
1.136 joris 688: update_clear_conflict(cf);
689:
690: out:
691: if (rev1 != NULL)
692: rcsnum_free(rev1);
693: if (rev2 != NULL)
694: rcsnum_free(rev2);
695:
696: if (jrev1 != NULL)
697: xfree(jrev1);
698: if (jrev2 != NULL)
699: xfree(jrev2);
1.1 jfb 700: }
![[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