src/usr.bin/cvs/diff.c - diff

Return to diff.c CVS log

Up to [local] / src / usr.bin / cvs

Diff for /src/usr.bin/cvs/diff.c between version 1.157 and 1.158

version 1.157, 2010/07/23 21:46:05

version 1.158, 2010/07/28 21:19:30

Line 49

"Show differences between revisions",

"[-abcdilNnpRuw] [[-D date] [-r rev] [-D date2 | -r rev2]] "

"[-k mode] [file ...]",

"abcfdD:ik:lNnpr:Ruw",

"abcfC:dD:ik:lNnpr:RuU:w",

NULL,

cvs_diff

};

Line 70

{

int ch, flags;

char *arg = ".";

const char *errstr;

struct cvs_recursion cr;

flags = CR_RECURSE_DIRS;

Line 91

Line 92

strlcat(diffargs, " -c", sizeof(diffargs));

diff_format = D_CONTEXT;

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':

strlcat(diffargs, " -d", sizeof(diffargs));

dflags |= D_MINIMAL;

Line 161

Line 170

strlcat(diffargs, " -u", sizeof(diffargs));

diff_format = D_UNIFIED;

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':

fatal("the -V option is obsolete "

"and should not be used");

Line 209

Line 226

switch (diff_format) {

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;

case D_RCSDIFF:

cvs_client_send_request("Argument -n");

break;

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;

default:

break;