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