Annotation of src/usr.bin/cvs/diff.c, Revision 1.114
1.114 ! joris 1: /* $OpenBSD: diff.c,v 1.113 2007/01/14 23:10:56 joris Exp $ */
1.1 jfb 2: /*
1.91 joris 3: * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
1.1 jfb 4: *
1.91 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.
8: *
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.75 xsa 18: #include "includes.h"
1.1 jfb 19:
20: #include "cvs.h"
1.56 niallo 21: #include "diff.h"
1.1 jfb 22: #include "log.h"
1.108 joris 23: #include "remote.h"
1.86 joris 24:
1.91 joris 25: void cvs_diff_local(struct cvs_file *);
1.46 xsa 26:
1.97 joris 27: static int Nflag = 0;
28: static char *rev1 = NULL;
29: static char *rev2 = NULL;
1.94 joris 30:
1.36 jfb 31: struct cvs_cmd cvs_cmd_diff = {
1.104 joris 32: CVS_OP_DIFF, 0, "diff",
1.36 jfb 33: { "di", "dif" },
34: "Show differences between revisions",
1.43 xsa 35: "[-cilNnpu] [[-D date] [-r rev] [-D date2 | -r rev2]] "
36: "[-k mode] [file ...]",
37: "cD:iklNnpr:Ru",
1.36 jfb 38: NULL,
1.91 joris 39: cvs_diff
1.36 jfb 40: };
41:
1.91 joris 42: int
43: cvs_diff(int argc, char **argv)
1.1 jfb 44: {
1.23 joris 45: int ch;
1.91 joris 46: char *arg = ".";
1.92 joris 47: int flags;
1.91 joris 48: struct cvs_recursion cr;
1.1 jfb 49:
1.92 joris 50: flags = CR_RECURSE_DIRS;
1.2 jfb 51: strlcpy(diffargs, argv[0], sizeof(diffargs));
1.1 jfb 52:
1.91 joris 53: while ((ch = getopt(argc, argv, cvs_cmd_diff.cmd_opts)) != -1) {
1.1 jfb 54: switch (ch) {
55: case 'c':
1.2 jfb 56: strlcat(diffargs, " -c", sizeof(diffargs));
1.58 niallo 57: diff_format = D_CONTEXT;
1.1 jfb 58: break;
1.92 joris 59: case 'l':
60: flags &= ~CR_RECURSE_DIRS;
61: break;
1.33 jfb 62: case 'n':
63: strlcat(diffargs, " -n", sizeof(diffargs));
1.58 niallo 64: diff_format = D_RCSDIFF;
1.33 jfb 65: break;
1.94 joris 66: case 'N':
67: strlcat(diffargs, " -N", sizeof(diffargs));
1.95 joris 68: Nflag = 1;
1.94 joris 69: break;
1.101 joris 70: case 'p':
71: strlcat(diffargs, " -p", sizeof(diffargs));
72: diff_pflag = 1;
73: break;
1.1 jfb 74: case 'r':
1.97 joris 75: if (rev1 == NULL) {
76: rev1 = optarg;
77: } else if (rev2 == NULL) {
78: rev2 = optarg;
1.23 joris 79: } else {
1.91 joris 80: fatal("no more than 2 revisions/dates can"
81: " be specified");
1.1 jfb 82: }
1.32 joris 83: break;
1.1 jfb 84: case 'u':
1.2 jfb 85: strlcat(diffargs, " -u", sizeof(diffargs));
1.58 niallo 86: diff_format = D_UNIFIED;
1.1 jfb 87: break;
88: default:
1.91 joris 89: fatal("%s", cvs_cmd_diff.cmd_synopsis);
1.36 jfb 90: }
1.13 jfb 91: }
92:
1.91 joris 93: argc -= optind;
94: argv += optind;
1.1 jfb 95:
1.91 joris 96: cr.enterdir = NULL;
97: cr.leavedir = NULL;
1.108 joris 98:
99: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
1.110 joris 100: cvs_client_connect_to_server();
1.108 joris 101: cr.fileproc = cvs_client_sendfile;
102:
103: if (!(flags & CR_RECURSE_DIRS))
104: cvs_client_send_request("Argument -l");
105:
106: switch (diff_format) {
107: case D_CONTEXT:
108: cvs_client_send_request("Argument -c");
109: break;
110: case D_RCSDIFF:
111: cvs_client_send_request("Argument -n");
112: break;
113: case D_UNIFIED:
114: cvs_client_send_request("Argument -u");
115: break;
116: default:
117: break;
118: }
119:
120: if (Nflag == 1)
121: cvs_client_send_request("Argument -N");
122:
123: if (diff_pflag == 1)
124: cvs_client_send_request("Argument -p");
125:
126: if (rev1 != NULL)
127: cvs_client_send_request("Argument -r%s", rev1);
128: if (rev2 != NULL)
129: cvs_client_send_request("Argument -r%s", rev2);
130: } else {
131: cr.fileproc = cvs_diff_local;
132: }
133:
1.92 joris 134: cr.flags = flags;
1.7 jfb 135:
1.97 joris 136: diff_rev1 = diff_rev2 = NULL;
137:
1.91 joris 138: if (argc > 0)
139: cvs_file_run(argc, argv, &cr);
1.82 ray 140: else
1.91 joris 141: cvs_file_run(1, &arg, &cr);
1.108 joris 142:
143: if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
144: cvs_client_send_files(argv, argc);
145: cvs_client_senddir(".");
146: cvs_client_send_request("diff");
147: cvs_client_get_responses();
148: }
1.36 jfb 149:
150: return (0);
151: }
152:
1.91 joris 153: void
154: cvs_diff_local(struct cvs_file *cf)
1.36 jfb 155: {
1.91 joris 156: RCSNUM *r1;
1.114 ! joris 157: BUF *b1;
1.91 joris 158: struct stat st;
1.69 niallo 159: struct timeval tv[2], tv2[2];
1.111 xsa 160: char rbuf[16], *p1, *p2;
161:
162: r1 = NULL;
1.114 ! joris 163: b1 = NULL;
1.69 niallo 164:
1.91 joris 165: cvs_log(LP_TRACE, "cvs_diff_local(%s)", cf->file_path);
1.1 jfb 166:
1.91 joris 167: if (cf->file_type == CVS_DIR) {
1.46 xsa 168: if (verbosity > 1)
1.91 joris 169: cvs_log(LP_NOTICE, "Diffing inside %s", cf->file_path);
1.1 jfb 170: return;
171: }
172:
1.98 joris 173: cvs_file_classify(cf, NULL, 0);
1.1 jfb 174:
1.91 joris 175: if (cf->file_status == FILE_LOST) {
176: cvs_log(LP_ERR, "cannot find file %s", cf->file_path);
1.1 jfb 177: return;
1.91 joris 178: } else if (cf->file_status == FILE_UNKNOWN) {
179: cvs_log(LP_ERR, "I know nothing about %s", cf->file_path);
1.1 jfb 180: return;
1.95 joris 181: } else if (cf->file_status == FILE_ADDED && Nflag == 0) {
1.94 joris 182: cvs_log(LP_ERR, "%s is a new entry, no comparison available",
183: cf->file_path);
1.1 jfb 184: return;
1.95 joris 185: } else if (cf->file_status == FILE_REMOVED && Nflag == 0) {
186: cvs_log(LP_ERR, "%s was removed, no comparison available",
187: cf->file_path);
188: return;
1.99 joris 189: } else if (cf->file_status == FILE_UPTODATE && rev1 == NULL &&
190: rev2 == NULL) {
1.94 joris 191: return;
192: }
1.97 joris 193:
194: if (rev1 != NULL)
195: diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs);
196: if (rev2 != NULL)
197: diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs);
1.1 jfb 198:
1.91 joris 199: diff_file = cf->file_path;
200: cvs_printf("Index: %s\n%s\nRCS file: %s\n", cf->file_path,
201: RCS_DIFF_DIV, cf->file_rpath);
1.1 jfb 202:
1.114 ! joris 203: (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
! 204: (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
! 205:
1.94 joris 206: if (cf->file_status != FILE_ADDED) {
207: if (diff_rev1 != NULL)
208: r1 = diff_rev1;
209: else
210: r1 = cf->file_ent->ce_rev;
1.1 jfb 211:
1.94 joris 212: diff_rev1 = r1;
213: rcsnum_tostr(r1, rbuf , sizeof(rbuf));
1.91 joris 214:
1.94 joris 215: tv[0].tv_sec = rcs_rev_getdate(cf->file_rcs, r1);
216: tv[0].tv_usec = 0;
217: tv[1] = tv[0];
1.114 ! joris 218:
! 219: printf("Retrieving revision %s\n", rbuf);
! 220: rcs_rev_write_stmp(cf->file_rcs, r1, p1, 0);
1.94 joris 221: }
1.91 joris 222:
1.95 joris 223: if (diff_rev2 != NULL && cf->file_status != FILE_ADDED &&
224: cf->file_status != FILE_REMOVED) {
1.91 joris 225: rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
226:
227: tv2[0].tv_sec = rcs_rev_getdate(cf->file_rcs, diff_rev2);
228: tv2[0].tv_usec = 0;
229: tv2[1] = tv2[0];
1.114 ! joris 230:
! 231: printf("Retrieving revision %s\n", rbuf);
! 232: rcs_rev_write_stmp(cf->file_rcs, diff_rev2, p2, 0);
1.95 joris 233: } else if (cf->file_status != FILE_REMOVED) {
1.91 joris 234: if (fstat(cf->fd, &st) == -1)
235: fatal("fstat failed %s", strerror(errno));
1.114 ! joris 236: if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
1.91 joris 237: fatal("failed to load %s", cf->file_path);
238:
239: st.st_mtime = cvs_hack_time(st.st_mtime, 1);
240: tv2[0].tv_sec = st.st_mtime;
241: tv2[0].tv_usec = 0;
242: tv2[1] = tv2[0];
1.114 ! joris 243:
! 244: cvs_buf_write_stmp(b1, p2, tv2);
! 245: cvs_buf_free(b1);
1.17 jfb 246: }
247:
1.91 joris 248: cvs_printf("%s", diffargs);
1.1 jfb 249:
1.94 joris 250: if (cf->file_status != FILE_ADDED) {
251: rcsnum_tostr(r1, rbuf, sizeof(rbuf));
252: cvs_printf(" -r%s", rbuf);
1.1 jfb 253:
1.94 joris 254: if (diff_rev2 != NULL) {
255: rcsnum_tostr(diff_rev2, rbuf, sizeof(rbuf));
256: cvs_printf(" -r%s", rbuf);
257: }
1.1 jfb 258: }
259:
1.91 joris 260: cvs_printf(" %s\n", cf->file_path);
1.1 jfb 261:
1.114 ! joris 262: if (cf->file_status == FILE_ADDED) {
! 263: xfree(p1);
1.111 xsa 264: (void)xasprintf(&p1, "%s", CVS_PATH_DEVNULL);
1.114 ! joris 265: } else if (cf->file_status == FILE_REMOVED) {
! 266: xfree(p2);
1.111 xsa 267: (void)xasprintf(&p2, "%s", CVS_PATH_DEVNULL);
1.114 ! joris 268: }
1.111 xsa 269:
270: if (cvs_diffreg(p1, p2, NULL) == D_ERROR)
271: fatal("cvs_diff_local: failed to get RCS patch");
1.58 niallo 272:
1.91 joris 273: cvs_worklist_run(&temp_files, cvs_worklist_unlink);
1.111 xsa 274:
275: if (p1 != NULL)
276: xfree(p1);
277: if (p2 != NULL)
278: xfree(p2);
1.101 joris 279:
280: if (diff_rev1 != NULL && diff_rev1 != cf->file_ent->ce_rev)
281: rcsnum_free(diff_rev1);
282: if (diff_rev2 != NULL && diff_rev2 != cf->file_rcsrev)
283: rcsnum_free(diff_rev2);
1.94 joris 284:
285: diff_rev1 = diff_rev2 = NULL;
1.1 jfb 286: }
![[BACK]](/icons/back.gif){kind=icon}
Return to diff.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs