summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.bin/cvs/client.c4
-rw-r--r--usr.bin/cvs/cmd.c4
-rw-r--r--usr.bin/cvs/remote.h3
-rw-r--r--usr.bin/cvs/server.c13
-rw-r--r--usr.bin/cvs/tag.c70
5 files changed, 72 insertions, 22 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c
index 53b41fbe35f..75f45b7066f 100644
--- a/usr.bin/cvs/client.c
+++ b/usr.bin/cvs/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.88 2008/01/10 10:08:22 tobias Exp $ */
+/* $OpenBSD: client.c,v 1.89 2008/01/10 11:20:29 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -92,7 +92,7 @@ struct cvs_req cvs_requests[] = {
REQ_NEEDDIR },
{ "rdiff", 0, NULL, 0 },
{ "tag", 0, cvs_server_tag, REQ_NEEDDIR },
- { "rtag", 0, NULL, 0 },
+ { "rtag", 0, cvs_server_rtag, 0 },
{ "import", 0, cvs_server_import,
REQ_NEEDDIR },
{ "admin", 0, cvs_server_admin, REQ_NEEDDIR },
diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c
index e1dd327a233..80f03e62809 100644
--- a/usr.bin/cvs/cmd.c
+++ b/usr.bin/cvs/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.64 2008/01/10 10:05:40 tobias Exp $ */
+/* $OpenBSD: cmd.c,v 1.65 2008/01/10 11:20:29 tobias Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* All rights reserved.
@@ -45,6 +45,7 @@ struct cvs_cmd *cvs_cdt[] = {
&cvs_cmd_release,
&cvs_cmd_remove,
&cvs_cmd_rlog,
+ &cvs_cmd_rtag,
&cvs_cmd_server,
&cvs_cmd_status,
&cvs_cmd_tag,
@@ -54,7 +55,6 @@ struct cvs_cmd *cvs_cdt[] = {
&cvs_cmd_edit,
&cvs_cmd_editors,
&cvs_cmd_rdiff,
- &cvs_cmd_rtag,
&cvs_cmd_unedit,
&cvs_cmd_watch,
&cvs_cmd_watchers,
diff --git a/usr.bin/cvs/remote.h b/usr.bin/cvs/remote.h
index fc48b615b0b..100061f9204 100644
--- a/usr.bin/cvs/remote.h
+++ b/usr.bin/cvs/remote.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: remote.h,v 1.26 2007/09/22 15:57:24 joris Exp $ */
+/* $OpenBSD: remote.h,v 1.27 2008/01/10 11:20:29 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -106,6 +106,7 @@ void cvs_server_log(char *);
void cvs_server_release(char *);
void cvs_server_remove(char *);
void cvs_server_rlog(char *);
+void cvs_server_rtag(char *);
void cvs_server_status(char *);
void cvs_server_tag(char *);
void cvs_server_update(char *);
diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c
index f90f08706b5..13278dffcbe 100644
--- a/usr.bin/cvs/server.c
+++ b/usr.bin/cvs/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.74 2008/01/10 09:59:23 tobias Exp $ */
+/* $OpenBSD: server.c,v 1.75 2008/01/10 11:20:29 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -657,6 +657,17 @@ cvs_server_tag(char *data)
}
void
+cvs_server_rtag(char *data)
+{
+ if (chdir(current_cvsroot->cr_dir) == -1)
+ fatal("cvs_server_rlog: %s", strerror(errno));
+
+ cvs_cmdop = CVS_OP_RTAG;
+ cvs_tag(server_argc, server_argv);
+ cvs_server_send_response("ok");
+}
+
+void
cvs_server_update(char *data)
{
if (chdir(server_currentdir) == -1)
diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c
index c3e2985f382..5c8de022fb7 100644
--- a/usr.bin/cvs/tag.c
+++ b/usr.bin/cvs/tag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tag.c,v 1.59 2008/01/10 09:39:32 tobias Exp $ */
+/* $OpenBSD: tag.c,v 1.60 2008/01/10 11:20:29 tobias Exp $ */
/*
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
*
@@ -15,6 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <errno.h>
+#include <string.h>
#include <unistd.h>
#include "cvs.h"
@@ -36,6 +38,16 @@ 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" },
@@ -49,7 +61,7 @@ struct cvs_cmd cvs_cmd_tag = {
int
cvs_tag(int argc, char **argv)
{
- int ch, flags;
+ int ch, flags, i;
char *arg = ".";
struct cvs_recursion cr;
@@ -88,7 +100,15 @@ cvs_tag(int argc, char **argv)
argc -= optind;
argv += optind;
- if (argc == 0)
+ 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];
@@ -143,20 +163,30 @@ cvs_tag(int argc, char **argv)
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 (argc > 0)
- cvs_file_run(argc, argv, &cr);
- else
- cvs_file_run(1, &arg, &cr);
+ 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("tag");
+
+ cvs_client_send_request((cvs_cmdop == CVS_OP_RTAG) ?
+ "rtag" : "tag");
+
cvs_client_get_responses();
}
@@ -168,6 +198,8 @@ 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",
@@ -177,8 +209,6 @@ cvs_tag_local(struct cvs_file *cf)
return;
}
- cvs_file_classify(cf, tag);
-
if (runflags & T_CHECK_UPTODATE) {
if (cf->file_status != FILE_UPTODATE &&
cf->file_status != FILE_CHECKOUT &&
@@ -216,6 +246,7 @@ cvs_tag_local(struct cvs_file *cf)
return;
case FILE_CHECKOUT:
case FILE_MODIFIED:
+ case FILE_PATCH:
case FILE_UPTODATE:
if (tag_add(cf) == 0) {
if (verbosity > 0)
@@ -246,7 +277,7 @@ static int
tag_add(struct cvs_file *cf)
{
char revbuf[CVS_REV_BUFSZ], trevbuf[CVS_REV_BUFSZ];
- RCSNUM *trev;
+ RCSNUM *srev, *trev;
struct rcs_sym *sym;
if (cf->file_rcs == NULL) {
@@ -256,14 +287,21 @@ tag_add(struct cvs_file *cf)
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(cf->file_rcsrev, revbuf, sizeof(revbuf));
+ (void)rcsnum_tostr(srev, revbuf, sizeof(revbuf));
trev = rcs_sym_getrev(cf->file_rcs, tag_name);
if (trev != NULL) {
- if (rcsnum_cmp(cf->file_rcsrev, trev, 0) == 0) {
+ if (rcsnum_cmp(srev, trev, 0) == 0) {
rcsnum_free(trev);
return (-1);
}
@@ -277,7 +315,7 @@ tag_add(struct cvs_file *cf)
return (-1);
} else if (runflags & T_FORCE_MOVE) {
sym = rcs_sym_get(cf->file_rcs, tag_name);
- rcsnum_cpy(cf->file_rcsrev, sym->rs_num, 0);
+ rcsnum_cpy(srev, sym->rs_num, 0);
cf->file_rcs->rf_flags &= ~RCS_SYNCED;
return (0);
@@ -285,7 +323,7 @@ tag_add(struct cvs_file *cf)
}
if (runflags & T_BRANCH) {
- if ((trev = rcsnum_new_branch(cf->file_rcsrev)) == NULL)
+ if ((trev = rcsnum_new_branch(srev)) == NULL)
fatal("Cannot create a new branch");
for (;;) {
@@ -303,7 +341,7 @@ tag_add(struct cvs_file *cf)
}
} else {
trev = rcsnum_alloc();
- rcsnum_cpy(cf->file_rcsrev, trev, 0);
+ rcsnum_cpy(srev, trev, 0);
}
if (rcs_sym_add(cf->file_rcs, tag_name, trev) == -1) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 08:26:18 +0000