version 1.157, 2010/07/23 21:46:05 |
version 1.158, 2010/07/28 21:19:30 |
|
|
"Show differences between revisions", |
"Show differences between revisions", |
"[-abcdilNnpRuw] [[-D date] [-r rev] [-D date2 | -r rev2]] " |
"[-abcdilNnpRuw] [[-D date] [-r rev] [-D date2 | -r rev2]] " |
"[-k mode] [file ...]", |
"[-k mode] [file ...]", |
"abcfdD:ik:lNnpr:Ruw", |
"abcfC:dD:ik:lNnpr:RuU:w", |
NULL, |
NULL, |
cvs_diff |
cvs_diff |
}; |
}; |
|
|
{ |
{ |
int ch, flags; |
int ch, flags; |
char *arg = "."; |
char *arg = "."; |
|
const char *errstr; |
struct cvs_recursion cr; |
struct cvs_recursion cr; |
|
|
flags = CR_RECURSE_DIRS; |
flags = CR_RECURSE_DIRS; |
|
|
strlcat(diffargs, " -c", sizeof(diffargs)); |
strlcat(diffargs, " -c", sizeof(diffargs)); |
diff_format = D_CONTEXT; |
diff_format = D_CONTEXT; |
break; |
break; |
|
case 'C': |
|
diff_context = strtonum(optarg, 0, INT_MAX, &errstr); |
|
if (errstr != NULL) |
|
fatal("context lines %s: %s", errstr, optarg); |
|
strlcat(diffargs, " -C ", sizeof(diffargs)); |
|
strlcat(diffargs, optarg, sizeof(diffargs)); |
|
diff_format = D_CONTEXT; |
|
break; |
case 'd': |
case 'd': |
strlcat(diffargs, " -d", sizeof(diffargs)); |
strlcat(diffargs, " -d", sizeof(diffargs)); |
dflags |= D_MINIMAL; |
dflags |= D_MINIMAL; |
|
|
strlcat(diffargs, " -u", sizeof(diffargs)); |
strlcat(diffargs, " -u", sizeof(diffargs)); |
diff_format = D_UNIFIED; |
diff_format = D_UNIFIED; |
break; |
break; |
|
case 'U': |
|
diff_context = strtonum(optarg, 0, INT_MAX, &errstr); |
|
if (errstr != NULL) |
|
fatal("context lines %s: %s", errstr, optarg); |
|
strlcat(diffargs, " -U ", sizeof(diffargs)); |
|
strlcat(diffargs, optarg, sizeof(diffargs)); |
|
diff_format = D_UNIFIED; |
|
break; |
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"); |
|
|
|
|
switch (diff_format) { |
switch (diff_format) { |
case D_CONTEXT: |
case D_CONTEXT: |
cvs_client_send_request("Argument -c"); |
if (cvs_cmdop == CVS_OP_RDIFF) |
|
cvs_client_send_request("Argument -c"); |
|
else { |
|
cvs_client_send_request("Argument -C %d", |
|
diff_context); |
|
} |
break; |
break; |
case D_RCSDIFF: |
case D_RCSDIFF: |
cvs_client_send_request("Argument -n"); |
cvs_client_send_request("Argument -n"); |
break; |
break; |
case D_UNIFIED: |
case D_UNIFIED: |
cvs_client_send_request("Argument -u"); |
if (cvs_cmdop == CVS_OP_RDIFF) |
|
cvs_client_send_request("Argument -u"); |
|
else { |
|
cvs_client_send_request("Argument -U %d", |
|
diff_context); |
|
} |
break; |
break; |
default: |
default: |
break; |
break; |