Deleted Added
sdiff udiff text old ( 102843 ) new ( 107487 )
full compact
import.c (102843) import.c (107487)
1/*
2 * Copyright (c) 1992, Brian Berliner and Jeff Polk
3 * Copyright (c) 1989-1992, Brian Berliner
4 *
5 * You may distribute under the terms of the GNU General Public License as
6 * specified in the README file that comes with the CVS source distribution.
7 *
8 * "import" checks in the vendor release located in the current directory into
9 * the CVS source repository. The CVS vendor branch support is utilized.
10 *
11 * At least three arguments are expected to follow the options:
12 * repository Where the source belongs relative to the CVSROOT
13 * VendorTag Vendor's major tag
14 * VendorReleTag Tag for this particular release
15 *
16 * Additional arguments specify more Vendor Release Tags.
17 *
1/*
2 * Copyright (c) 1992, Brian Berliner and Jeff Polk
3 * Copyright (c) 1989-1992, Brian Berliner
4 *
5 * You may distribute under the terms of the GNU General Public License as
6 * specified in the README file that comes with the CVS source distribution.
7 *
8 * "import" checks in the vendor release located in the current directory into
9 * the CVS source repository. The CVS vendor branch support is utilized.
10 *
11 * At least three arguments are expected to follow the options:
12 * repository Where the source belongs relative to the CVSROOT
13 * VendorTag Vendor's major tag
14 * VendorReleTag Tag for this particular release
15 *
16 * Additional arguments specify more Vendor Release Tags.
17 *
18 * $FreeBSD: head/contrib/cvs/src/import.c 102843 2002-09-02 05:57:14Z peter $
18 * $FreeBSD: head/contrib/cvs/src/import.c 107487 2002-12-02 03:17:49Z peter $
19 */
20
21#include "cvs.h"
22#include "savecwd.h"
23#include <assert.h>
24
25static char *get_comment PROTO((char *user));
26static int add_rev PROTO((char *message, RCSNode *rcs, char *vfile,

--- 186 unchanged lines hidden (view full) ---

213 if (current_parsed_root->isremote)
214 {
215 /* For rationale behind calling start_server before do_editor, see
216 commit.c */
217 start_server ();
218 }
219#endif
220
19 */
20
21#include "cvs.h"
22#include "savecwd.h"
23#include <assert.h>
24
25static char *get_comment PROTO((char *user));
26static int add_rev PROTO((char *message, RCSNode *rcs, char *vfile,

--- 186 unchanged lines hidden (view full) ---

213 if (current_parsed_root->isremote)
214 {
215 /* For rationale behind calling start_server before do_editor, see
216 commit.c */
217 start_server ();
218 }
219#endif
220
221 if (use_editor)
221 if (
222#ifdef SERVER_SUPPORT
223 !server_active &&
224#endif
225 use_editor)
222 {
223 do_editor ((char *) NULL, &message,
224#ifdef CLIENT_SUPPORT
225 current_parsed_root->isremote ? (char *) NULL :
226#endif
227 repository,
228 (List *) NULL);
229 }

--- 14 unchanged lines hidden (view full) ---

244
245#ifdef CLIENT_SUPPORT
246 if (current_parsed_root->isremote)
247 {
248 int err;
249
250 if (vbranch[0] != '\0')
251 option_with_arg ("-b", vbranch);
226 {
227 do_editor ((char *) NULL, &message,
228#ifdef CLIENT_SUPPORT
229 current_parsed_root->isremote ? (char *) NULL :
230#endif
231 repository,
232 (List *) NULL);
233 }

--- 14 unchanged lines hidden (view full) ---

248
249#ifdef CLIENT_SUPPORT
250 if (current_parsed_root->isremote)
251 {
252 int err;
253
254 if (vbranch[0] != '\0')
255 option_with_arg ("-b", vbranch);
252 if (message)
253 option_with_arg ("-m", message);
256 option_with_arg ("-m", message ? message : "");
254 if (keyword_opt != NULL)
255 option_with_arg ("-k", keyword_opt);
256 /* The only ignore processing which takes place on the server side
257 is the CVSROOT/cvsignore file. But if the user specified -I !,
258 the documented behavior is to not process said file. */
259 if (ign_inhibit_server)
260 {
261 send_arg ("-I");

--- 960 unchanged lines hidden (view full) ---

1222 if (fprintf (fprcs, "permissions\t%o;\012",
1223 sb.st_mode & 07777) < 0)
1224 goto write_error;
1225 switch (file_type)
1226 {
1227 case S_IFREG: break;
1228 case S_IFCHR:
1229 case S_IFBLK:
257 if (keyword_opt != NULL)
258 option_with_arg ("-k", keyword_opt);
259 /* The only ignore processing which takes place on the server side
260 is the CVSROOT/cvsignore file. But if the user specified -I !,
261 the documented behavior is to not process said file. */
262 if (ign_inhibit_server)
263 {
264 send_arg ("-I");

--- 960 unchanged lines hidden (view full) ---

1225 if (fprintf (fprcs, "permissions\t%o;\012",
1226 sb.st_mode & 07777) < 0)
1227 goto write_error;
1228 switch (file_type)
1229 {
1230 case S_IFREG: break;
1231 case S_IFCHR:
1232 case S_IFBLK:
1230#ifdef HAVE_ST_RDEV
1233#ifdef HAVE_STRUCT_STAT_ST_RDEV
1231 if (fprintf (fprcs, "special\t%s %lu;\012",
1232 (file_type == S_IFCHR
1233 ? "character"
1234 : "block"),
1235 (unsigned long) sb.st_rdev) < 0)
1236 goto write_error;
1237#else
1238 error (0, 0,

--- 40 unchanged lines hidden (view full) ---

1279 sb.st_mode & 07777) < 0)
1280 goto write_error;
1281
1282 switch (file_type)
1283 {
1284 case S_IFREG: break;
1285 case S_IFCHR:
1286 case S_IFBLK:
1234 if (fprintf (fprcs, "special\t%s %lu;\012",
1235 (file_type == S_IFCHR
1236 ? "character"
1237 : "block"),
1238 (unsigned long) sb.st_rdev) < 0)
1239 goto write_error;
1240#else
1241 error (0, 0,

--- 40 unchanged lines hidden (view full) ---

1282 sb.st_mode & 07777) < 0)
1283 goto write_error;
1284
1285 switch (file_type)
1286 {
1287 case S_IFREG: break;
1288 case S_IFCHR:
1289 case S_IFBLK:
1287#ifdef HAVE_ST_RDEV
1290#ifdef HAVE_STRUCT_STAT_ST_RDEV
1288 if (fprintf (fprcs, "special\t%s %lu;\012",
1289 (file_type == S_IFCHR
1290 ? "character"
1291 : "block"),
1292 (unsigned long) sb.st_rdev) < 0)
1293 goto write_error;
1294#else
1295 error (0, 0,

--- 335 unchanged lines hidden --- 		1291 if (fprintf (fprcs, "special\t%s %lu;\012",
1292 (file_type == S_IFCHR
1293 ? "character"
1294 : "block"),
1295 (unsigned long) sb.st_rdev) < 0)
1296 goto write_error;
1297#else
1298 error (0, 0,

--- 335 unchanged lines hidden ---