version 1.142, 2008/06/17 06:38:21 |
version 1.143, 2008/06/20 13:59:14 |
|
|
cvs_specified_date = date1; |
cvs_specified_date = date1; |
diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs); |
diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs); |
if (diff_rev1 == NULL && cvs_cmdop == CVS_OP_DIFF) { |
if (diff_rev1 == NULL && cvs_cmdop == CVS_OP_DIFF) { |
if (rev1 != NULL) |
if (rev1 != NULL) { |
cvs_log(LP_ERR, "tag %s not in file %s", rev1, |
cvs_log(LP_ERR, "tag %s not in file %s", rev1, |
cf->file_path); |
cf->file_path); |
else { |
goto cleanup; |
|
} else if (Nflag) { |
|
diff_rev1 = NULL; |
|
} else { |
gmtime_r(&cvs_specified_date, &datetm); |
gmtime_r(&cvs_specified_date, &datetm); |
strftime(tbuf, sizeof(tbuf), |
strftime(tbuf, sizeof(tbuf), |
"%Y.%m.%d.%H.%M.%S", &datetm); |
"%Y.%m.%d.%H.%M.%S", &datetm); |
cvs_log(LP_ERR, "no revision for date %s in " |
cvs_log(LP_ERR, "no revision for date %s in " |
"file %s", tbuf, cf->file_path); |
"file %s", tbuf, cf->file_path); |
|
goto cleanup; |
} |
} |
goto cleanup; |
|
} else if (diff_rev1 == NULL && cvs_cmdop == CVS_OP_RDIFF && |
} else if (diff_rev1 == NULL && cvs_cmdop == CVS_OP_RDIFF && |
force_head) { |
force_head) { |
/* -f is not allowed for unknown symbols */ |
/* -f is not allowed for unknown symbols */ |
|
|
if (rev2 != NULL) { |
if (rev2 != NULL) { |
cvs_log(LP_ERR, "tag %s not in file %s", rev2, |
cvs_log(LP_ERR, "tag %s not in file %s", rev2, |
cf->file_path); |
cf->file_path); |
|
goto cleanup; |
|
} else if (Nflag) { |
|
diff_rev2 = NULL; |
} else { |
} else { |
gmtime_r(&cvs_specified_date, &datetm); |
gmtime_r(&cvs_specified_date, &datetm); |
strftime(tbuf, sizeof(tbuf), |
strftime(tbuf, sizeof(tbuf), |
"%Y.%m.%d.%H.%M.%S", &datetm); |
"%Y.%m.%d.%H.%M.%S", &datetm); |
cvs_log(LP_ERR, "no revision for date %s in " |
cvs_log(LP_ERR, "no revision for date %s in " |
"file %s", tbuf, cf->file_path); |
"file %s", tbuf, cf->file_path); |
|
goto cleanup; |
} |
} |
goto cleanup; |
|
} else if (diff_rev2 == NULL && cvs_cmdop == CVS_OP_RDIFF && |
} else if (diff_rev2 == NULL && cvs_cmdop == CVS_OP_RDIFF && |
force_head) { |
force_head) { |
/* -f is not allowed for unknown symbols */ |
/* -f is not allowed for unknown symbols */ |
|
|
|
|
switch (cvs_cmdop) { |
switch (cvs_cmdop) { |
case CVS_OP_DIFF: |
case CVS_OP_DIFF: |
if (cf->file_status == FILE_UPTODATE && |
if (cf->file_status == FILE_UPTODATE && diff_rev1 != NULL && |
rcsnum_cmp(diff_rev1, cf->file_rcsrev, 0) == 0) |
rcsnum_cmp(diff_rev1, cf->file_rcsrev, 0) == 0) |
goto cleanup; |
goto cleanup; |
break; |
break; |