diff options
author | obrien <obrien@FreeBSD.org> | 2008-01-13 06:04:43 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2008-01-13 06:04:43 +0000 |
commit | f8bcc52bc38fa4e66250b15d952f75630cd5ae47 (patch) | |
tree | 3fd19d7c8d6d64bb9718cbc97c13aff8a31086e0 /contrib/cvs | |
parent | 656984433196a60e38a5de0084058107dbbc3fa3 (diff) | |
download | FreeBSD-src-f8bcc52bc38fa4e66250b15d952f75630cd5ae47.zip FreeBSD-src-f8bcc52bc38fa4e66250b15d952f75630cd5ae47.tar.gz |
Change default from rsh to ssh. (moved from client.c).
Merge rev 1.14: comprehensive -T CVS/Template support, rev 1.9: new long
flag that causes cvs to ignore the CVSROOT/passwd file, rev 1.3: support
for checking out from a read-only repository, rev. 1.2: support for local
$Id$ keyword into cvs 1.11.22.
Note that rev 1.4 (make verifymsg extra useful) is OBE.
Diffstat (limited to 'contrib/cvs')
-rw-r--r-- | contrib/cvs/src/cvs.h | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/contrib/cvs/src/cvs.h b/contrib/cvs/src/cvs.h index c47cdcf..f412aa0 100644 --- a/contrib/cvs/src/cvs.h +++ b/contrib/cvs/src/cvs.h @@ -1,6 +1,11 @@ /* - * Copyright (c) 1992, Brian Berliner and Jeff Polk - * Copyright (c) 1989-1992, Brian Berliner + * Copyright (C) 1986-2005 The Free Software Foundation, Inc. + * + * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>, + * and others. + * + * Portions Copyright (C) 1992, Brian Berliner and Jeff Polk + * Portions Copyright (C) 1989-1992, Brian Berliner * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS kit. @@ -209,6 +214,8 @@ extern int errno; #define CVSATTIC "Attic" #define CVSLCK "#cvs.lock" +#define CVSHISTORYLCK "#cvs.history.lock" +#define CVSVALTAGSLCK "#cvs.val-tags.lock" #define CVSRFL "#cvs.rfl" #define CVSWFL "#cvs.wfl" #define CVSRFLPAT "#cvs.rfl.*" /* wildcard expr to match read locks */ @@ -274,7 +281,10 @@ extern int errno; #define EDITOR3_ENV "EDITOR" /* which editor to use */ #define CVSROOT_ENV "CVSROOT" /* source directory root */ -#define CVSROOT_DFLT NULL /* No dflt; must set for checkout */ +/* Define CVSROOT_DFLT to a fallback value for CVSROOT. + * +#undef CVSROOT_DFL + */ #define IGNORE_ENV "CVSIGNORE" /* More files to ignore */ #define WRAPPER_ENV "CVSWRAPPERS" /* name of the wrapper file */ @@ -294,6 +304,9 @@ extern int errno; command line, the client, etc. */ #define MAXDATELEN 50 +/* FreeBSD.org default is to use ssh. */ +#define RSH_DFLT "ssh" + /* The type of an entnode. */ enum ent_type { @@ -426,15 +439,18 @@ int RCS_merge PROTO((RCSNode *, const char *, const char *, const char *, #define RCS_FLAGS_QUIET 4 #define RCS_FLAGS_MODTIME 8 #define RCS_FLAGS_KEEPFILE 16 +#define RCS_FLAGS_USETIME 32 -extern int RCS_exec_rcsdiff PROTO ((RCSNode *rcsfile, - const char *opts, const char *options, +extern int RCS_exec_rcsdiff PROTO ((RCSNode *rcsfile, int diff_argc, + char *const *diff_argv, + const char *options, const char *rev1, const char *rev1_cache, const char *rev2, const char *label1, const char *label2, const char *workfile)); extern int diff_exec PROTO ((const char *file1, const char *file2, const char *label1, const char *label2, - const char *options, const char *out)); + int diff_argc, char *const *diff_argv, + const char *out)); #include "error.h" @@ -458,15 +474,6 @@ char *Name_Repository PROTO((const char *dir, const char *update_dir)); const char *Short_Repository PROTO((const char *repository)); void Sanitize_Repository_Name PROTO((char *repository)); -char *Name_Root PROTO((char *dir, char *update_dir)); -void free_cvsroot_t PROTO((cvsroot_t *root_in)); -cvsroot_t *parse_cvsroot PROTO((const char *root)); -cvsroot_t *local_cvsroot PROTO((const char *dir)); -void Create_Root PROTO((const char *dir, const char *rootdir)); -void root_allow_add PROTO ((char *)); -void root_allow_free PROTO ((void)); -int root_allow_ok PROTO ((char *)); - char *previous_rev PROTO ((RCSNode *rcs, const char *rev)); char *gca PROTO ((const char *rev1, const char *rev2)); extern void check_numeric PROTO ((const char *, int, char **)); @@ -576,6 +583,14 @@ void lock_tree_for_write PROTO ((int argc, char **argv, int local, int which, /* See lock.c for description. */ extern void lock_dir_for_write PROTO ((char *)); +/* Get a write lock for the history file. */ +int history_lock PROTO ((const char *)); +void clear_history_lock PROTO ((void)); + +/* Get a write lock for the val-tags file. */ +int val_tags_lock PROTO ((const char *)); +void clear_val_tags_lock PROTO ((void)); + /* LockDir setting from CVSROOT/config. */ extern char *lock_dir; @@ -676,8 +691,6 @@ int SIG_inCrSect PROTO((void)); void read_cvsrc PROTO((int *argc, char ***argv, const char *cmdname)); char *make_message_rcslegal PROTO((const char *message)); -extern int file_has_conflict PROTO ((const struct file_info *, - const char *ts_conflict)); extern int file_has_markers PROTO ((const struct file_info *)); extern void get_file PROTO ((const char *, const char *, const char *, char **, size_t *, size_t *)); @@ -695,6 +708,8 @@ void sleep_past PROTO ((time_t desttime)); #define RUN_SIGIGNORE 0x0010 /* ignore interrupts for command */ #define RUN_TTY (char *)0 /* for the benefit of lint */ +void run_add_arg_p PROTO ((int *, size_t *, char ***, const char *s)); +void run_arg_free_p PROTO ((int, char **)); void run_arg PROTO((const char *s)); void run_print PROTO((FILE * fp)); void run_setup PROTO ((const char *prog)); @@ -703,7 +718,7 @@ int run_exec PROTO((const char *stin, const char *stout, const char *sterr, /* other similar-minded stuff from run.c. */ FILE *run_popen PROTO((const char *, const char *)); -int piped_child PROTO((const char **, int *, int *)); +int piped_child PROTO((const char **, int *, int *, int)); void close_on_exec PROTO((int)); pid_t waitpid PROTO((pid_t, int *, int)); |