1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
/* $OpenBSD: add.c,v 1.44 2006/05/28 10:15:35 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@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 "includes.h"
#include "cvs.h"
#include "diff.h"
#include "log.h"
#include "proto.h"
int cvs_add(int, char **);
void cvs_add_local(struct cvs_file *);
char *logmsg;
struct cvs_cmd cvs_cmd_add = {
CVS_OP_ADD, CVS_REQ_ADD, "add",
{ "ad", "new" },
"Add a new file or directory to the repository",
"[-m message] ...",
"m",
NULL,
cvs_add
};
int
cvs_add(int argc, char **argv)
{
int ch;
int flags;
char *arg = ".";
struct cvs_recursion cr;
flags = CR_RECURSE_DIRS | CR_REPO;
while ((ch = getopt(argc, argv, cvs_cmd_add.cmd_opts)) != -1) {
switch (ch) {
case 'm':
logmsg = xstrdup(optarg);
break;
default:
fatal("%s", cvs_cmd_add.cmd_synopsis);
}
}
argc -= optind;
argv += optind;
cr.enterdir = NULL;
cr.leavedir = NULL;
cr.local = cvs_add_local;
cr.remote = NULL;
cr.flags = flags;
if (argc > 0)
cvs_file_run(argc, argv, &cr);
else
cvs_file_run(1, &arg, &cr);
return (0);
}
void
cvs_add_local(struct cvs_file *cf)
{
int stop, l;
char *entry, revbuf[16];
CVSENTRIES *entlist;
cvs_log(LP_TRACE, "cvs_add_local(%s)", cf->file_path);
cvs_file_classify(cf, 0);
if (cf->file_rcs != NULL)
rcsnum_tostr(cf->file_rcs->rf_head, revbuf, sizeof(revbuf));
stop = 0;
switch (cf->file_status) {
case FILE_ADDED:
cvs_log(LP_NOTICE, "%s has already been entered",
cf->file_path);
stop = 1;
break;
case FILE_UPTODATE:
if (cf->file_rcs != NULL && cf->file_rcs->rf_dead == 0) {
cvs_log(LP_NOTICE, "%s already exists, with version "
"number %s", cf->file_path, revbuf);
stop = 1;
}
break;
case FILE_UNKNOWN:
if (cf->file_rcs != NULL && cf->file_rcs->rf_dead == 1) {
cvs_log(LP_NOTICE, "re-adding file %s "
"(instead of dead revision %s)",
cf->file_path, revbuf);
} else {
cvs_log(LP_NOTICE, "scheduling file '%s' for addition",
cf->file_path);
}
break;
default:
break;
}
if (stop == 1)
return;
entry = xmalloc(CVS_ENT_MAXLINELEN);
l = snprintf(entry, CVS_ENT_MAXLINELEN, "/%s/0/Initial %s//",
cf->file_name, cf->file_name);
entlist = cvs_ent_open(cf->file_wd);
cvs_ent_add(entlist, entry);
cvs_ent_close(entlist, ENT_SYNC);
xfree(entry);
cvs_log(LP_NOTICE, "use commit to add this file permanently");
}
|
