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
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
|
/* $OpenBSD: update.c,v 1.66 2006/05/28 07:56:44 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 "log.h"
#include "diff.h"
#include "proto.h"
int cvs_update(int, char **);
int prune_dirs = 0;
int build_dirs = 0;
static void update_clear_conflict(struct cvs_file *);
#define UPDATE_SKIP 100
struct cvs_cmd cvs_cmd_update = {
CVS_OP_UPDATE, CVS_REQ_UPDATE, "update",
{ "up", "upd" },
"Bring work tree in sync with repository",
"[-ACdflPpR] [-D date | -r rev] [-I ign] [-j rev] [-k mode] "
"[-t id] ...",
"ACD:dfI:j:k:lPpQqRr:t:",
NULL,
cvs_update
};
int
cvs_update(int argc, char **argv)
{
int ch;
char *arg = ".";
int flags;
struct cvs_recursion cr;
flags = CR_REPO | CR_RECURSE_DIRS;
while ((ch = getopt(argc, argv, cvs_cmd_update.cmd_opts)) != -1) {
switch (ch) {
case 'A':
break;
case 'C':
case 'D':
break;
case 'd':
build_dirs = 1;
break;
case 'f':
break;
case 'I':
break;
case 'j':
break;
case 'k':
break;
case 'l':
flags &= ~CR_RECURSE_DIRS;
break;
case 'P':
prune_dirs = 1;
break;
case 'p':
break;
case 'Q':
case 'q':
break;
case 'R':
break;
case 'r':
break;
default:
fatal("%s", cvs_cmd_update.cmd_synopsis);
}
}
argc -= optind;
argv += optind;
cr.enterdir = cvs_update_enterdir;
cr.leavedir = cvs_update_leavedir;
cr.local = cvs_update_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_update_enterdir(struct cvs_file *cf)
{
int l;
char *entry;
CVSENTRIES *entlist;
cvs_log(LP_TRACE, "cvs_update_enterdir(%s)", cf->file_path);
cvs_file_classify(cf, 0);
if (cf->file_status == DIR_CREATE && build_dirs == 1) {
cvs_mkpath(cf->file_path);
if ((cf->fd = open(cf->file_path, O_RDONLY)) == -1)
fatal("cvs_update_enterdir: %s", strerror(errno));
entry = xmalloc(CVS_ENT_MAXLINELEN);
l = snprintf(entry, CVS_ENT_MAXLINELEN, "D/%s////",
cf->file_name);
if (l == -1 || l >= CVS_ENT_MAXLINELEN)
fatal("cvs_update_enterdir: overflow");
entlist = cvs_ent_open(cf->file_wd);
cvs_ent_add(entlist, entry);
cvs_ent_close(entlist, ENT_SYNC);
xfree(entry);
} else if (cf->file_status == DIR_CREATE && build_dirs == 0) {
cf->file_status = UPDATE_SKIP;
}
}
void
cvs_update_leavedir(struct cvs_file *cf)
{
long base;
int nbytes;
int isempty;
size_t bufsize;
struct stat st;
struct dirent *dp;
char *buf, *ebuf, *cp;
struct cvs_ent *ent;
struct cvs_ent_line *line;
CVSENTRIES *entlist;
if (fstat(cf->fd, &st) == -1)
fatal("cvs_update_leavedir: %s", strerror(errno));
bufsize = st.st_size;
if (bufsize < st.st_blksize)
bufsize = st.st_blksize;
isempty = 1;
buf = xmalloc(bufsize);
if (lseek(cf->fd, SEEK_SET, 0) == -1)
fatal("cvs_update_leavedir: %s", strerror(errno));
while ((nbytes = getdirentries(cf->fd, buf, bufsize, &base)) > 0) {
ebuf = buf + nbytes;
cp = buf;
while (cp < ebuf) {
dp = (struct dirent *)cp;
if (!strcmp(dp->d_name, ".") ||
!strcmp(dp->d_name, "..") ||
dp->d_reclen == 0) {
cp += dp->d_reclen;
continue;
}
if (!strcmp(dp->d_name, CVS_PATH_CVSDIR)) {
entlist = cvs_ent_open(cf->file_path);
TAILQ_FOREACH(line, &(entlist->cef_ent),
entries_list) {
ent = cvs_ent_parse(line->buf);
if (ent->ce_status == CVS_ENT_REMOVED) {
isempty = 0;
cvs_ent_free(ent);
break;
}
cvs_ent_free(ent);
}
cvs_ent_close(entlist, ENT_NOSYNC);
} else {
isempty = 0;
}
if (isempty == 0)
break;
cp += dp->d_reclen;
}
}
if (nbytes == -1)
fatal("cvs_update_leavedir: %s", strerror(errno));
xfree(buf);
if (isempty == 1 && prune_dirs == 1) {
cvs_rmdir(cf->file_path);
entlist = cvs_ent_open(cf->file_wd);
cvs_ent_remove(entlist, cf->file_name);
cvs_ent_close(entlist, ENT_SYNC);
}
}
void
cvs_update_local(struct cvs_file *cf)
{
int ret;
BUF *bp;
CVSENTRIES *entlist;
cvs_log(LP_TRACE, "cvs_update_local(%s)", cf->file_path);
if (cf->file_type == CVS_DIR) {
if (cf->file_status == UPDATE_SKIP)
return;
if (cf->file_status != FILE_UNKNOWN &&
verbosity > 1)
cvs_log(LP_NOTICE, "Updating %s", cf->file_path);
return;
}
/*
* the bp buffer will be released inside rcs_kwexp_buf,
* which is called from cvs_checkout_file().
*/
bp = NULL;
cvs_file_classify(cf, 1);
switch (cf->file_status) {
case FILE_UNKNOWN:
cvs_printf("? %s\n", cf->file_path);
break;
case FILE_MODIFIED:
ret = update_has_conflict_markers(cf);
if (cf->file_ent->ce_conflict != NULL && ret == 1) {
cvs_printf("C %s\n", cf->file_path);
} else {
if (cf->file_ent->ce_conflict != NULL && ret == 0)
update_clear_conflict(cf);
cvs_printf("M %s\n", cf->file_path);
}
break;
case FILE_ADDED:
cvs_printf("A %s\n", cf->file_path);
break;
case FILE_REMOVED:
cvs_printf("R %s\n", cf->file_path);
break;
case FILE_CONFLICT:
cvs_printf("C %s\n", cf->file_path);
break;
case FILE_LOST:
case FILE_CHECKOUT:
case FILE_PATCH:
bp = rcs_getrev(cf->file_rcs, cf->file_rcs->rf_head);
if (bp == NULL)
fatal("cvs_update_local: failed to get HEAD");
cvs_checkout_file(cf, cf->file_rcs->rf_head, bp, 0);
cvs_printf("U %s\n", cf->file_path);
break;
case FILE_MERGE:
bp = cvs_diff3(cf->file_rcs, cf->file_path,
cf->file_ent->ce_rev, cf->file_rcs->rf_head, 1);
if (bp == NULL)
fatal("cvs_update_local: failed to merge");
cvs_checkout_file(cf, cf->file_rcs->rf_head, bp, CO_MERGE);
if (diff3_conflicts != 0) {
cvs_printf("C %s\n", cf->file_path);
} else {
update_clear_conflict(cf);
cvs_printf("M %s\n", cf->file_path);
}
break;
case FILE_UNLINK:
(void)unlink(cf->file_path);
case FILE_REMOVE_ENTRY:
entlist = cvs_ent_open(cf->file_wd);
cvs_ent_remove(entlist, cf->file_name);
cvs_ent_close(entlist, ENT_SYNC);
break;
default:
break;
}
}
static void
update_clear_conflict(struct cvs_file *cf)
{
int l;
time_t now;
CVSENTRIES *entlist;
char *entry, revbuf[16], timebuf[32];
cvs_log(LP_TRACE, "update_clear_conflict(%s)", cf->file_path);
time(&now);
ctime_r(&now, timebuf);
if (timebuf[strlen(timebuf) - 1] == '\n')
timebuf[strlen(timebuf) - 1] = '\0';
rcsnum_tostr(cf->file_ent->ce_rev, revbuf, sizeof(revbuf));
entry = xmalloc(CVS_ENT_MAXLINELEN);
l = snprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s//",
cf->file_name, revbuf, timebuf);
if (l == -1 || l >= CVS_ENT_MAXLINELEN)
fatal("update_clear_conflict: overflow");
entlist = cvs_ent_open(cf->file_wd);
cvs_ent_add(entlist, entry);
cvs_ent_close(entlist, ENT_SYNC);
xfree(entry);
}
/*
* XXX - this is the way GNU cvs checks for outstanding conflicts
* in a file after a merge. It is a very very bad approach and
* should be looked at once opencvs is working decently.
*/
int
update_has_conflict_markers(struct cvs_file *cf)
{
BUF *bp;
int conflict;
char *content;
struct cvs_line *lp;
struct cvs_lines *lines;
cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path);
if ((bp = cvs_buf_load(cf->file_path, BUF_AUTOEXT)) == NULL)
fatal("update_has_conflict_markers: failed to load %s",
cf->file_path);
cvs_buf_putc(bp, '\0');
content = cvs_buf_release(bp);
if ((lines = cvs_splitlines(content)) == NULL)
fatal("update_has_conflict_markers: failed to split lines");
xfree(content);
conflict = 0;
TAILQ_FOREACH(lp, &(lines->l_lines), l_list) {
if (lp->l_line == NULL)
continue;
if (!strncmp(lp->l_line, RCS_CONFLICT_MARKER1,
strlen(RCS_CONFLICT_MARKER1)) ||
!strncmp(lp->l_line, RCS_CONFLICT_MARKER2,
strlen(RCS_CONFLICT_MARKER2)) ||
!strncmp(lp->l_line, RCS_CONFLICT_MARKER3,
strlen(RCS_CONFLICT_MARKER3))) {
conflict = 1;
break;
}
}
cvs_freelines(lines);
return (conflict);
}
|