X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e7636e5571a1d9839a925a5da273bd32d6ac8731..44cedd19cb79ec721a04d2daf371230ae81b1990:/cvs-entries.diff

diff --git a/cvs-entries.diff b/cvs-entries.diff
index 6b9a245..e61a34e 100644
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -2,9 +2,15 @@ This patch causes the --cvs-exclude option to prefix the names listed
 in each dir's CVS/Entries file as per-dir includes before the dir's list
 of excludes taken from the .cvsignore file.
 
---- orig/exclude.c	2005-12-17 21:02:32
-+++ exclude.c	2005-12-17 21:18:38
-@@ -212,6 +212,8 @@ static void add_rule(struct filter_list_
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/cvs-entries.diff
+    ./configure                                 (optional if already run)
+    make
+
+--- old/exclude.c
++++ new/exclude.c
+@@ -217,6 +217,8 @@ static void add_rule(struct filter_list_
  		if (!(lp = new_array(struct filter_list_struct, 1)))
  			out_of_memory("add_rule");
  		lp->head = lp->tail = NULL;
@@ -13,7 +19,7 @@ of excludes taken from the .cvsignore file.
  		if (asprintf(&lp->debug_type, " [per-dir %s]", cp) < 0)
  			out_of_memory("add_rule");
  		ret->u.mergelist = lp;
-@@ -446,6 +448,14 @@ void *push_local_filters(const char *dir
+@@ -449,6 +451,14 @@ void *push_local_filters(const char *dir
  				set_filter_dir(dir, dirlen);
  		}
  
@@ -28,7 +34,7 @@ of excludes taken from the .cvsignore file.
  		if (strlcpy(dirbuf + dirbuf_len, ex->pattern,
  		    MAXPATHLEN - dirbuf_len) < MAXPATHLEN - dirbuf_len) {
  			parse_filter_file(lp, dirbuf, ex->match_flags,
-@@ -962,6 +972,7 @@ void parse_filter_file(struct filter_lis
+@@ -1005,6 +1015,7 @@ void parse_filter_file(struct filter_lis
  	char line[BIGPATHBUFLEN];
  	char *eob = line + sizeof line - 1;
  	int word_split = mflags & MATCHFLG_WORD_SPLIT;
@@ -36,8 +42,8 @@ of excludes taken from the .cvsignore file.
  
  	if (!fname || !*fname)
  		return;
-@@ -1006,6 +1017,24 @@ void parse_filter_file(struct filter_lis
- 					continue;
+@@ -1051,6 +1062,24 @@ void parse_filter_file(struct filter_lis
+ 				}
  				break;
  			}
 +			switch (slash_parse) { /* CVS/Entries parsing: */
@@ -61,7 +67,7 @@ of excludes taken from the .cvsignore file.
  			if (word_split && isspace(ch))
  				break;
  			if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
-@@ -1015,13 +1044,15 @@ void parse_filter_file(struct filter_lis
+@@ -1060,13 +1089,15 @@ void parse_filter_file(struct filter_lis
  			else
  				overflow = 1;
  		}
@@ -78,27 +84,27 @@ of excludes taken from the .cvsignore file.
  			parse_rule(listp, line, mflags, xflags);
  		if (ch == EOF)
  			break;
---- orig/rsync.h	2005-12-15 23:00:49
-+++ rsync.h	2005-12-17 19:52:48
-@@ -116,6 +116,7 @@
+--- old/rsync.h
++++ new/rsync.h
+@@ -132,6 +132,7 @@
  #define XFLG_OLD_PREFIXES	(1<<1)
  #define XFLG_ANCHORED2ABS	(1<<2)
  #define XFLG_ABS_IF_SLASH	(1<<3)
 +#define XFLG_CVS_ENTRIES	(1<<4)
  
- #define PERMS_REPORT		(1<<0)
- #define PERMS_SKIP_MTIME	(1<<1)
---- orig/testsuite/exclude.test	2005-02-26 19:47:43
-+++ testsuite/exclude.test	2005-12-17 19:52:49
-@@ -21,6 +21,7 @@ set -x
- # Build some files/dirs/links to copy
+ #define ATTRS_REPORT		(1<<0)
+ #define ATTRS_SKIP_MTIME	(1<<1)
+--- old/testsuite/exclude.test
++++ new/testsuite/exclude.test
+@@ -19,6 +19,7 @@ export CVSIGNORE
  
  makepath "$fromdir/foo/down/to/you"
+ makepath "$fromdir/foo/sub"
 +makepath "$fromdir/bar/down/to/CVS"
  makepath "$fromdir/bar/down/to/foo/too"
  makepath "$fromdir/bar/down/to/bar/baz"
  makepath "$fromdir/mid/for/foo/and/that/is/who"
-@@ -56,6 +57,9 @@ echo cvsout >"$fromdir/bar/down/to/foo/f
+@@ -57,6 +58,9 @@ echo cvsout >"$fromdir/bar/down/to/foo/f
  echo gone >"$fromdir/bar/down/to/foo/file3"
  echo lost >"$fromdir/bar/down/to/foo/file4"
  echo weird >"$fromdir/bar/down/to/foo/+ file3"
@@ -108,7 +114,7 @@ of excludes taken from the .cvsignore file.
  echo cvsout-but-filtin >"$fromdir/bar/down/to/foo/file4.junk"
  echo smashed >"$fromdir/bar/down/to/foo/to"
  cat >"$fromdir/bar/down/to/bar/.filt2" <<EOF
-@@ -98,7 +102,18 @@ cat >"$excl" <<EOF
+@@ -103,7 +107,18 @@ cat >"$excl" <<EOF
  EOF
  
  cat >"$scratchdir/.cvsignore" <<EOF
@@ -128,7 +134,7 @@ of excludes taken from the .cvsignore file.
  EOF
  
  # Create the chk dir with what we expect to be excluded
-@@ -125,6 +140,10 @@ checkit "$RSYNC -avv --exclude-from=\"$e
+@@ -132,6 +147,10 @@ checkit "$RSYNC -avv --exclude-from=\"$e
  # Modify the chk dir by removing cvs-ignored files and then tweaking the dir times.
  
  rm "$chkdir"/foo/*.old
@@ -139,7 +145,7 @@ of excludes taken from the .cvsignore file.
  rm "$chkdir"/bar/down/to/foo/*.bak
  rm "$chkdir"/bar/down/to/foo/*.junk
  rm "$chkdir"/bar/down/to/home-cvs-exclude
-@@ -140,8 +159,12 @@ checkit "$RSYNC -avvC --filter=\"merge $
+@@ -147,8 +166,12 @@ checkit "$RSYNC -avvC --filter=\"merge $
  
  # Modify the chk dir for our merge-exclude test and then tweak the dir times.