File: [local] / src / usr.bin / cvs / tag.c (download)
Revision 1.62, Mon Jan 28 20:31:07 2008 UTC (16 years, 4 months ago) by tobias
Branch: MAIN
Changes since 1.61: +2 -1 lines
Properly handle -R -- although it is default, it may be overwritten mit -l
in front of it.
OK joris@, xsa@
> Diff from Igor Zinovik
|
/* $OpenBSD: tag.c,v 1.62 2008/01/28 20:31:07 tobias Exp $ */
/*
* Copyright (c) 2006 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 <errno.h>
#include <string.h>
#include <unistd.h>
#include "cvs.h"
#include "remote.h"
#define T_CHECK_UPTODATE 0x01
#define T_DELETE 0x02
#define T_FORCE_MOVE 0x04
#define T_BRANCH 0x08
void cvs_tag_local(struct cvs_file *);
static int tag_del(struct cvs_file *);
static int tag_add(struct cvs_file *);
static int runflags = 0;
static char *tag = NULL;
static char *tag_date = NULL;
static char *tag_name = NULL;
static char *tag_oldname = NULL;
struct cvs_cmd cvs_cmd_rtag = {
CVS_OP_RTAG, 0, "rtag",
{ "rt", "rfreeze" },
"Add a symbolic tag to a module",
"[-bcdFflR] [-D date | -r rev] tag modules ...",
"bcD:dFflRr:",
NULL,
cvs_tag
};
struct cvs_cmd cvs_cmd_tag = {
CVS_OP_TAG, 0, "tag",
{ "ta", "freeze" },
"Add a symbolic tag to checked out version of files",
"[-bcdFflR] [-D date | -r rev] tag [file ...]",
"bcD:dFflRr:",
NULL,
cvs_tag
};
int
cvs_tag(int argc, char **argv)
{
int ch, flags, i;
char *arg = ".";
struct cvs_recursion cr;
flags = CR_RECURSE_DIRS;
while ((ch = getopt(argc, argv, cvs_cmd_tag.cmd_opts)) != -1) {
switch (ch) {
case 'b':
runflags |= T_BRANCH;
break;
case 'c':
runflags |= T_CHECK_UPTODATE;
break;
case 'D':
tag_date = optarg;
break;
case 'd':
runflags |= T_DELETE;
break;
case 'F':
runflags |= T_FORCE_MOVE;
break;
case 'l':
flags &= ~CR_RECURSE_DIRS;
break;
case 'R':
flags |= CR_RECURSE_DIRS;
break;
case 'r':
tag_oldname = optarg;
break;
default:
fatal("%s", cvs_cmd_tag.cmd_synopsis);
}
}
argc -= optind;
argv += optind;
if (cvs_cmdop == CVS_OP_RTAG) {
if (argc < 2)
fatal("%s", cvs_cmd_rtag.cmd_synopsis);
for (i = 1; i < argc; i++)
if (argv[i][0] == '/')
fatal("Absolute path name is invalid: %s",
argv[i]);
} else if (cvs_cmdop == CVS_OP_TAG && argc == 0)
fatal("%s", cvs_cmd_tag.cmd_synopsis);
tag_name = argv[0];
argc--;
argv++;
if (!rcs_sym_check(tag_name))
fatal("tag `%s' must not contain the characters `%s'",
tag_name, RCS_SYM_INVALCHAR);
if (tag_oldname != NULL) {
if (runflags & T_DELETE)
tag_oldname = NULL;
else
tag = tag_oldname;
}
if (tag_date != NULL) {
if (runflags & T_DELETE)
tag_date = NULL;
else
tag = tag_date;
}
if (tag_oldname != NULL && tag_date != NULL)
fatal("-r and -D options are mutually exclusive");
cr.enterdir = NULL;
cr.leavedir = NULL;
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
cvs_client_connect_to_server();
cr.fileproc = cvs_client_sendfile;
if (runflags & T_BRANCH)
cvs_client_send_request("Argument -b");
if (runflags & T_CHECK_UPTODATE)
cvs_client_send_request("Argument -c");
if (runflags & T_DELETE)
cvs_client_send_request("Argument -d");
if (runflags & T_FORCE_MOVE)
cvs_client_send_request("Argument -F");
if (!(flags & CR_RECURSE_DIRS))
cvs_client_send_request("Argument -l");
if (tag_oldname != NULL)
cvs_client_send_request("Argument -r%s", tag_oldname);
cvs_client_send_request("Argument %s", tag_name);
} else {
if (cvs_cmdop == CVS_OP_RTAG &&
chdir(current_cvsroot->cr_dir) == -1)
fatal("cvs_tag: %s", strerror(errno));
cr.fileproc = cvs_tag_local;
}
cr.flags = flags;
if (cvs_cmdop == CVS_OP_TAG ||
current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
if (argc > 0)
cvs_file_run(argc, argv, &cr);
else
cvs_file_run(1, &arg, &cr);
}
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
cvs_client_send_files(argv, argc);
cvs_client_senddir(".");
cvs_client_send_request((cvs_cmdop == CVS_OP_RTAG) ?
"rtag" : "tag");
cvs_client_get_responses();
}
return (0);
}
void
cvs_tag_local(struct cvs_file *cf)
{
cvs_log(LP_TRACE, "cvs_tag_local(%s)", cf->file_path);
cvs_file_classify(cf, tag);
if (cf->file_type == CVS_DIR) {
if (verbosity > 1) {
cvs_log(LP_NOTICE, "%s %s",
(runflags & T_DELETE) ? "Untagging" : "Tagging",
cf->file_path);
}
return;
}
if (runflags & T_CHECK_UPTODATE) {
if (cf->file_status != FILE_UPTODATE &&
cf->file_status != FILE_CHECKOUT &&
cf->file_status != FILE_PATCH) {
cvs_log(LP_NOTICE,
"%s is locally modified", cf->file_path);
return;
}
}
if (runflags & T_DELETE) {
if (tag_del(cf) == 0) {
if (verbosity > 0)
cvs_printf("D %s\n", cf->file_path);
rcs_write(cf->file_rcs);
}
return;
}
switch(cf->file_status) {
case FILE_ADDED:
if (verbosity > 1) {
cvs_log(LP_NOTICE,
"couldn't tag added but un-commited file `%s'",
cf->file_path);
}
return;
case FILE_REMOVED:
if (verbosity > 1) {
cvs_log(LP_NOTICE,
"skipping removed but un-commited file `%s'",
cf->file_path);
}
return;
case FILE_CHECKOUT:
case FILE_MODIFIED:
case FILE_PATCH:
case FILE_UPTODATE:
if (tag_add(cf) == 0) {
if (verbosity > 0)
cvs_printf("T %s\n", cf->file_path);
rcs_write(cf->file_rcs);
cvs_history_add(CVS_HISTORY_TAG, cf, tag_name);
}
break;
default:
break;
}
}
static int
tag_del(struct cvs_file *cf)
{
if (cf->file_rcs == NULL)
return (-1);
if (cvs_noexec == 1)
return (0);
return (rcs_sym_remove(cf->file_rcs, tag_name));
}
static int
tag_add(struct cvs_file *cf)
{
char revbuf[CVS_REV_BUFSZ], trevbuf[CVS_REV_BUFSZ];
RCSNUM *srev, *trev;
struct rcs_sym *sym;
if (cf->file_rcs == NULL) {
if (verbosity > 1)
cvs_log(LP_NOTICE, "cannot find revision "
"control file for `%s'", cf->file_name);
return (-1);
}
if (cvs_cmdop == CVS_OP_TAG) {
if (cf->file_ent == NULL)
return (-1);
srev = cf->file_ent->ce_rev;
} else
srev = cf->file_rcsrev;
if (cvs_noexec == 1)
return (0);
(void)rcsnum_tostr(srev, revbuf, sizeof(revbuf));
trev = rcs_sym_getrev(cf->file_rcs, tag_name);
if (trev != NULL) {
if (rcsnum_cmp(srev, trev, 0) == 0) {
rcsnum_free(trev);
return (-1);
}
(void)rcsnum_tostr(trev, trevbuf, sizeof(trevbuf));
if (!(runflags & T_FORCE_MOVE)) {
cvs_printf("W %s : %s ", cf->file_path, tag_name);
cvs_printf("already exists on version %s", trevbuf);
cvs_printf(" : NOT MOVING tag to version %s\n", revbuf);
return (-1);
} else if (runflags & T_FORCE_MOVE) {
sym = rcs_sym_get(cf->file_rcs, tag_name);
rcsnum_cpy(srev, sym->rs_num, 0);
cf->file_rcs->rf_flags &= ~RCS_SYNCED;
return (0);
}
}
if (runflags & T_BRANCH) {
if ((trev = rcsnum_new_branch(srev)) == NULL)
fatal("Cannot create a new branch");
for (;;) {
TAILQ_FOREACH(sym, &(cf->file_rcs->rf_symbols), rs_list)
if (!rcsnum_cmp(sym->rs_num, trev, 0))
break;
if (sym != NULL) {
if (rcsnum_inc(trev) == NULL)
fatal("New revision too high");
if (rcsnum_inc(trev) == NULL)
fatal("New revision too high");
} else
break;
}
} else {
trev = rcsnum_alloc();
rcsnum_cpy(srev, trev, 0);
}
if (rcs_sym_add(cf->file_rcs, tag_name, trev) == -1) {
if (rcs_errno != RCS_ERR_DUPENT) {
cvs_log(LP_NOTICE,
"failed to set tag %s to revision %s in %s",
tag_name, revbuf, cf->file_rcs->rf_path);
}
rcsnum_free(trev);
return (-1);
}
rcsnum_free(trev);
return (0);
}