#! /bin/sh
-# Copyright (C) 2003 by Wayne Davison <wayned@samba.org>
+# Copyright (C) 2003, 2004, 2005 by Wayne Davison <wayned@samba.org>
-# This program is distributable under the terms of the GNU GPL see
+# This program is distributable under the terms of the GNU GPL (see
# COPYING).
# Test rsync handling of exclude/include directives.
. "$suitedir/rsync.fns"
-set -x
-
-HOME="$scratchdir"
CVSIGNORE='*.junk'
-export HOME CVSIGNORE
+export CVSIGNORE
# Build some files/dirs/links to copy
makepath "$fromdir/foo/down/to/you"
+makepath "$fromdir/foo/sub"
makepath "$fromdir/bar/down/to/foo/too"
makepath "$fromdir/bar/down/to/bar/baz"
makepath "$fromdir/mid/for/foo/and/that/is/who"
-cat >"$fromdir/.excl" <<EOF
-- down
-: .excl-temp
-!
-- .excl
+makepath "$fromdir/new/keep/this"
+makepath "$fromdir/new/lose/this"
+cat >"$fromdir/.filt" <<EOF
+exclude down
+: .filt-temp
+clear
+- .filt
- *.bak
- *.old
EOF
-echo kept >"$fromdir/foo/file1"
+echo filtered-1 >"$fromdir/foo/file1"
echo removed >"$fromdir/foo/file2"
echo cvsout >"$fromdir/foo/file2.old"
-cat >"$fromdir/foo/.excl" <<EOF
-+ .excl
-- file1
+cat >"$fromdir/foo/.filt" <<EOF
+include .filt
+- /file1
EOF
-cat >"$fromdir/bar/.excl" <<EOF
+echo not-filtered-1 >"$fromdir/foo/sub/file1"
+cat >"$fromdir/bar/.filt" <<EOF
- home-cvs-exclude
-: .excl2
+dir-merge .filt2
+ to
EOF
echo cvsout >"$fromdir/bar/down/to/home-cvs-exclude"
-cat >"$fromdir/bar/down/to/.excl2" <<EOF
-- .excl2
+cat >"$fromdir/bar/down/to/.filt2" <<EOF
+- .filt2
EOF
-cat >"$fromdir/bar/down/to/foo/.excl2" <<EOF
+cat >"$fromdir/bar/down/to/foo/.filt2" <<EOF
+ *.junk
EOF
echo keeper >"$fromdir/bar/down/to/foo/file1"
echo cvsout >"$fromdir/bar/down/to/foo/file1.bak"
echo gone >"$fromdir/bar/down/to/foo/file3"
echo lost >"$fromdir/bar/down/to/foo/file4"
+echo weird >"$fromdir/bar/down/to/foo/+ file3"
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/.excl2" <<EOF
+cat >"$fromdir/bar/down/to/bar/.filt2" <<EOF
- *.deep
EOF
echo filtout >"$fromdir/bar/down/to/bar/baz/file5.deep"
# This one should be ineffectual
-cat >"$fromdir/mid/.excl2" <<EOF
+cat >"$fromdir/mid/.filt2" <<EOF
- extra
EOF
echo cvsout >"$fromdir/mid/one-in-one-out"
echo one-in-one-out >"$fromdir/mid/.cvsignore"
echo cvsin >"$fromdir/mid/one-for-all"
-cat >"$fromdir/mid/.excl" <<EOF
+cat >"$fromdir/mid/.filt" <<EOF
:C
EOF
echo cvsin >"$fromdir/mid/for/one-in-one-out"
- /bar
# This should match against the whole path, not just the name.
+ foo**too
-# This should float at the end of the path.
+# These should float at the end of the path.
++ foo/s?b/
- foo/*/
+# Test how /** differs from /***
+- new/keep/**
+- new/lose/***
# Test some normal excludes. Competing lines are paired.
+ t[o]/
- to
rm -r "$chkdir"/foo/down
rm -r "$chkdir"/mid/for/foo/and
+rm -r "$chkdir"/new/keep/this
+rm -r "$chkdir"/new/lose
rm "$chkdir"/foo/file[235-9]
rm "$chkdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo/file[235-9]
rm "$chkdir"/mid/for/foo/extra
rm "$chkdir"/bar/down/to/home-cvs-exclude
rm "$chkdir"/mid/one-in-one-out
-$RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/"
+$RSYNC -av --existing --filter='exclude,! */' "$fromdir/" "$chkdir/"
# Now, test if rsync excludes the same files, this time with --cvs-exclude
# and --delete-excluded.
-checkit "$RSYNC -avvC --filter=\". $excl\" --delete-excluded \
+checkit "$RSYNC -avvC --filter=\"merge $excl\" --delete-excluded \
--delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
# Modify the chk dir for our merge-exclude test and then tweak the dir times.
cp -p "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo
cp -p "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo
-$RSYNC -av --existing --delete-excluded \
- --include='*/' --include='.excl*' --exclude='*' "$fromdir/" "$todir/"
+$RSYNC -av --existing -f 'show .filt*' -f 'hide,! */' --del "$fromdir/" "$todir/"
echo retained >"$todir"/bar/down/to/bar/baz/nodel.deep
cp -p "$todir"/bar/down/to/bar/baz/nodel.deep "$chkdir"/bar/down/to/bar/baz
-$RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/"
+$RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/"
# Now, test if rsync excludes the same files, this time with a merge-exclude
# file.
checkit "sed '/!/d' \"$excl\" |
- $RSYNC -avv -f :_.excl -f ._- \
+ $RSYNC -avv -f dir-merge_.filt -f merge_- \
--delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
-# Remove the files that --delete-excluded will delete.
+# Remove the files that will be deleted.
-rm "$chkdir"/.excl
-rm "$chkdir"/bar/.excl
-rm "$chkdir"/bar/down/to/.excl2
-rm "$chkdir"/bar/down/to/foo/.excl2
-rm "$chkdir"/bar/down/to/bar/.excl2
-rm "$chkdir"/mid/.excl
-rm "$chkdir"/bar/down/to/bar/baz/nodel.deep
+rm "$chkdir"/.filt
+rm "$chkdir"/bar/.filt
+rm "$chkdir"/bar/down/to/.filt2
+rm "$chkdir"/bar/down/to/foo/.filt2
+rm "$chkdir"/bar/down/to/bar/.filt2
+rm "$chkdir"/mid/.filt
-$RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/"
+$RSYNC -av --protocol=28 --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/"
-# Finally, try the prior command with --delete-before and --delete-excluded.
+# Now, try the prior command with --delete-before and some side-specific
+# rules.
checkit "sed '/!/d' \"$excl\" |
- $RSYNC -avv -f :_.excl -f ._- --delete-excluded \
+ $RSYNC -avv -f :s_.filt -f .s_- -f P_nodel.deep \
--delete-before \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+# Next, we'll test some rule-restricted filter files.
+
+cat >"$fromdir/bar/down/.excl" <<EOF
+file3
+EOF
+cat >"$fromdir/bar/down/to/foo/.excl" <<EOF
++ file3
+*.bak
+EOF
+$RSYNC -av --del "$fromdir/" "$chkdir/"
+rm "$chkdir/bar/down/to/foo/file1.bak"
+rm "$chkdir/bar/down/to/foo/file3"
+rm "$chkdir/bar/down/to/foo/+ file3"
+$RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/"
+$RSYNC -av --delete-excluded --exclude='*' "$fromdir/" "$todir/"
+
+checkit "$RSYNC -avv -f dir-merge,-_.excl \
+ \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+
+set -x
+
+relative_opts='--relative --chmod=Du+w --copy-unsafe-links'
+$RSYNC -av $relative_opts "$fromdir/foo" "$chkdir/"
+rm -rf "$chkdir$fromdir/foo/down"
+$RSYNC -av $relative_opts --existing --filter='-! */' "$fromdir/foo" "$chkdir/"
+
+checkit "$RSYNC -avv $relative_opts --exclude=\"$fromdir/foo/down\" \
+ \"$fromdir/foo\" \"$todir\"" "$chkdir$fromdir/foo" "$todir$fromdir/foo"
+
# The script would have aborted on error, so getting here means we've won.
exit 0
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff