Annotation of src/usr.bin/cvs/update.c, Revision 1.81
1.81 ! xsa 1: /* $OpenBSD: update.c,v 1.80 2006/07/07 17:37:17 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.51 xsa 18: #include "includes.h"
1.1 jfb 19:
20: #include "cvs.h"
21: #include "log.h"
1.59 joris 22: #include "diff.h"
1.80 joris 23: #include "remote.h"
1.1 jfb 24:
1.60 joris 25: int prune_dirs = 0;
1.77 reyk 26: int print = 0;
1.63 joris 27: int build_dirs = 0;
1.70 joris 28: int reset_stickies = 0;
29: static char *tag = NULL;
1.63 joris 30:
1.65 joris 31: static void update_clear_conflict(struct cvs_file *);
32:
1.29 jfb 33: struct cvs_cmd cvs_cmd_update = {
1.74 joris 34: CVS_OP_UPDATE, 0, "update",
1.29 jfb 35: { "up", "upd" },
36: "Bring work tree in sync with repository",
37: "[-ACdflPpR] [-D date | -r rev] [-I ign] [-j rev] [-k mode] "
38: "[-t id] ...",
1.35 xsa 39: "ACD:dfI:j:k:lPpQqRr:t:",
1.29 jfb 40: NULL,
1.59 joris 41: cvs_update
1.18 joris 42: };
1.2 jfb 43:
1.59 joris 44: int
45: cvs_update(int argc, char **argv)
1.1 jfb 46: {
1.18 joris 47: int ch;
1.59 joris 48: char *arg = ".";
1.61 joris 49: int flags;
1.59 joris 50: struct cvs_recursion cr;
1.2 jfb 51:
1.80 joris 52: flags = CR_RECURSE_DIRS;
1.61 joris 53:
1.59 joris 54: while ((ch = getopt(argc, argv, cvs_cmd_update.cmd_opts)) != -1) {
1.1 jfb 55: switch (ch) {
56: case 'A':
1.70 joris 57: reset_stickies = 1;
1.24 joris 58: break;
1.1 jfb 59: case 'C':
60: case 'D':
1.71 joris 61: tag = optarg;
1.32 xsa 62: break;
1.1 jfb 63: case 'd':
1.63 joris 64: build_dirs = 1;
1.24 joris 65: break;
1.1 jfb 66: case 'f':
1.2 jfb 67: break;
1.35 xsa 68: case 'I':
69: break;
70: case 'j':
71: break;
72: case 'k':
73: break;
1.1 jfb 74: case 'l':
1.61 joris 75: flags &= ~CR_RECURSE_DIRS;
1.2 jfb 76: break;
1.1 jfb 77: case 'P':
1.60 joris 78: prune_dirs = 1;
1.24 joris 79: break;
1.1 jfb 80: case 'p':
1.77 reyk 81: print = 1;
1.79 xsa 82: cvs_noexec = 1;
1.27 xsa 83: break;
1.1 jfb 84: case 'Q':
85: case 'q':
1.2 jfb 86: break;
1.1 jfb 87: case 'R':
1.2 jfb 88: break;
1.1 jfb 89: case 'r':
1.70 joris 90: tag = optarg;
1.1 jfb 91: break;
92: default:
1.59 joris 93: fatal("%s", cvs_cmd_update.cmd_synopsis);
1.1 jfb 94: }
1.32 xsa 95: }
96:
1.59 joris 97: argc -= optind;
98: argv += optind;
1.2 jfb 99:
1.80 joris 100: if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
101: cr.enterdir = cvs_update_enterdir;
102: cr.leavedir = cvs_update_leavedir;
103: cr.fileproc = cvs_update_local;
104: flags |= CR_REPO;
105: } else {
106: if (reset_stickies)
107: cvs_client_send_request("Argument -A");
108: if (build_dirs)
109: cvs_client_send_request("Argument -d");
110: if (!(flags & CR_RECURSE_DIRS))
111: cvs_client_send_request("Argument -l");
112: if (prune_dirs)
113: cvs_client_send_request("Argument -P");
114: if (print)
115: cvs_client_send_request("Argument -p");
116:
117: cr.enterdir = NULL;
118: cr.leavedir = NULL;
119: cr.fileproc = cvs_client_sendfile;
120: }
121:
1.61 joris 122: cr.flags = flags;
1.49 joris 123:
1.59 joris 124: if (argc > 0)
125: cvs_file_run(argc, argv, &cr);
126: else
127: cvs_file_run(1, &arg, &cr);
1.80 joris 128:
129: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
130: cvs_client_send_files(argv, argc);
131: cvs_client_senddir(".");
132: cvs_client_send_request("update");
133: cvs_client_get_responses();
134: }
1.35 xsa 135:
1.24 joris 136: return (0);
137: }
1.2 jfb 138:
1.59 joris 139: void
140: cvs_update_enterdir(struct cvs_file *cf)
1.2 jfb 141: {
1.59 joris 142: int l;
143: char *entry;
144: CVSENTRIES *entlist;
145:
146: cvs_log(LP_TRACE, "cvs_update_enterdir(%s)", cf->file_path);
147:
1.68 joris 148: cvs_file_classify(cf, NULL, 0);
1.59 joris 149:
1.63 joris 150: if (cf->file_status == DIR_CREATE && build_dirs == 1) {
1.59 joris 151: cvs_mkpath(cf->file_path);
152: if ((cf->fd = open(cf->file_path, O_RDONLY)) == -1)
153: fatal("cvs_update_enterdir: %s", strerror(errno));
154:
155: entry = xmalloc(CVS_ENT_MAXLINELEN);
156: l = snprintf(entry, CVS_ENT_MAXLINELEN, "D/%s////",
157: cf->file_name);
158: if (l == -1 || l >= CVS_ENT_MAXLINELEN)
159: fatal("cvs_update_enterdir: overflow");
160:
161: entlist = cvs_ent_open(cf->file_wd);
162: cvs_ent_add(entlist, entry);
163: cvs_ent_close(entlist, ENT_SYNC);
164: xfree(entry);
1.63 joris 165: } else if (cf->file_status == DIR_CREATE && build_dirs == 0) {
1.67 joris 166: cf->file_status = FILE_SKIP;
1.60 joris 167: }
168: }
169:
170: void
171: cvs_update_leavedir(struct cvs_file *cf)
172: {
173: long base;
174: int nbytes;
1.81 ! xsa 175: int isempty;
1.60 joris 176: size_t bufsize;
177: struct stat st;
178: struct dirent *dp;
179: char *buf, *ebuf, *cp;
180: struct cvs_ent *ent;
181: struct cvs_ent_line *line;
182: CVSENTRIES *entlist;
1.69 joris 183: char *export;
1.60 joris 184:
1.67 joris 185: cvs_log(LP_TRACE, "cvs_update_leavedir(%s)", cf->file_path);
186:
1.69 joris 187: if (cvs_cmdop == CVS_OP_EXPORT) {
188: export = xmalloc(MAXPATHLEN);
1.81 ! xsa 189: if (cvs_path_cat(cf->file_path, CVS_PATH_CVSDIR, export,
! 190: MAXPATHLEN) >= MAXPATHLEN)
! 191: fatal("cvs_update_leavedir: truncation");
1.69 joris 192:
193: /* XXX */
194: if (cvs_rmdir(export) == -1)
195: fatal("cvs_update_leavedir: %s: %s:", export,
196: strerror(errno));
197:
198: xfree(export);
199: return;
200: }
201:
1.60 joris 202: if (fstat(cf->fd, &st) == -1)
203: fatal("cvs_update_leavedir: %s", strerror(errno));
204:
205: bufsize = st.st_size;
206: if (bufsize < st.st_blksize)
207: bufsize = st.st_blksize;
208:
209: isempty = 1;
210: buf = xmalloc(bufsize);
211:
1.73 joris 212: if (lseek(cf->fd, 0, SEEK_SET) == -1)
1.60 joris 213: fatal("cvs_update_leavedir: %s", strerror(errno));
214:
215: while ((nbytes = getdirentries(cf->fd, buf, bufsize, &base)) > 0) {
216: ebuf = buf + nbytes;
217: cp = buf;
218:
219: while (cp < ebuf) {
220: dp = (struct dirent *)cp;
221: if (!strcmp(dp->d_name, ".") ||
222: !strcmp(dp->d_name, "..") ||
223: dp->d_reclen == 0) {
224: cp += dp->d_reclen;
225: continue;
226: }
227:
228: if (!strcmp(dp->d_name, CVS_PATH_CVSDIR)) {
229: entlist = cvs_ent_open(cf->file_path);
230: TAILQ_FOREACH(line, &(entlist->cef_ent),
231: entries_list) {
232: ent = cvs_ent_parse(line->buf);
233:
234: if (ent->ce_status == CVS_ENT_REMOVED) {
235: isempty = 0;
236: cvs_ent_free(ent);
237: break;
238: }
239:
240: cvs_ent_free(ent);
241: }
242: cvs_ent_close(entlist, ENT_NOSYNC);
243: } else {
244: isempty = 0;
245: }
246:
247: if (isempty == 0)
248: break;
249:
250: cp += dp->d_reclen;
251: }
252: }
253:
254: if (nbytes == -1)
255: fatal("cvs_update_leavedir: %s", strerror(errno));
256:
257: xfree(buf);
258:
259: if (isempty == 1 && prune_dirs == 1) {
1.69 joris 260: /* XXX */
1.60 joris 261: cvs_rmdir(cf->file_path);
262:
263: entlist = cvs_ent_open(cf->file_wd);
264: cvs_ent_remove(entlist, cf->file_name);
265: cvs_ent_close(entlist, ENT_SYNC);
1.2 jfb 266: }
267: }
268:
1.59 joris 269: void
270: cvs_update_local(struct cvs_file *cf)
1.2 jfb 271: {
1.65 joris 272: BUF *bp;
1.70 joris 273: int ret, flags;
1.59 joris 274: CVSENTRIES *entlist;
1.76 reyk 275: char rbuf[16];
1.59 joris 276:
277: cvs_log(LP_TRACE, "cvs_update_local(%s)", cf->file_path);
1.37 joris 278:
1.59 joris 279: if (cf->file_type == CVS_DIR) {
1.67 joris 280: if (cf->file_status == FILE_SKIP)
1.63 joris 281: return;
282:
1.59 joris 283: if (cf->file_status != FILE_UNKNOWN &&
284: verbosity > 1)
285: cvs_log(LP_NOTICE, "Updating %s", cf->file_path);
286: return;
1.26 jfb 287: }
288:
1.65 joris 289: /*
290: * the bp buffer will be released inside rcs_kwexp_buf,
291: * which is called from cvs_checkout_file().
292: */
1.70 joris 293: flags = 0;
1.65 joris 294: bp = NULL;
1.70 joris 295: cvs_file_classify(cf, tag, 1);
296:
297: if (cf->file_status == FILE_UPTODATE && cf->file_ent != NULL &&
298: cf->file_ent->ce_tag != NULL && reset_stickies == 1) {
299: cf->file_status = FILE_CHECKOUT;
300: cf->file_rcsrev = rcs_head_get(cf->file_rcs);
1.76 reyk 301: }
302:
1.77 reyk 303: if (print && cf->file_status != FILE_UNKNOWN) {
1.76 reyk 304: bp = rcs_getrev(cf->file_rcs, cf->file_rcsrev);
305: if (bp == NULL)
306: fatal("cvs_update_local: failed to get HEAD");
307: rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf));
308: if (verbosity > 1)
309: cvs_printf("%s\nChecking out %s\n"
310: "RCS:\t%s\nVERS:\t%s\n***************\n",
311: RCS_DIFF_DIV, cf->file_path, cf->file_rpath, rbuf);
312: cvs_checkout_file(cf, cf->file_rcsrev, bp, CO_DUMP);
313: return;
1.70 joris 314: }
1.45 joris 315:
1.59 joris 316: switch (cf->file_status) {
317: case FILE_UNKNOWN:
318: cvs_printf("? %s\n", cf->file_path);
1.45 joris 319: break;
1.59 joris 320: case FILE_MODIFIED:
1.65 joris 321: ret = update_has_conflict_markers(cf);
322: if (cf->file_ent->ce_conflict != NULL && ret == 1) {
1.59 joris 323: cvs_printf("C %s\n", cf->file_path);
1.65 joris 324: } else {
325: if (cf->file_ent->ce_conflict != NULL && ret == 0)
326: update_clear_conflict(cf);
1.59 joris 327: cvs_printf("M %s\n", cf->file_path);
1.65 joris 328: }
1.45 joris 329: break;
1.59 joris 330: case FILE_ADDED:
331: cvs_printf("A %s\n", cf->file_path);
1.45 joris 332: break;
1.59 joris 333: case FILE_REMOVED:
334: cvs_printf("R %s\n", cf->file_path);
1.45 joris 335: break;
1.59 joris 336: case FILE_CONFLICT:
337: cvs_printf("C %s\n", cf->file_path);
338: break;
339: case FILE_LOST:
340: case FILE_CHECKOUT:
341: case FILE_PATCH:
1.68 joris 342: bp = rcs_getrev(cf->file_rcs, cf->file_rcsrev);
1.65 joris 343: if (bp == NULL)
344: fatal("cvs_update_local: failed to get HEAD");
345:
1.70 joris 346: if (tag != NULL)
347: flags = CO_SETSTICKY;
348:
349: cvs_checkout_file(cf, cf->file_rcsrev, bp, flags);
1.65 joris 350: cvs_printf("U %s\n", cf->file_path);
1.59 joris 351: break;
352: case FILE_MERGE:
1.72 joris 353: bp = cvs_diff3(cf->file_rcs, cf->file_path, cf->fd,
1.68 joris 354: cf->file_ent->ce_rev, cf->file_rcsrev, 1);
1.65 joris 355: if (bp == NULL)
356: fatal("cvs_update_local: failed to merge");
357:
1.68 joris 358: cvs_checkout_file(cf, cf->file_rcsrev, bp, CO_MERGE);
1.65 joris 359:
360: if (diff3_conflicts != 0) {
361: cvs_printf("C %s\n", cf->file_path);
362: } else {
363: update_clear_conflict(cf);
364: cvs_printf("M %s\n", cf->file_path);
365: }
1.59 joris 366: break;
367: case FILE_UNLINK:
368: (void)unlink(cf->file_path);
369: case FILE_REMOVE_ENTRY:
370: entlist = cvs_ent_open(cf->file_wd);
371: cvs_ent_remove(entlist, cf->file_name);
372: cvs_ent_close(entlist, ENT_SYNC);
1.45 joris 373: break;
374: default:
375: break;
376: }
1.65 joris 377: }
378:
379: static void
380: update_clear_conflict(struct cvs_file *cf)
381: {
382: int l;
383: time_t now;
384: CVSENTRIES *entlist;
385: char *entry, revbuf[16], timebuf[32];
386:
387: cvs_log(LP_TRACE, "update_clear_conflict(%s)", cf->file_path);
388:
389: time(&now);
390: ctime_r(&now, timebuf);
391: if (timebuf[strlen(timebuf) - 1] == '\n')
392: timebuf[strlen(timebuf) - 1] = '\0';
393:
394: rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf));
395:
396: entry = xmalloc(CVS_ENT_MAXLINELEN);
397: l = snprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s//",
398: cf->file_name, revbuf, timebuf);
399: if (l == -1 || l >= CVS_ENT_MAXLINELEN)
400: fatal("update_clear_conflict: overflow");
401:
402: entlist = cvs_ent_open(cf->file_wd);
403: cvs_ent_add(entlist, entry);
404: cvs_ent_close(entlist, ENT_SYNC);
405: xfree(entry);
406: }
407:
408: /*
409: * XXX - this is the way GNU cvs checks for outstanding conflicts
410: * in a file after a merge. It is a very very bad approach and
411: * should be looked at once opencvs is working decently.
412: */
413: int
414: update_has_conflict_markers(struct cvs_file *cf)
415: {
416: BUF *bp;
417: int conflict;
418: char *content;
419: struct cvs_line *lp;
420: struct cvs_lines *lines;
421:
422: cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path);
1.78 joris 423:
424: if (cf->fd == -1)
425: return (0);
1.65 joris 426:
1.72 joris 427: if ((bp = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.65 joris 428: fatal("update_has_conflict_markers: failed to load %s",
429: cf->file_path);
430:
431: cvs_buf_putc(bp, '\0');
432: content = cvs_buf_release(bp);
433: if ((lines = cvs_splitlines(content)) == NULL)
434: fatal("update_has_conflict_markers: failed to split lines");
435:
436: xfree(content);
437:
438: conflict = 0;
439: TAILQ_FOREACH(lp, &(lines->l_lines), l_list) {
440: if (lp->l_line == NULL)
441: continue;
442:
443: if (!strncmp(lp->l_line, RCS_CONFLICT_MARKER1,
444: strlen(RCS_CONFLICT_MARKER1)) ||
445: !strncmp(lp->l_line, RCS_CONFLICT_MARKER2,
446: strlen(RCS_CONFLICT_MARKER2)) ||
447: !strncmp(lp->l_line, RCS_CONFLICT_MARKER3,
448: strlen(RCS_CONFLICT_MARKER3))) {
449: conflict = 1;
450: break;
451: }
452: }
453:
454: cvs_freelines(lines);
455: return (conflict);
1.1 jfb 456: }
![[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