version 1.87, 2008/06/11 02:19:13 |
version 1.88, 2008/06/14 04:34:08 |
|
|
return; |
return; |
} |
} |
|
|
if (cf->file_rcs != NULL) { |
if (cf->file_rcs != NULL) |
head = rcs_head_get(cf->file_rcs); |
head = rcs_head_get(cf->file_rcs); |
if (head == NULL && cf->file_status != FILE_REMOVE_ENTRY) |
else |
return; |
|
} else { |
|
head = NULL; |
head = NULL; |
} |
|
|
|
cvs_printf("%s\n", CVS_STATUS_SEP); |
cvs_printf("%s\n", CVS_STATUS_SEP); |
|
|
status = status_tab[cf->file_status]; |
if (cf->file_rcs != NULL && head == NULL) |
|
status = status_tab[FILE_UNKNOWN]; |
|
else |
|
status = status_tab[cf->file_status]; |
|
|
if (cf->file_status == FILE_MODIFIED && |
if (cf->file_status == FILE_MODIFIED && |
cf->file_ent->ce_conflict != NULL) |
cf->file_ent->ce_conflict != NULL) |
status = "File had conflicts on merge"; |
status = "File had conflicts on merge"; |
|
|
if (cf->file_status == FILE_LOST || |
if (cf->fd == -1) { |
cf->file_status == FILE_REMOVE_ENTRY || |
|
(cf->file_rcs != NULL && cf->in_attic == 1 && cf->fd == -1)) { |
|
(void)xsnprintf(buf, sizeof(buf), "no file %s\t", |
(void)xsnprintf(buf, sizeof(buf), "no file %s\t", |
cf->file_name); |
cf->file_name); |
} else |
} else |
|
|
if (cf->file_ent == NULL) { |
if (cf->file_ent == NULL) { |
(void)xsnprintf(buf, sizeof(buf), |
(void)xsnprintf(buf, sizeof(buf), |
"No entry for %s", cf->file_name); |
"No entry for %s", cf->file_name); |
} else if (cf->file_status == FILE_ADDED || |
} else if (cf->file_ent->ce_status == CVS_ENT_ADDED) { |
cf->file_status == FILE_REMOVE_ENTRY) { |
|
len = strlcpy(buf, "New file!", sizeof(buf)); |
len = strlcpy(buf, "New file!", sizeof(buf)); |
if (len >= sizeof(buf)) |
if (len >= sizeof(buf)) |
fatal("cvs_status_local: truncation"); |
fatal("cvs_status_local: truncation"); |
|
|
cvs_printf(" Working revision:\t%s\n", buf); |
cvs_printf(" Working revision:\t%s\n", buf); |
|
|
buf[0] = '\0'; |
buf[0] = '\0'; |
if (cf->file_rcs == NULL || head == NULL) { |
if (cf->file_rcs == NULL) { |
len = strlcat(buf, "No revision control file", sizeof(buf)); |
len = strlcat(buf, "No revision control file", sizeof(buf)); |
|
if (len >= sizeof(buf)) |
|
fatal("cvs_status_local: truncation"); |
|
} else if (head == NULL) { |
|
len = strlcat(buf, "No head revision", sizeof(buf)); |
if (len >= sizeof(buf)) |
if (len >= sizeof(buf)) |
fatal("cvs_status_local: truncation"); |
fatal("cvs_status_local: truncation"); |
} else { |
} else { |