version 1.151, 2009/04/03 19:46:56 |
version 1.152, 2009/04/28 09:05:40 |
|
|
CVS_OP_DIFF, CVS_USE_WDIR, "diff", |
CVS_OP_DIFF, CVS_USE_WDIR, "diff", |
{ "di", "dif" }, |
{ "di", "dif" }, |
"Show differences between revisions", |
"Show differences between revisions", |
"[-cilNnpRu] [[-D date] [-r rev] [-D date2 | -r rev2]] " |
"[-abcdilNnpRuw] [[-D date] [-r rev] [-D date2 | -r rev2]] " |
"[-k mode] [file ...]", |
"[-k mode] [file ...]", |
"cfD:ik:lNnpr:Ru", |
"bcfD:ik:lNnpr:Ruw", |
NULL, |
NULL, |
cvs_diff |
cvs_diff |
}; |
}; |
|
|
while ((ch = getopt(argc, argv, cvs_cmdop == CVS_OP_DIFF ? |
while ((ch = getopt(argc, argv, cvs_cmdop == CVS_OP_DIFF ? |
cvs_cmd_diff.cmd_opts : cvs_cmd_rdiff.cmd_opts)) != -1) { |
cvs_cmd_diff.cmd_opts : cvs_cmd_rdiff.cmd_opts)) != -1) { |
switch (ch) { |
switch (ch) { |
|
case 'a': |
|
strlcat(diffargs, " -a", sizeof(diffargs)); |
|
diff_aflag = 1; |
|
break; |
|
case 'b': |
|
strlcat(diffargs, " -b", sizeof(diffargs)); |
|
diff_bflag = 1; |
|
break; |
case 'c': |
case 'c': |
strlcat(diffargs, " -c", sizeof(diffargs)); |
strlcat(diffargs, " -c", sizeof(diffargs)); |
diff_format = D_CONTEXT; |
diff_format = D_CONTEXT; |
break; |
break; |
|
case 'd': |
|
strlcat(diffargs, " -d", sizeof(diffargs)); |
|
diff_dflag = 1; |
|
break; |
case 'D': |
case 'D': |
if (date1 == -1 && rev1 == NULL) { |
if (date1 == -1 && rev1 == NULL) { |
date1 = cvs_date_parse(optarg); |
date1 = cvs_date_parse(optarg); |
|
|
case 'V': |
case 'V': |
fatal("the -V option is obsolete " |
fatal("the -V option is obsolete " |
"and should not be used"); |
"and should not be used"); |
|
case 'w': |
|
strlcat(diffargs, " -w", sizeof(diffargs)); |
|
diff_wflag = 1; |
|
break; |
default: |
default: |
fatal("%s", cvs_cmdop == CVS_OP_DIFF ? |
fatal("%s", cvs_cmdop == CVS_OP_DIFF ? |
cvs_cmd_diff.cmd_synopsis : |
cvs_cmd_diff.cmd_synopsis : |