Skip to content

Add negation to merge files, adds CACHEDIR.TAG support #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add negation to merge files, adds CACHEDIR.TAG support #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions exclude.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,11 +1239,10 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
rule->rflags |= FILTRULE_ABS_PATH;
break;
case '!':
/* Negation really goes with the pattern, so it
* isn't useful as a merge-file default. */
if (rule->rflags & FILTRULE_MERGE_FILE)
goto invalid;
rule->rflags |= FILTRULE_NEGATE;
rule->rflags |= FILTRULE_DEFAULT_NONE;
else
rule->rflags |= FILTRULE_NEGATE;
break;
case 'C':
if (rule->rflags & FILTRULE_NO_PREFIXES || prefix_specifies_side)
Expand Down Expand Up @@ -1483,6 +1482,16 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
}
return;
}

if (template->rflags & FILTRULE_DEFAULT_NONE) {
if (! (template->rflags & FILTRULE_EXCLUDE_SELF)) {
filter_rule *incl_self;
incl_self = new0(filter_rule);
incl_self->rflags |= FILTRULE_INCLUDE | FILTRULE_ABS_PATH;
add_rule(listp, fname, strlen(fname), incl_self, 0);
}
}

dirbuf[dirbuf_len] = '\0';

while (1) {
Expand Down Expand Up @@ -1517,6 +1526,13 @@ void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_
break;
}
fclose(fp);

if (template->rflags & FILTRULE_DEFAULT_NONE) {
const char *name = "/**";
filter_rule *default_none;
default_none = new0(filter_rule);
add_rule(listp, name, strlen(name), default_none, 0);
}
}

/* If the "for_xfer" flag is set, the prefix is made compatible with the
Expand Down
1 change: 1 addition & 0 deletions rsync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,7 @@ struct map_struct {
#define FILTRULE_CLEAR_LIST (1<<18)/* this item is the "!" token */
#define FILTRULE_PERISHABLE (1<<19)/* perishable if parent dir goes away */
#define FILTRULE_XATTR (1<<20)/* rule only applies to xattr names */
#define FILTRULE_DEFAULT_NONE (1<<21)/* for dir-merge, default do - ** */

#define FILTRULES_SIDES (FILTRULE_SENDER_SIDE | FILTRULE_RECEIVER_SIDE)

Expand Down