octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-12 16:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/ignore: Remove pattern for foo/** which is already covered by foo/

Browse Source 
Actual speed difference according to benchmarks is hidden in the noise



Also make the "pattern" field for each entry match what is actually

evaluated.
This commit is contained in:
Jakob Borg 2016-04-04 14:22:25 +02:00 committed by Audrius Butkevicius
parent cc1d122352
commit 1934b3a5b6
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ignore/ignore.go
View File

@ -249,7 +249,9 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) ([]
} }
patterns = append(patterns, pattern) patterns = append(patterns, pattern)
pattern.match, err = glob.Compile(line[3:]) line = line[3:]
pattern.pattern = line
pattern.match, err = glob.Compile(line)
if err != nil { if err != nil {
return fmt.Errorf("invalid pattern %q in ignore file", line) return fmt.Errorf("invalid pattern %q in ignore file", line)
} }
@ -271,7 +273,9 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) ([]
} }
patterns = append(patterns, pattern) patterns = append(patterns, pattern)
pattern.match, err = glob.Compile("**/" + line) line := "**/" + line
pattern.pattern = line
pattern.match, err = glob.Compile(line)
if err != nil { if err != nil {
return fmt.Errorf("invalid pattern %q in ignore file", line) return fmt.Errorf("invalid pattern %q in ignore file", line)
} }
@ -299,9 +303,6 @@ func parseIgnoreFile(fd io.Reader, currentFile string, seen map[string]bool) ([]
err = addPattern(line) err = addPattern(line)
case strings.HasSuffix(line, "/"): case strings.HasSuffix(line, "/"):
err = addPattern(line) err = addPattern(line)
if err == nil {
err = addPattern(line + "**")
}
default: default:
err = addPattern(line) err = addPattern(line)
if err == nil { if err == nil {

4
lib/ignore/ignore_test.go
View File

@ -177,10 +177,6 @@ func TestCaching(t *testing.T) {
t.Fatal("Expected empty cache") t.Fatal("Expected empty cache")
} }
if len(pats.patterns) != 4 {
t.Fatal("Incorrect number of patterns loaded", len(pats.patterns), "!=", 4)
}
// Cache some outcomes // Cache some outcomes
for _, letter := range []string{"a", "b", "x", "y"} { for _, letter := range []string{"a", "b", "x", "y"} {