1*3aaa63ebSderaadt /* $OpenBSD: import.c,v 1.109 2019/06/28 13:35:00 deraadt Exp $ */
21dd2d57eSjoris /*
31dd2d57eSjoris * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
41dd2d57eSjoris *
51dd2d57eSjoris * Permission to use, copy, modify, and distribute this software for any
61dd2d57eSjoris * purpose with or without fee is hereby granted, provided that the above
71dd2d57eSjoris * copyright notice and this permission notice appear in all copies.
81dd2d57eSjoris *
91dd2d57eSjoris * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
101dd2d57eSjoris * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
111dd2d57eSjoris * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
121dd2d57eSjoris * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
131dd2d57eSjoris * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
141dd2d57eSjoris * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
151dd2d57eSjoris * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
161dd2d57eSjoris */
171dd2d57eSjoris
181f8531bdSotto #include <sys/stat.h>
191f8531bdSotto
201f8531bdSotto #include <errno.h>
211f8531bdSotto #include <fcntl.h>
22397ddb8aSnicm #include <stdlib.h>
231f8531bdSotto #include <string.h>
241f8531bdSotto #include <unistd.h>
251dd2d57eSjoris
261dd2d57eSjoris #include "cvs.h"
271dd2d57eSjoris #include "diff.h"
2827de14f8Sjoris #include "remote.h"
291dd2d57eSjoris
301dd2d57eSjoris void cvs_import_local(struct cvs_file *);
311dd2d57eSjoris
32b034d592Sjoris static void import_loginfo(char *);
331dd2d57eSjoris static void import_new(struct cvs_file *);
3422872efdScanacar static void import_printf(const char *, ...)
3522872efdScanacar __attribute__((format(printf, 1, 2)));
361dd2d57eSjoris static void import_update(struct cvs_file *);
37149246f9Sjoris static void import_tag(struct cvs_file *, RCSNUM *, RCSNUM *);
38784f2510Sjoris static BUF *import_get_rcsdiff(struct cvs_file *, RCSNUM *);
391dd2d57eSjoris
401dd2d57eSjoris #define IMPORT_DEFAULT_BRANCH "1.1.1"
411dd2d57eSjoris
42b034d592Sjoris extern char *loginfo;
43b034d592Sjoris extern char *logmsg;
44b034d592Sjoris
451dd2d57eSjoris static char *import_branch = IMPORT_DEFAULT_BRANCH;
461dd2d57eSjoris static char *vendor_tag = NULL;
47bcadbe00Sjoris static char **release_tags;
48174add3cSxsa static char *koptstr;
4966e10ff2Sxsa static int dflag = 0;
50bcadbe00Sjoris static int tagcount = 0;
51b034d592Sjoris static BUF *logbuf;
5266e10ff2Sxsa
531dd2d57eSjoris char *import_repository = NULL;
54149246f9Sjoris int import_conflicts = 0;
551dd2d57eSjoris
561dd2d57eSjoris struct cvs_cmd cvs_cmd_import = {
57f331ff59Stobias CVS_OP_IMPORT, CVS_USE_WDIR, "import",
581dd2d57eSjoris { "im", "imp" },
591dd2d57eSjoris "Import sources into CVS, using vendor branches",
60174add3cSxsa "[-b branch] [-d] [-k mode] [-m message] "
61174add3cSxsa "repository vendor-tag release-tags",
62174add3cSxsa "b:dk:m:",
631dd2d57eSjoris NULL,
641dd2d57eSjoris cvs_import
651dd2d57eSjoris };
661dd2d57eSjoris
671dd2d57eSjoris int
cvs_import(int argc,char ** argv)681dd2d57eSjoris cvs_import(int argc, char **argv)
691dd2d57eSjoris {
70bcadbe00Sjoris int i, ch;
71b9fc9a72Sderaadt char repo[PATH_MAX], *arg = ".";
721dd2d57eSjoris struct cvs_recursion cr;
73b034d592Sjoris struct trigger_list *line_list;
741dd2d57eSjoris
751dd2d57eSjoris while ((ch = getopt(argc, argv, cvs_cmd_import.cmd_opts)) != -1) {
761dd2d57eSjoris switch (ch) {
771dd2d57eSjoris case 'b':
781dd2d57eSjoris import_branch = optarg;
791dd2d57eSjoris break;
8066e10ff2Sxsa case 'd':
8166e10ff2Sxsa dflag = 1;
8266e10ff2Sxsa break;
83174add3cSxsa case 'k':
84174add3cSxsa koptstr = optarg;
85174add3cSxsa kflag = rcs_kflag_get(koptstr);
86174add3cSxsa if (RCS_KWEXP_INVAL(kflag)) {
87174add3cSxsa cvs_log(LP_ERR,
880bc1d395Stobias "invalid RCS keyword expansion mode");
89174add3cSxsa fatal("%s", cvs_cmd_import.cmd_synopsis);
90174add3cSxsa }
91174add3cSxsa break;
921dd2d57eSjoris case 'm':
931dd2d57eSjoris logmsg = optarg;
941dd2d57eSjoris break;
951dd2d57eSjoris default:
961dd2d57eSjoris fatal("%s", cvs_cmd_import.cmd_synopsis);
971dd2d57eSjoris break;
981dd2d57eSjoris }
991dd2d57eSjoris }
1001dd2d57eSjoris
1011dd2d57eSjoris argc -= optind;
1021dd2d57eSjoris argv += optind;
1031dd2d57eSjoris
1041dd2d57eSjoris if (argc < 3)
1051dd2d57eSjoris fatal("%s", cvs_cmd_import.cmd_synopsis);
1061dd2d57eSjoris
107daeea3f0Sjoris import_repository = argv[0];
108daeea3f0Sjoris vendor_tag = argv[1];
109bcadbe00Sjoris argc -= 2;
110bcadbe00Sjoris argv += 2;
111bcadbe00Sjoris
112bcadbe00Sjoris release_tags = argv;
113bcadbe00Sjoris tagcount = argc;
114daeea3f0Sjoris
115daeea3f0Sjoris if (!rcs_sym_check(vendor_tag))
116daeea3f0Sjoris fatal("invalid symbol: %s", vendor_tag);
117bcadbe00Sjoris
118bcadbe00Sjoris for (i = 0; i < tagcount; i++) {
119bcadbe00Sjoris if (!rcs_sym_check(release_tags[i]))
120bcadbe00Sjoris fatal("invalid symbol: %s", release_tags[i]);
121bcadbe00Sjoris }
122daeea3f0Sjoris
12346817e92Stobias if (logmsg == NULL) {
12446817e92Stobias if (cvs_server_active)
12546817e92Stobias fatal("no log message specified");
12646817e92Stobias else
12784920933Stobias logmsg = cvs_logmsg_create(NULL, NULL, NULL, NULL);
12846817e92Stobias }
1291dd2d57eSjoris
1304dcde513Sjoris if (cvsroot_is_remote()) {
13127de14f8Sjoris cvs_client_connect_to_server();
13227de14f8Sjoris
13327de14f8Sjoris cvs_client_send_request("Argument -b%s", IMPORT_DEFAULT_BRANCH);
134174add3cSxsa
13537fdff3fStobias if (kflag)
136174add3cSxsa cvs_client_send_request("Argument -k%s", koptstr);
137174add3cSxsa
138f76ce13cSjoris cvs_client_send_logmsg(logmsg);
13927de14f8Sjoris cvs_client_send_request("Argument %s", import_repository);
14027de14f8Sjoris cvs_client_send_request("Argument %s", vendor_tag);
141bcadbe00Sjoris for (i = 0; i < tagcount; i++)
142bcadbe00Sjoris cvs_client_send_request("Argument %s", release_tags[i]);
14327de14f8Sjoris
14427de14f8Sjoris cr.enterdir = NULL;
14527de14f8Sjoris cr.leavedir = NULL;
14627de14f8Sjoris cr.fileproc = cvs_client_sendfile;
14727de14f8Sjoris cr.flags = CR_RECURSE_DIRS;
14827de14f8Sjoris
14927de14f8Sjoris cvs_file_run(1, &arg, &cr);
15027de14f8Sjoris cvs_client_senddir(".");
15127de14f8Sjoris cvs_client_send_request("import");
15227de14f8Sjoris
15327de14f8Sjoris cvs_client_get_responses();
15427de14f8Sjoris return (0);
15527de14f8Sjoris }
15627de14f8Sjoris
157b034d592Sjoris if (cvs_logmsg_verify(logmsg))
158b034d592Sjoris return (0);
159b034d592Sjoris
160e40de241Sxsa (void)xsnprintf(repo, sizeof(repo), "%s/%s",
161e40de241Sxsa current_cvsroot->cr_dir, import_repository);
1621dd2d57eSjoris
163b034d592Sjoris import_loginfo(import_repository);
164b034d592Sjoris
1650f651f47Snicm if (cvs_noexec != 1)
1660f651f47Snicm cvs_mkdir(repo, 0755);
1671dd2d57eSjoris
1681dd2d57eSjoris cr.enterdir = NULL;
1691dd2d57eSjoris cr.leavedir = NULL;
170bc5d89feSjoris cr.fileproc = cvs_import_local;
1711dd2d57eSjoris cr.flags = CR_RECURSE_DIRS;
1721dd2d57eSjoris cvs_file_run(1, &arg, &cr);
1731dd2d57eSjoris
174149246f9Sjoris if (import_conflicts != 0) {
175b034d592Sjoris import_printf("\n%d conflicts created by this import.\n\n",
176149246f9Sjoris import_conflicts);
177b034d592Sjoris import_printf("Use the following command to help the merge:\n");
178b034d592Sjoris import_printf("\topencvs checkout ");
179b034d592Sjoris import_printf("-j%s:yesterday -j%s %s\n\n", vendor_tag,
180149246f9Sjoris vendor_tag, import_repository);
181149246f9Sjoris } else {
182b034d592Sjoris import_printf("\nNo conflicts created by this import.\n\n");
183149246f9Sjoris }
184149246f9Sjoris
1857bb3ddb0Sray loginfo = buf_release(logbuf);
186b034d592Sjoris logbuf = NULL;
187b034d592Sjoris
188b034d592Sjoris line_list = cvs_trigger_getlines(CVS_PATH_LOGINFO, import_repository);
189b034d592Sjoris if (line_list != NULL) {
190b034d592Sjoris cvs_trigger_handle(CVS_TRIGGER_LOGINFO, import_repository,
191b034d592Sjoris loginfo, line_list, NULL);
192b034d592Sjoris cvs_trigger_freelist(line_list);
193b034d592Sjoris }
194b034d592Sjoris
195397ddb8aSnicm free(loginfo);
1961dd2d57eSjoris return (0);
1971dd2d57eSjoris }
1981dd2d57eSjoris
199b034d592Sjoris static void
import_printf(const char * fmt,...)200b034d592Sjoris import_printf(const char *fmt, ...)
201b034d592Sjoris {
202b034d592Sjoris char *str;
203b034d592Sjoris va_list vap;
204b034d592Sjoris
205b034d592Sjoris va_start(vap, fmt);
206b034d592Sjoris if (vasprintf(&str, fmt, vap) == -1)
207b034d592Sjoris fatal("import_printf: could not allocate memory");
208b034d592Sjoris va_end(vap);
209b034d592Sjoris
210b034d592Sjoris cvs_printf("%s", str);
2117bb3ddb0Sray buf_puts(logbuf, str);
21246a82e95Smartynas
213397ddb8aSnicm free(str);
214b034d592Sjoris }
215b034d592Sjoris
2161dd2d57eSjoris void
cvs_import_ignored(const char * path)217fcdcc3e6Sjoris cvs_import_ignored(const char *path)
218fcdcc3e6Sjoris {
219fcdcc3e6Sjoris const char *p;
220fcdcc3e6Sjoris
221fcdcc3e6Sjoris for (p = path; p[0] == '.' && p[1] == '/';)
222fcdcc3e6Sjoris p += 2;
223fcdcc3e6Sjoris
224fcdcc3e6Sjoris import_printf("I %s/%s\n", import_repository, p);
225fcdcc3e6Sjoris }
226fcdcc3e6Sjoris
227fcdcc3e6Sjoris void
cvs_import_local(struct cvs_file * cf)2281dd2d57eSjoris cvs_import_local(struct cvs_file *cf)
2291dd2d57eSjoris {
2301dd2d57eSjoris int isnew;
2311dd2d57eSjoris struct stat st;
232b9fc9a72Sderaadt char repo[PATH_MAX];
2331dd2d57eSjoris
2341dd2d57eSjoris cvs_log(LP_TRACE, "cvs_import_local(%s)", cf->file_path);
2351dd2d57eSjoris
23651ef6581Sjoris cvs_file_classify(cf, cvs_directory_tag);
2371dd2d57eSjoris
2381dd2d57eSjoris if (cf->file_type == CVS_DIR) {
2391dd2d57eSjoris if (!strcmp(cf->file_path, "."))
2401dd2d57eSjoris return;
2411dd2d57eSjoris
2421dd2d57eSjoris if (verbosity > 1)
2431dd2d57eSjoris cvs_log(LP_NOTICE, "Importing %s", cf->file_path);
2441dd2d57eSjoris
2457938e528Sjoris if (cvs_noexec == 1)
2467938e528Sjoris return;
2471dd2d57eSjoris
2481dd2d57eSjoris if (mkdir(cf->file_rpath, 0755) == -1 && errno != EEXIST)
2491dd2d57eSjoris fatal("cvs_import_local: %s: %s", cf->file_rpath,
2501dd2d57eSjoris strerror(errno));
2511dd2d57eSjoris
2521dd2d57eSjoris return;
2531dd2d57eSjoris }
2541dd2d57eSjoris
2551dd2d57eSjoris isnew = 1;
256c486465dSxsa (void)xsnprintf(repo, sizeof(repo), "%s/%s/%s/%s%s",
2571dd2d57eSjoris current_cvsroot->cr_dir, cf->file_wd, CVS_PATH_ATTIC,
2581dd2d57eSjoris cf->file_name, RCS_FILE_EXT);
2591dd2d57eSjoris
2601dd2d57eSjoris if (cf->file_rcs != NULL || stat(repo, &st) != -1)
2611dd2d57eSjoris isnew = 0;
2621dd2d57eSjoris
2631dd2d57eSjoris if (isnew == 1)
2641dd2d57eSjoris import_new(cf);
2651dd2d57eSjoris else
2661dd2d57eSjoris import_update(cf);
2671dd2d57eSjoris }
2681dd2d57eSjoris
2691dd2d57eSjoris static void
import_loginfo(char * repo)270b034d592Sjoris import_loginfo(char *repo)
271b034d592Sjoris {
272b034d592Sjoris int i;
273b9fc9a72Sderaadt char pwd[PATH_MAX];
274b034d592Sjoris
275b034d592Sjoris if (getcwd(pwd, sizeof(pwd)) == NULL)
276b034d592Sjoris fatal("Can't get working directory");
277b034d592Sjoris
2787bb3ddb0Sray logbuf = buf_alloc(1024);
279b034d592Sjoris cvs_trigger_loginfo_header(logbuf, repo);
280b034d592Sjoris
2817bb3ddb0Sray buf_puts(logbuf, "Log Message:\n");
2827bb3ddb0Sray buf_puts(logbuf, logmsg);
283b034d592Sjoris if (logmsg[0] != '\0' && logmsg[strlen(logmsg) - 1] != '\n')
2847bb3ddb0Sray buf_putc(logbuf, '\n');
2857bb3ddb0Sray buf_putc(logbuf, '\n');
286b034d592Sjoris
2877bb3ddb0Sray buf_puts(logbuf, "Status:\n\n");
288b034d592Sjoris
2897bb3ddb0Sray buf_puts(logbuf, "Vendor Tag:\t");
2907bb3ddb0Sray buf_puts(logbuf, vendor_tag);
2917bb3ddb0Sray buf_putc(logbuf, '\n');
2927bb3ddb0Sray buf_puts(logbuf, "Release Tags:\t");
293b034d592Sjoris
294b034d592Sjoris for (i = 0; i < tagcount ; i++) {
2957bb3ddb0Sray buf_puts(logbuf, "\t\t");
2967bb3ddb0Sray buf_puts(logbuf, release_tags[i]);
2977bb3ddb0Sray buf_putc(logbuf, '\n');
298b034d592Sjoris }
2997bb3ddb0Sray buf_putc(logbuf, '\n');
3007bb3ddb0Sray buf_putc(logbuf, '\n');
301b034d592Sjoris }
302b034d592Sjoris
303b034d592Sjoris static void
import_new(struct cvs_file * cf)3041dd2d57eSjoris import_new(struct cvs_file *cf)
3051dd2d57eSjoris {
306bcadbe00Sjoris int i;
3071dd2d57eSjoris BUF *bp;
3080d18a67fSjoris mode_t mode;
30966e10ff2Sxsa time_t tstamp;
31066e10ff2Sxsa struct stat st;
3111dd2d57eSjoris struct rcs_branch *brp;
3121dd2d57eSjoris struct rcs_delta *rdp;
3131dd2d57eSjoris RCSNUM *branch, *brev;
3141dd2d57eSjoris
31566e10ff2Sxsa tstamp = -1;
31666e10ff2Sxsa
3171dd2d57eSjoris cvs_log(LP_TRACE, "import_new(%s)", cf->file_name);
3181dd2d57eSjoris
3197938e528Sjoris if (cvs_noexec == 1) {
320b034d592Sjoris import_printf("N %s/%s\n", import_repository, cf->file_path);
3217938e528Sjoris return;
3227938e528Sjoris }
3237938e528Sjoris
32466e10ff2Sxsa if (fstat(cf->fd, &st) == -1)
32566e10ff2Sxsa fatal("import_new: %s", strerror(errno));
32666e10ff2Sxsa
3270d18a67fSjoris mode = st.st_mode;
3280d18a67fSjoris
3290d18a67fSjoris if (dflag == 1)
33066e10ff2Sxsa tstamp = st.st_mtime;
33166e10ff2Sxsa
3321dd2d57eSjoris if ((branch = rcsnum_parse(import_branch)) == NULL)
3331dd2d57eSjoris fatal("import_new: failed to parse branch");
3341dd2d57eSjoris
3357bb3ddb0Sray bp = buf_load_fd(cf->fd);
3361dd2d57eSjoris
3371dd2d57eSjoris if ((brev = rcsnum_brtorev(branch)) == NULL)
3381dd2d57eSjoris fatal("import_new: failed to get first branch revision");
3391dd2d57eSjoris
3405844e37dSjoris cf->repo_fd = open(cf->file_rpath, O_CREAT | O_RDONLY);
341*3aaa63ebSderaadt if (cf->repo_fd == -1)
3421dd2d57eSjoris fatal("import_new: %s: %s", cf->file_rpath, strerror(errno));
3431dd2d57eSjoris
3440d18a67fSjoris cf->file_rcs = rcs_open(cf->file_rpath, cf->repo_fd, RCS_CREATE,
3450d18a67fSjoris (mode & ~(S_IWUSR | S_IWGRP | S_IWOTH)));
3461dd2d57eSjoris if (cf->file_rcs == NULL)
3471dd2d57eSjoris fatal("import_new: failed to create RCS file for %s",
3481dd2d57eSjoris cf->file_path);
3491dd2d57eSjoris
3501dd2d57eSjoris rcs_branch_set(cf->file_rcs, branch);
3511dd2d57eSjoris
3521dd2d57eSjoris if (rcs_sym_add(cf->file_rcs, vendor_tag, branch) == -1)
353ad05ad6aSxsa fatal("import_new: failed to add vendor tag");
3541dd2d57eSjoris
355bcadbe00Sjoris for (i = 0; i < tagcount; i++) {
356bcadbe00Sjoris if (rcs_sym_add(cf->file_rcs, release_tags[i], brev) == -1)
357ad05ad6aSxsa fatal("import_new: failed to add release tag");
358bcadbe00Sjoris }
3591dd2d57eSjoris
36066e10ff2Sxsa if (rcs_rev_add(cf->file_rcs, brev, logmsg, tstamp, NULL) == -1)
3611dd2d57eSjoris fatal("import_new: failed to create first branch revision");
3621dd2d57eSjoris
363acfe2e44Stobias if (rcs_rev_add(cf->file_rcs, RCS_HEAD_REV, "Initial revision",
364acfe2e44Stobias tstamp, NULL) == -1)
3651dd2d57eSjoris fatal("import_new: failed to create first revision");
3661dd2d57eSjoris
3671dd2d57eSjoris if ((rdp = rcs_findrev(cf->file_rcs, cf->file_rcs->rf_head)) == NULL)
3681dd2d57eSjoris fatal("import_new: cannot find newly added revision");
3691dd2d57eSjoris
3701dd2d57eSjoris brp = xmalloc(sizeof(*brp));
3711dd2d57eSjoris brp->rb_num = rcsnum_alloc();
3721dd2d57eSjoris rcsnum_cpy(brev, brp->rb_num, 0);
3731dd2d57eSjoris TAILQ_INSERT_TAIL(&(rdp->rd_branches), brp, rb_list);
3741dd2d57eSjoris
3751dd2d57eSjoris if (rcs_deltatext_set(cf->file_rcs,
3764d33f394Sjoris cf->file_rcs->rf_head, bp) == -1)
3771dd2d57eSjoris fatal("import_new: failed to set deltatext");
3781dd2d57eSjoris
37937fdff3fStobias if (kflag)
380174add3cSxsa rcs_kwexp_set(cf->file_rcs, kflag);
381174add3cSxsa
3821dd2d57eSjoris rcs_write(cf->file_rcs);
383b034d592Sjoris import_printf("N %s/%s\n", import_repository, cf->file_path);
3841dd2d57eSjoris
38553ce2177Sfcambus free(branch);
38653ce2177Sfcambus free(brev);
3871dd2d57eSjoris }
3881dd2d57eSjoris
3891dd2d57eSjoris static void
import_update(struct cvs_file * cf)3901dd2d57eSjoris import_update(struct cvs_file *cf)
3911dd2d57eSjoris {
39227de14f8Sjoris int ret;
393784f2510Sjoris BUF *b1, *b2, *d;
3940a7da307Sxsa char branch[CVS_REV_BUFSZ];
395264c995dSjoris RCSNUM *newrev, *rev, *brev;
396149246f9Sjoris
3971dd2d57eSjoris cvs_log(LP_TRACE, "import_update(%s)", cf->file_path);
398149246f9Sjoris
399e28eda4eStobias if (cf->file_rcs->rf_head == NULL)
400e28eda4eStobias fatal("no head revision in RCS file for `%s'", cf->file_path);
401e28eda4eStobias
402bd433604Sniallo if ((rev = rcs_translate_tag(import_branch, cf->file_rcs)) == NULL)
4030a178a7dStobias fatal("import_update: could not translate tag `%s'",
4040a178a7dStobias import_branch);
405149246f9Sjoris
406149246f9Sjoris if ((brev = rcsnum_parse(import_branch)) == NULL)
407149246f9Sjoris fatal("import_update: rcsnum_parse failed");
408149246f9Sjoris
4090a178a7dStobias b1 = rcs_rev_getbuf(cf->file_rcs, rev, RCS_KWEXP_NONE);
4107bb3ddb0Sray b2 = buf_load_fd(cf->fd);
411149246f9Sjoris
4127bb3ddb0Sray ret = buf_differ(b1, b2);
4137bb3ddb0Sray buf_free(b1);
4147bb3ddb0Sray buf_free(b2);
41527de14f8Sjoris if (ret == 0) {
416149246f9Sjoris import_tag(cf, brev, rev);
41753ce2177Sfcambus free(brev);
418b00fc98dSjoris if (cvs_noexec != 1)
419149246f9Sjoris rcs_write(cf->file_rcs);
420b034d592Sjoris import_printf("U %s/%s\n", import_repository, cf->file_path);
421149246f9Sjoris return;
422149246f9Sjoris }
423149246f9Sjoris
424149246f9Sjoris if (cf->file_rcs->rf_branch != NULL)
425149246f9Sjoris rcsnum_tostr(cf->file_rcs->rf_branch, branch, sizeof(branch));
426149246f9Sjoris
427b00fc98dSjoris if (cf->file_rcs->rf_branch == NULL || cf->in_attic == 1 ||
428b00fc98dSjoris strcmp(branch, import_branch)) {
429b00fc98dSjoris import_conflicts++;
430b034d592Sjoris import_printf("C %s/%s\n", import_repository, cf->file_path);
431b00fc98dSjoris } else {
432b034d592Sjoris import_printf("U %s/%s\n", import_repository, cf->file_path);
433b00fc98dSjoris }
434b00fc98dSjoris
435b00fc98dSjoris if (cvs_noexec == 1)
436b00fc98dSjoris return;
437b00fc98dSjoris
438149246f9Sjoris d = import_get_rcsdiff(cf, rev);
439149246f9Sjoris newrev = rcsnum_inc(rev);
440149246f9Sjoris
441149246f9Sjoris if (rcs_rev_add(cf->file_rcs, newrev, logmsg, -1, NULL) == -1)
442149246f9Sjoris fatal("import_update: failed to add new revision");
443149246f9Sjoris
444149246f9Sjoris if (rcs_deltatext_set(cf->file_rcs, newrev, d) == -1)
445149246f9Sjoris fatal("import_update: failed to set deltatext");
4467938e528Sjoris
447149246f9Sjoris import_tag(cf, brev, newrev);
448149246f9Sjoris
44937fdff3fStobias if (kflag)
450174add3cSxsa rcs_kwexp_set(cf->file_rcs, kflag);
451174add3cSxsa
45253ce2177Sfcambus free(brev);
453149246f9Sjoris rcs_write(cf->file_rcs);
454149246f9Sjoris }
455149246f9Sjoris
456149246f9Sjoris static void
import_tag(struct cvs_file * cf,RCSNUM * branch,RCSNUM * newrev)457149246f9Sjoris import_tag(struct cvs_file *cf, RCSNUM *branch, RCSNUM *newrev)
458149246f9Sjoris {
459bcadbe00Sjoris int i;
460149246f9Sjoris
4617938e528Sjoris if (cvs_noexec != 1) {
462149246f9Sjoris rcs_sym_add(cf->file_rcs, vendor_tag, branch);
463149246f9Sjoris
464bcadbe00Sjoris for (i = 0; i < tagcount; i++)
465bcadbe00Sjoris rcs_sym_add(cf->file_rcs, release_tags[i], newrev);
466149246f9Sjoris }
4677938e528Sjoris }
468149246f9Sjoris
469784f2510Sjoris static BUF *
import_get_rcsdiff(struct cvs_file * cf,RCSNUM * rev)470149246f9Sjoris import_get_rcsdiff(struct cvs_file *cf, RCSNUM *rev)
471149246f9Sjoris {
472784f2510Sjoris char *p1, *p2;
4730dbb72f1Sniallo BUF *b1, *b2;
4742e0d696aSjoris int fd1, fd2;
475149246f9Sjoris
4767bb3ddb0Sray b2 = buf_alloc(128);
477149246f9Sjoris
4787bb3ddb0Sray b1 = buf_load_fd(cf->fd);
47927de14f8Sjoris
480149246f9Sjoris (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir);
4817bb3ddb0Sray fd1 = buf_write_stmp(b1, p1, NULL);
4827bb3ddb0Sray buf_free(b1);
483149246f9Sjoris
484149246f9Sjoris (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
4852e0d696aSjoris fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
486149246f9Sjoris
487149246f9Sjoris diff_format = D_RCSDIFF;
48857003866Sray if (diffreg(p2, p1, fd2, fd1, b2, D_FORCEASCII) == D_ERROR)
489149246f9Sjoris fatal("import_get_rcsdiff: failed to get RCS patch");
490b6035663Sxsa
4912e0d696aSjoris close(fd1);
4922e0d696aSjoris close(fd2);
4932e0d696aSjoris
494d7c79aeaSxsa (void)unlink(p1);
495d7c79aeaSxsa (void)unlink(p2);
496d7c79aeaSxsa
497397ddb8aSnicm free(p1);
498397ddb8aSnicm free(p2);
499149246f9Sjoris
500784f2510Sjoris return (b2);
5011dd2d57eSjoris }
502