File: [local] / src / usr.bin / cvs / status.c (download)
Revision 1.100, Thu Jun 1 08:08:24 2017 UTC (7 years ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, HEAD Changes since 1.99: +3 -3 lines
Stop looking at current_cvsroot->cr_method to figure out if we're remote or not.
Instead use cvsroot_is_local() and cvsroot_is_remote().
|
/* $OpenBSD: status.c,v 1.100 2017/06/01 08:08:24 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
* Copyright (c) 2005-2008 Xavier Santolaria <xsa@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include "cvs.h"
#include "remote.h"
void cvs_status_local(struct cvs_file *);
static int show_sym = 0;
struct cvs_cmd cvs_cmd_status = {
CVS_OP_STATUS, CVS_USE_WDIR, "status",
{ "st", "stat" },
"Display status information on checked out files",
"[-lRv]",
"lRv",
NULL,
cvs_status
};
#define CVS_STATUS_SEP \
"==================================================================="
const char *status_tab[] = {
"Unknown",
"Locally Added",
"Locally Removed",
"Locally Modified",
"Up-to-date",
"Needs Checkout",
"Needs Checkout",
"Needs Merge",
"Needs Patch",
"Entry Invalid",
"Unresolved Conflict",
"Classifying error",
};
int
cvs_status(int argc, char **argv)
{
int ch, flags;
char *arg = ".";
struct cvs_recursion cr;
flags = CR_RECURSE_DIRS;
while ((ch = getopt(argc, argv, cvs_cmd_status.cmd_opts)) != -1) {
switch (ch) {
case 'l':
flags &= ~CR_RECURSE_DIRS;
break;
case 'R':
flags |= CR_RECURSE_DIRS;
break;
case 'v':
show_sym = 1;
break;
default:
fatal("%s", cvs_cmd_status.cmd_synopsis);
}
}
argc -= optind;
argv += optind;
cr.enterdir = NULL;
cr.leavedir = NULL;
if (cvsroot_is_local()) {
flags |= CR_REPO;
cr.fileproc = cvs_status_local;
} else {
cvs_client_connect_to_server();
if (!(flags & CR_RECURSE_DIRS))
cvs_client_send_request("Argument -l");
if (show_sym)
cvs_client_send_request("Argument -v");
cr.fileproc = cvs_client_sendfile;
}
cr.flags = flags;
if (argc > 0)
cvs_file_run(argc, argv, &cr);
else
cvs_file_run(1, &arg, &cr);
if (cvsroot_is_remote()) {
cvs_client_send_files(argv, argc);
cvs_client_senddir(".");
cvs_client_send_request("status");
cvs_client_get_responses();
}
return (0);
}
void
cvs_status_local(struct cvs_file *cf)
{
size_t len;
RCSNUM *head, *brev;
const char *status;
struct rcs_delta *rdp;
char buf[PATH_MAX + CVS_REV_BUFSZ + 128];
char timebuf[CVS_TIME_BUFSZ], revbuf[CVS_REV_BUFSZ];
struct rcs_sym *sym;
cvs_log(LP_TRACE, "cvs_status_local(%s)", cf->file_path);
cvs_file_classify(cf, cvs_directory_tag);
if (cf->file_type == CVS_DIR) {
if (verbosity > 1)
cvs_log(LP_NOTICE, "Examining %s", cf->file_path);
return;
}
if (cf->file_status == FILE_UPTODATE &&
!(cf->file_flags & FILE_ON_DISK) &&
!(cf->file_flags & FILE_USER_SUPPLIED))
return;
if (cf->file_rcs != NULL)
head = cf->file_rcsrev;
else
head = NULL;
cvs_printf("%s\n", CVS_STATUS_SEP);
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 &&
cf->file_ent->ce_conflict != NULL)
status = "File had conflicts on merge";
if (!(cf->file_flags & FILE_ON_DISK)) {
(void)xsnprintf(buf, sizeof(buf), "no file %s\t",
cf->file_name);
} else
if (strlcpy(buf, cf->file_name, sizeof(buf)) >= sizeof(buf))
fatal("cvs_status_local: overflow");
cvs_printf("File: %-17s\tStatus: %s\n\n", buf, status);
if (cf->file_ent == NULL) {
(void)xsnprintf(buf, sizeof(buf),
"No entry for %s", cf->file_name);
} else if (cf->file_ent->ce_status == CVS_ENT_ADDED) {
len = strlcpy(buf, "New file!", sizeof(buf));
if (len >= sizeof(buf))
fatal("cvs_status_local: truncation");
} else {
rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf));
if (cf->file_ent->ce_conflict == NULL) {
if (cvs_server_active == 0) {
(void)strlcpy(timebuf, cf->file_ent->ce_time,
sizeof(timebuf));
} else {
timebuf[0] = '\0';
}
} else {
len = strlcpy(timebuf, cf->file_ent->ce_conflict,
sizeof(timebuf));
if (len >= sizeof(timebuf))
fatal("cvs_status_local: truncation");
}
(void)strlcpy(buf, revbuf, sizeof(buf));
if (cvs_server_active == 0) {
(void)strlcat(buf, "\t", sizeof(buf));
(void)strlcat(buf, timebuf, sizeof(buf));
}
}
cvs_printf(" Working revision:\t%s\n", buf);
buf[0] = '\0';
if (cf->file_rcs == NULL) {
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))
fatal("cvs_status_local: truncation");
} else {
rcsnum_tostr(head, revbuf, sizeof(revbuf));
(void)xsnprintf(buf, sizeof(buf), "%s\t%s", revbuf,
cf->file_rpath);
}
cvs_printf(" Repository revision:\t%s\n", buf);
if (cf->file_rcs != NULL && head != NULL) {
rdp = rcs_findrev(cf->file_rcs, head);
if (rdp == NULL) {
fatal("cvs_status_local: No head revision delta");
}
cvs_printf(" Commit Identifier:\t%s\n",
(rdp->rd_commitid != NULL) ? rdp->rd_commitid : "(none)");
}
if (cf->file_ent != NULL) {
if (cf->file_ent->ce_tag != NULL) {
if ((brev = rcs_sym_getrev(cf->file_rcs,
cf->file_ent->ce_tag)) == NULL) {
(void)strlcpy(buf, "- MISSING from RCS file!",
sizeof(buf));
} else {
rcsnum_tostr(brev, revbuf, sizeof(revbuf));
if (RCSNUM_ISBRANCH(brev)) {
xsnprintf(buf, sizeof(buf),
"(branch: %s)", revbuf);
} else {
xsnprintf(buf, sizeof(buf),
"(revision: %s)", revbuf);
}
free(brev);
}
cvs_printf(" Sticky Tag:\t\t%s %s\n",
cf->file_ent->ce_tag, buf);
} else if (verbosity > 0) {
cvs_printf(" Sticky Tag:\t\t(none)\n");
}
if (cf->file_ent->ce_date != -1) {
struct tm datetm;
char datetmp[CVS_TIME_BUFSZ];
gmtime_r(&(cf->file_ent->ce_date), &datetm);
(void)strftime(datetmp, sizeof(datetmp),
CVS_DATE_FMT, &datetm);
cvs_printf(" Sticky Date:\t\t%s\n", datetmp);
} else if (verbosity > 0)
cvs_printf(" Sticky Date:\t\t(none)\n");
if (cf->file_ent->ce_opts != NULL)
cvs_printf(" Sticky Options:\t%s\n",
cf->file_ent->ce_opts);
else if (verbosity > 0)
cvs_printf(" Sticky Options:\t(none)\n");
}
if (cf->file_rcs != NULL && show_sym == 1) {
cvs_printf("\n");
cvs_printf(" Existing Tags:\n");
if (!TAILQ_EMPTY(&(cf->file_rcs->rf_symbols))) {
TAILQ_FOREACH(sym,
&(cf->file_rcs->rf_symbols), rs_list) {
(void)rcsnum_tostr(sym->rs_num, revbuf,
sizeof(revbuf));
cvs_printf("\t%-25s\t(%s: %s)\n", sym->rs_name,
RCSNUM_ISBRANCH(sym->rs_num) ? "branch" :
"revision", revbuf);
}
} else
cvs_printf("\tNo Tags Exist\n");
}
cvs_printf("\n");
}