diff options
author | peter <peter@FreeBSD.org> | 1998-01-26 03:29:29 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1998-01-26 03:29:29 +0000 |
commit | 164a615da2f0b9b0bba03591fc1f2f176f5b2933 (patch) | |
tree | d10d012f4ecb383fc83011fd50d68d5be87327b5 /contrib/cvs/src/rcs.h | |
parent | 7a4c09bb4393297abf2afd137668362e5365befb (diff) | |
download | FreeBSD-src-164a615da2f0b9b0bba03591fc1f2f176f5b2933.zip FreeBSD-src-164a615da2f0b9b0bba03591fc1f2f176f5b2933.tar.gz |
Merge changes from CYCLIC onto main branch
Diffstat (limited to 'contrib/cvs/src/rcs.h')
-rw-r--r-- | contrib/cvs/src/rcs.h | 113 |
1 files changed, 102 insertions, 11 deletions
diff --git a/contrib/cvs/src/rcs.h b/contrib/cvs/src/rcs.h index 5054fd0..60c4f3f 100644 --- a/contrib/cvs/src/rcs.h +++ b/contrib/cvs/src/rcs.h @@ -3,16 +3,11 @@ * 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 1.4 kit. + * specified in the README file that comes with the CVS source distribution. * * RCS source control definitions needed by rcs.c and friends */ -#define RCS "rcs" -#define RCS_CI "ci" -#define RCS_DIFF "rcsdiff" -#define RCS_RCSMERGE "rcsmerge" - /* String which indicates a conflict if it occurs at the start of a line. */ #define RCS_MERGE_PAT ">>>>>>> " @@ -40,11 +35,21 @@ #define VALID 0x1 /* flags field contains valid data */ #define INATTIC 0x2 /* RCS file is located in the Attic */ #define PARTIAL 0x4 /* RCS file not completly parsed */ -#define NODELTA 0x8 /* delta_pos no longer valid */ + +/* All the "char *" fields in RCSNode, Deltatext, and RCSVers are + '\0'-terminated (except "text" in Deltatext). This means that we + can't deal with fields containing '\0', which is a limitation that + RCS does not have. Would be nice to fix this some day. */ struct rcsnode { + /* Reference count for this structure. Used to deal with the + fact that there might be a pointer from the Vers_TS or might + not. Callers who increment this field are responsible for + calling freercsnode when they are done with their reference. */ int refcount; + + /* Flags (INATTIC, PARTIAL, &c), see above. */ int flags; /* File name of the RCS file. This is not necessarily the name @@ -53,28 +58,102 @@ struct rcsnode (the various names might differ in case). */ char *path; + /* Value for head keyword from RCS header, or NULL if empty. */ char *head; + + /* Value for branch keyword from RCS header, or NULL if omitted. */ char *branch; + + /* Raw data on symbolic revisions. The first time that RCS_symbols is + called, we parse these into ->symbols, and free ->symbols_data. */ char *symbols_data; + + /* Value for expand keyword from RCS header, or NULL if omitted. */ char *expand; + + /* List of nodes, the key of which is the symbolic name and the data + of which is the numeric revision that it corresponds to (malloc'd). */ List *symbols; + + /* List of nodes (type RCSVERS), the key of which the numeric revision + number, and the data of which is an RCSVers * for the revision. */ List *versions; + + /* Value for access keyword from RCS header, or NULL if empty. + FIXME: RCS_delaccess would also seem to use "" for empty. We + should pick one or the other. */ + char *access; + + /* Raw data on locked revisions. The first time that RCS_getlocks is + called, we parse these into ->locks, and free ->locks_data. */ + char *locks_data; + + /* List of nodes, the key of which is the numeric revision and the + data of which is the user that it corresponds to (malloc'd). */ + List *locks; + + /* Set for the strict keyword from the RCS header. */ + int strict_locks; + + /* Value for the comment keyword from RCS header (comment leader), or + NULL if omitted. */ + char *comment; + + /* Value for the desc field in the RCS file, or NULL if empty. */ + char *desc; + + /* File offset of the first deltatext node, so we can seek there. */ long delta_pos; + + /* Newphrases from the RCS header. List of nodes, the key of which + is the "id" which introduces the newphrase, and the value of which + is the value from the newphrase. */ List *other; }; typedef struct rcsnode RCSNode; +struct deltatext { + char *version; + + /* Log message, or NULL if we do not intend to change the log message + (that is, RCS_copydeltas should just use the log message from the + file). */ + char *log; + + /* Change text, or NULL if we do not intend to change the change text + (that is, RCS_copydeltas should just use the change text from the + file). Note that it is perfectly legal to have log be NULL and + text non-NULL, or vice-versa. */ + char *text; + size_t len; + + /* Newphrase fields from deltatext nodes. FIXME: duplicates the + other field in the rcsversnode, I think. */ + List *other; +}; +typedef struct deltatext Deltatext; + struct rcsversnode { + /* Duplicate of the key by which this structure is indexed. */ char *version; + char *date; char *author; char *state; char *next; int dead; + int outdated; + Deltatext *text; List *branches; + /* Newphrase fields from deltatext nodes. Also contains ";add" and + ";delete" magic fields (see rcs.c, log.c). I think this is + only used by log.c (where it looks up "log"). Duplicates the + other field in struct deltatext, I think. */ List *other; + /* Newphrase fields from delta nodes. */ + List *other_delta; }; typedef struct rcsversnode RCSVers; @@ -96,6 +175,8 @@ typedef void (*RCSCHECKOUTPROC) PROTO ((void *, const char *, size_t)); RCSNode *RCS_parse PROTO((const char *file, const char *repos)); RCSNode *RCS_parsercsfile PROTO((char *rcsfile)); void RCS_fully_parse PROTO((RCSNode *)); +void RCS_reparsercsfile PROTO((RCSNode *, FILE **)); + char *RCS_check_kflag PROTO((const char *arg)); char *RCS_getdate PROTO((RCSNode * rcs, char *date, int force_tag_match)); char *RCS_gettag PROTO((RCSNode * rcs, char *symtag, int force_tag_match, @@ -111,6 +192,7 @@ int RCS_datecmp PROTO((char *date1, char *date2)); time_t RCS_getrevtime PROTO((RCSNode * rcs, char *rev, char *date, int fudge)); List *RCS_symbols PROTO((RCSNode *rcs)); void RCS_check_tag PROTO((const char *tag)); +List *RCS_getlocks PROTO((RCSNode *rcs)); void freercsnode PROTO((RCSNode ** rnodep)); char *RCS_getbranch PROTO((RCSNode * rcs, char *tag, int force_tag_match)); @@ -118,18 +200,27 @@ int RCS_isdead PROTO((RCSNode *, const char *)); char *RCS_getexpand PROTO ((RCSNode *)); int RCS_checkout PROTO ((RCSNode *, char *, char *, char *, char *, char *, RCSCHECKOUTPROC, void *)); +int RCS_checkin PROTO ((RCSNode *rcs, char *workfile, char *message, + char *rev, int flags)); int RCS_cmp_file PROTO ((RCSNode *, char *, char *, const char *)); int RCS_settag PROTO ((RCSNode *, const char *, const char *)); -int RCS_deltag PROTO ((RCSNode *, const char *, int)); +int RCS_deltag PROTO ((RCSNode *, const char *)); int RCS_setbranch PROTO((RCSNode *, const char *)); int RCS_lock PROTO ((RCSNode *, const char *, int)); int RCS_unlock PROTO ((RCSNode *, const char *, int)); +int RCS_delete_revs PROTO ((RCSNode *, char *, char *, int)); +void RCS_addaccess PROTO ((RCSNode *, char *)); +void RCS_delaccess PROTO ((RCSNode *, char *)); +char *RCS_getaccess PROTO ((RCSNode *)); +void RCS_rewrite PROTO ((RCSNode *, Deltatext *, char *)); int rcs_change_text PROTO ((const char *, char *, size_t, const char *, size_t, char **, size_t *)); +void RCS_setincexc PROTO ((const char *arg)); void RCS_setlocalid PROTO ((const char *arg)); -void RCS_setincexc PROTO ((const char *arg)); +char *make_file_label PROTO ((char *, char *, RCSNode *)); /* From import.c. */ -extern int add_rcs_file PROTO ((char *, char *, char *, char *, - char *, char *, int, char **, FILE *)); +extern int add_rcs_file PROTO ((char *, char *, char *, char *, char *, + char *, char *, int, char **, + char *, size_t, FILE *)); |