/[cvs]/ccvs/src/rcs.h
ViewVC logotype

Diff of /ccvs/src/rcs.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.82 by dprice, Thu Mar 17 22:36:24 2005 UTC revision 1.82.4.1 by dprice, Sat Oct 15 01:38:18 2005 UTC
# Line 13  Line 13 
13   * RCS source control definitions needed by rcs.c and friends   * RCS source control definitions needed by rcs.c and friends
14   */   */
15    
16    #ifndef RCS_H
17    #define RCS_H
18    
19    #include <stdbool.h>
20    #include <stdio.h>
21    #include <sys/types.h>
22    
23    #include "hash.h"
24    
25  /* Strings which indicate a conflict if they occur at the start of a line.  */  /* Strings which indicate a conflict if they occur at the start of a line.  */
26  #define RCS_MERGE_PAT_1 "<<<<<<< "  #define RCS_MERGE_PAT_1 "<<<<<<< "
27  #define RCS_MERGE_PAT_2 "=======\n"  #define RCS_MERGE_PAT_2 "=======\n"
# Line 126  struct rcsnode Line 135  struct rcsnode
135    
136  typedef struct rcsnode RCSNode;  typedef struct rcsnode RCSNode;
137    
138    
139    
140    /* This is the structure that the recursion processor passes to the
141     * fileproc to tell it about a particular file.
142     *
143     * FIXME: This should be in recurse.h.
144     */
145    struct file_info
146    {
147        /* Name of the file, without any directory component.  */
148        const char *file;
149    
150        /* Name of the directory we are in, relative to the directory in
151           which this command was issued.  We have cd'd to this directory
152           (either in the working directory or in the repository, depending
153           on which sort of recursion we are doing).  If we are in the directory
154           in which the command was issued, this is "".  */
155        const char *update_dir;
156    
157        /* update_dir and file put together, with a slash between them as
158           necessary.  This is the proper way to refer to the file in user
159           messages.  */
160        const char *fullname;
161    
162        /* Name of the directory corresponding to the repository which contains
163           this file.  */
164        const char *repository;
165    
166        /* The pre-parsed entries for this directory.  */
167        List *entries;
168    
169        RCSNode *rcs;
170    };
171    
172    
173    
174  struct deltatext {  struct deltatext {
175      char *version;      char *version;
176    
# Line 262  extern int add_rcs_file (const char *, c Line 307  extern int add_rcs_file (const char *, c
307                           const char *, int, char **, const char *, size_t,                           const char *, int, char **, const char *, size_t,
308                           FILE *, bool);                           FILE *, bool);
309  void free_keywords (void *keywords);  void free_keywords (void *keywords);
310    
311    #endif /* RCS_H */

Legend:
Removed from v.1.82  
changed lines
  Added in v.1.82.4.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26