Implement diff.compareSysStat on windows

dnephin · dnephin · commit 666d946455d0 · 2017-11-15T14:31:50.000-05:00
and update diff tests to work with slash paths on windows

Signed-off-by: Daniel Nephin &lt;dnephin@gmail.com&gt;
diff --git a/fs/diff_test.go b/fs/diff_test.go
@@ -322,20 +322,20 @@ func changesString(c []TestChange) string {
 func Add(p string) TestChange {
 	return TestChange{
 		Kind: ChangeKindAdd,
-		Path: p,
+		Path: filepath.FromSlash(p),
 	}
 }
 
 func Delete(p string) TestChange {
 	return TestChange{
 		Kind: ChangeKindDelete,
-		Path: p,
+		Path: filepath.FromSlash(p),
 	}
 }
 
 func Modify(p string) TestChange {
 	return TestChange{
 		Kind: ChangeKindModify,
-		Path: p,
+		Path: filepath.FromSlash(p),
 	}
 }
diff --git a/fs/diff_windows.go b/fs/diff_windows.go
@@ -1,14 +1,25 @@
 package fs
 
-import "os"
+import (
+	"os"
+
+	"golang.org/x/sys/windows"
+)
 
 func detectDirDiff(upper, lower string) *diffDirOptions {
 	return nil
 }
 
 func compareSysStat(s1, s2 interface{}) (bool, error) {
-	// TODO: Use windows specific sys type
-	return false, nil
+	f1, ok := s1.(windows.Win32FileAttributeData)
+	if !ok {
+		return false, nil
+	}
+	f2, ok := s2.(windows.Win32FileAttributeData)
+	if !ok {
+		return false, nil
+	}
+	return f1.FileAttributes == f2.FileAttributes, nil
 }
 
 func compareCapabilities(p1, p2 string) (bool, error) {

Original file line number	Diff line number	Diff line change
`@@ -322,20 +322,20 @@ func changesString(c []TestChange) string {`
`322`	`322`	`func Add(p string) TestChange {`
`323`	`323`	`return TestChange{`
`324`	`324`	`Kind: ChangeKindAdd,`
`325`		`- Path: p,`
	`325`	`+ Path: filepath.FromSlash(p),`
`326`	`326`	`}`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`func Delete(p string) TestChange {`
`330`	`330`	`return TestChange{`
`331`	`331`	`Kind: ChangeKindDelete,`
`332`		`- Path: p,`
	`332`	`+ Path: filepath.FromSlash(p),`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`func Modify(p string) TestChange {`
`337`	`337`	`return TestChange{`
`338`	`338`	`Kind: ChangeKindModify,`
`339`		`- Path: p,`
	`339`	`+ Path: filepath.FromSlash(p),`
`340`	`340`	`}`
`341`	`341`	`}`