version 1.143, 2008/06/20 13:59:14 |
version 1.144, 2008/06/20 14:04:29 |
|
|
static char *rev2 = NULL; |
static char *rev2 = NULL; |
static time_t date1 = -1; |
static time_t date1 = -1; |
static time_t date2 = -1; |
static time_t date2 = -1; |
|
static char *dateflag1 = NULL; |
|
static char *dateflag2 = NULL; |
|
|
struct cvs_cmd cvs_cmd_diff = { |
struct cvs_cmd cvs_cmd_diff = { |
CVS_OP_DIFF, CVS_USE_WDIR, "diff", |
CVS_OP_DIFF, CVS_USE_WDIR, "diff", |
|
|
case 'D': |
case 'D': |
if (date1 == -1 && rev1 == NULL) { |
if (date1 == -1 && rev1 == NULL) { |
date1 = cvs_date_parse(optarg); |
date1 = cvs_date_parse(optarg); |
|
dateflag1 = optarg; |
} else if (date2 == -1 && rev2 == NULL) { |
} else if (date2 == -1 && rev2 == NULL) { |
date2 = cvs_date_parse(optarg); |
date2 = cvs_date_parse(optarg); |
|
dateflag2 = optarg; |
} else { |
} else { |
fatal("no more than 2 revisions/dates can" |
fatal("no more than 2 revisions/dates can" |
" be specified"); |
" be specified"); |
|
|
cr.leavedir = NULL; |
cr.leavedir = NULL; |
|
|
if (cvs_cmdop == CVS_OP_RDIFF) { |
if (cvs_cmdop == CVS_OP_RDIFF) { |
if (rev1 == NULL) |
if (rev1 == NULL && rev2 == NULL && dateflag1 == NULL && |
|
dateflag2 == NULL) |
fatal("must specify at least one revision/date!"); |
fatal("must specify at least one revision/date!"); |
|
|
if (!argc) |
if (!argc) |
|
|
cvs_client_send_request("Argument -r%s", rev1); |
cvs_client_send_request("Argument -r%s", rev1); |
if (rev2 != NULL) |
if (rev2 != NULL) |
cvs_client_send_request("Argument -r%s", rev2); |
cvs_client_send_request("Argument -r%s", rev2); |
|
|
|
if (dateflag1 != NULL) |
|
cvs_client_send_request("Argument -D%s", dateflag1); |
|
if (dateflag2 != NULL) |
|
cvs_client_send_request("Argument -D%s", dateflag2); |
} else { |
} else { |
if (cvs_cmdop == CVS_OP_RDIFF && |
if (cvs_cmdop == CVS_OP_RDIFF && |
chdir(current_cvsroot->cr_dir) == -1) |
chdir(current_cvsroot->cr_dir) == -1) |