Merge pull request #493 from src-d/windows

mcuadros · web-flow · commit 8738a04708b9 · 2017-07-19T22:04:46.000+02:00
*: several windows support fixes
diff --git a/plumbing/format/config/encoder.go b/plumbing/format/config/encoder.go
@@ -3,6 +3,7 @@ package config
 import (
 	"fmt"
 	"io"
+	"strings"
 )
 
 // An Encoder writes config files to an output stream.
@@ -61,7 +62,12 @@ func (e *Encoder) encodeSubsection(sectionName string, s *Subsection) error {
 
 func (e *Encoder) encodeOptions(opts Options) error {
 	for _, o := range opts {
-		if err := e.printf("\t%s = %s\n", o.Key, o.Value); err != nil {
+		pattern := "\t%s = %s\n"
+		if strings.Index(o.Value, "\\") != -1 {
+			pattern = "\t%s = %q\n"
+		}
+
+		if err := e.printf(pattern, o.Key, o.Value); err != nil {
 			return err
 		}
 	}
diff --git a/plumbing/transport/git/receive_pack_test.go b/plumbing/transport/git/receive_pack_test.go
@@ -99,9 +99,11 @@ func (s *ReceivePackSuite) SetUpTest(c *C) {
 }
 
 func (s *ReceivePackSuite) TearDownTest(c *C) {
-	err := s.daemon.Process.Signal(os.Interrupt)
+	err := s.daemon.Process.Signal(os.Kill)
 	c.Assert(err, IsNil)
+
 	_ = s.daemon.Wait()
+
 	err = os.RemoveAll(s.base)
 	c.Assert(err, IsNil)
 }
diff --git a/plumbing/transport/server/loader.go b/plumbing/transport/server/loader.go
@@ -10,7 +10,7 @@ import (
 )
 
 // DefaultLoader is a filesystem loader ignoring host and resolving paths to /.
-var DefaultLoader = NewFilesystemLoader(osfs.New("/"))
+var DefaultLoader = NewFilesystemLoader(osfs.New(""))
 
 // Loader loads repository's storer.Storer based on an optional host and a path.
 type Loader interface {
diff --git a/storage/filesystem/internal/dotgit/dotgit.go b/storage/filesystem/internal/dotgit/dotgit.go
@@ -348,7 +348,6 @@ func (d *DotGit) rewritePackedRefsWithoutRef(name plumbing.ReferenceName) (err e
 
 		return err
 	}
-	defer ioutil.CheckClose(f, &err)
 
 	// Creating the temp file in the same directory as the target file
 	// improves our chances for rename operation to be atomic.
@@ -357,10 +356,6 @@ func (d *DotGit) rewritePackedRefsWithoutRef(name plumbing.ReferenceName) (err e
 		return err
 	}
 
-	tmpPath := tmp.Name()
-	defer ioutil.CheckClose(tmp, &err)
-	defer d.fs.Remove(tmpPath)
-
 	s := bufio.NewScanner(f)
 	found := false
 	for s.Scan() {
@@ -388,7 +383,16 @@ func (d *DotGit) rewritePackedRefsWithoutRef(name plumbing.ReferenceName) (err e
 		return nil
 	}
 
-	return d.fs.Rename(tmpPath, packedRefsPath)
+	if err := f.Close(); err != nil {
+		ioutil.CheckClose(tmp, &err)
+		return err
+	}
+
+	if err := tmp.Close(); err != nil {
+		return err
+	}
+
+	return d.fs.Rename(tmp.Name(), packedRefsPath)
 }
 
 // process lines from a packed-refs file
diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go
@@ -373,6 +373,7 @@ func (s *SuiteDotGit) TestObjectPackIdx(c *C) {
 	idx, err := dir.ObjectPackIdx(f.PackfileHash)
 	c.Assert(err, IsNil)
 	c.Assert(filepath.Ext(idx.Name()), Equals, ".idx")
+	c.Assert(idx.Close(), IsNil)
 }
 
 func (s *SuiteDotGit) TestObjectPackNotFound(c *C) {
diff --git a/utils/merkletrie/filesystem/node.go b/utils/merkletrie/filesystem/node.go
@@ -3,7 +3,7 @@ package filesystem
 import (
 	"io"
 	"os"
-	"path/filepath"
+	"path"
 
 	"gopkg.in/src-d/go-billy.v3"
 	"gopkg.in/src-d/go-git.v4/plumbing"
@@ -53,7 +53,7 @@ func (n *node) Hash() []byte {
 }
 
 func (n *node) Name() string {
-	return filepath.Base(n.path)
+	return path.Base(n.path)
 }
 
 func (n *node) IsDir() bool {
@@ -107,7 +107,7 @@ func (n *node) calculateChildren() error {
 }
 
 func (n *node) newChildNode(file os.FileInfo) (*node, error) {
-	path := filepath.Join(n.path, file.Name())
+	path := path.Join(n.path, file.Name())
 
 	hash, err := n.calculateHash(path, file)
 	if err != nil {
diff --git a/utils/merkletrie/filesystem/node_test.go b/utils/merkletrie/filesystem/node_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"io"
 	"os"
+	"path"
 	"testing"
 
 	. "gopkg.in/check.v1"
@@ -133,18 +134,19 @@ func (s *NoderSuite) TestDiffChangeModeNotRelevant(c *C) {
 }
 
 func (s *NoderSuite) TestDiffDirectory(c *C) {
+	dir := path.Join("qux", "bar")
 	fsA := memfs.New()
-	fsA.MkdirAll("qux/bar", 0644)
+	fsA.MkdirAll(dir, 0644)
 
 	fsB := memfs.New()
-	fsB.MkdirAll("qux/bar", 0644)
+	fsB.MkdirAll(dir, 0644)
 
 	ch, err := merkletrie.DiffTree(
 		NewRootNode(fsA, map[string]plumbing.Hash{
-			"qux/bar": plumbing.NewHash("aa102815663d23f8b75a47e7a01965dcdc96468c"),
+			dir: plumbing.NewHash("aa102815663d23f8b75a47e7a01965dcdc96468c"),
 		}),
 		NewRootNode(fsB, map[string]plumbing.Hash{
-			"qux/bar": plumbing.NewHash("19102815663d23f8b75a47e7a01965dcdc96468c"),
+			dir: plumbing.NewHash("19102815663d23f8b75a47e7a01965dcdc96468c"),
 		}),
 		IsEquals,
 	)
diff --git a/utils/merkletrie/index/node.go b/utils/merkletrie/index/node.go
@@ -1,7 +1,7 @@
 package index
 
 import (
-	"path/filepath"
+	"path"
 	"strings"
 
 	"gopkg.in/src-d/go-git.v4/plumbing/format/index"
@@ -28,19 +28,19 @@ func NewRootNode(idx *index.Index) noder.Noder {
 	m := map[string]*node{rootNode: {isDir: true}}
 
 	for _, e := range idx.Entries {
-		parts := strings.Split(e.Name, string(filepath.Separator))
+		parts := strings.Split(e.Name, string("/"))
 
-		var path string
+		var fullpath string
 		for _, part := range parts {
-			parent := path
-			path = filepath.Join(path, part)
+			parent := fullpath
+			fullpath = path.Join(fullpath, part)
 
-			if _, ok := m[path]; ok {
+			if _, ok := m[fullpath]; ok {
 				continue
 			}
 
-			n := &node{path: path}
-			if path == e.Name {
+			n := &node{path: fullpath}
+			if fullpath == e.Name {
 				n.entry = e
 			} else {
 				n.isDir = true
@@ -74,7 +74,7 @@ func (n *node) Hash() []byte {
 }
 
 func (n *node) Name() string {
-	return filepath.Base(n.path)
+	return path.Base(n.path)
 }
 
 func (n *node) IsDir() bool {
diff --git a/utils/merkletrie/index/node_test.go b/utils/merkletrie/index/node_test.go
@@ -2,6 +2,7 @@ package index
 
 import (
 	"bytes"
+	"path/filepath"
 	"testing"
 
 	. "gopkg.in/check.v1"
@@ -43,15 +44,17 @@ func (s *NoderSuite) TestDiff(c *C) {
 
 func (s *NoderSuite) TestDiffChange(c *C) {
 	indexA := &index.Index{
-		Entries: []*index.Entry{
-			{Name: "bar/baz/bar", Hash: plumbing.NewHash("8ab686eafeb1f44702738c8b0f24f2567c36da6d")},
-		},
+		Entries: []*index.Entry{{
+			Name: filepath.Join("bar", "baz", "bar"),
+			Hash: plumbing.NewHash("8ab686eafeb1f44702738c8b0f24f2567c36da6d"),
+		}},
 	}
 
 	indexB := &index.Index{
-		Entries: []*index.Entry{
-			{Name: "bar/baz/foo", Hash: plumbing.NewHash("8ab686eafeb1f44702738c8b0f24f2567c36da6d")},
-		},
+		Entries: []*index.Entry{{
+			Name: filepath.Join("bar", "baz", "foo"),
+			Hash: plumbing.NewHash("8ab686eafeb1f44702738c8b0f24f2567c36da6d"),
+		}},
 	}
 
 	ch, err := merkletrie.DiffTree(NewRootNode(indexA), NewRootNode(indexB), isEquals)
@@ -61,15 +64,17 @@ func (s *NoderSuite) TestDiffChange(c *C) {
 
 func (s *NoderSuite) TestDiffDir(c *C) {
 	indexA := &index.Index{
-		Entries: []*index.Entry{
-			{Name: "foo", Hash: plumbing.NewHash("8ab686eafeb1f44702738c8b0f24f2567c36da6d")},
-		},
+		Entries: []*index.Entry{{
+			Name: "foo",
+			Hash: plumbing.NewHash("8ab686eafeb1f44702738c8b0f24f2567c36da6d"),
+		}},
 	}
 
 	indexB := &index.Index{
-		Entries: []*index.Entry{
-			{Name: "foo/bar", Hash: plumbing.NewHash("8ab686eafeb1f44702738c8b0f24f2567c36da6d")},
-		},
+		Entries: []*index.Entry{{
+			Name: filepath.Join("foo", "bar"),
+			Hash: plumbing.NewHash("8ab686eafeb1f44702738c8b0f24f2567c36da6d"),
+		}},
 	}
 
 	ch, err := merkletrie.DiffTree(NewRootNode(indexA), NewRootNode(indexB), isEquals)
diff --git a/worktree.go b/worktree.go
@@ -496,6 +496,10 @@ func (w *Worktree) Submodules() (Submodules, error) {
 	}
 
 	c, err := w.r.Config()
+	if err != nil {
+		return nil, err
+	}
+
 	for _, s := range m.Submodules {
 		l = append(l, w.newSubmodule(s, c.Submodules[s.Name]))
 	}
@@ -527,6 +531,7 @@ func (w *Worktree) readGitmodulesFile() (*config.Modules, error) {
 		return nil, err
 	}
 
+	defer f.Close()
 	input, err := stdioutil.ReadAll(f)
 	if err != nil {
 		return nil, err
diff --git a/worktree_commit.go b/worktree_commit.go
@@ -1,7 +1,7 @@
 package git
 
 import (
-	"path/filepath"
+	"path"
 	"strings"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
@@ -128,36 +128,36 @@ func (h *buildTreeHelper) BuildTree(idx *index.Index) (plumbing.Hash, error) {
 }
 
 func (h *buildTreeHelper) commitIndexEntry(e *index.Entry) error {
-	parts := strings.Split(e.Name, string(filepath.Separator))
+	parts := strings.Split(e.Name, "/")
 
-	var path string
+	var fullpath string
 	for _, part := range parts {
-		parent := path
-		path = filepath.Join(path, part)
+		parent := fullpath
+		fullpath = path.Join(fullpath, part)
 
-		h.doBuildTree(e, parent, path)
+		h.doBuildTree(e, parent, fullpath)
 	}
 
 	return nil
 }
 
-func (h *buildTreeHelper) doBuildTree(e *index.Entry, parent, path string) {
-	if _, ok := h.trees[path]; ok {
+func (h *buildTreeHelper) doBuildTree(e *index.Entry, parent, fullpath string) {
+	if _, ok := h.trees[fullpath]; ok {
 		return
 	}
 
-	if _, ok := h.entries[path]; ok {
+	if _, ok := h.entries[fullpath]; ok {
 		return
 	}
 
-	te := object.TreeEntry{Name: filepath.Base(path)}
+	te := object.TreeEntry{Name: path.Base(fullpath)}
 
-	if path == e.Name {
+	if fullpath == e.Name {
 		te.Mode = e.Mode
 		te.Hash = e.Hash
 	} else {
 		te.Mode = filemode.Dir
-		h.trees[path] = &object.Tree{}
+		h.trees[fullpath] = &object.Tree{}
 	}
 
 	h.trees[parent].Entries = append(h.trees[parent].Entries, te)
@@ -169,7 +169,7 @@ func (h *buildTreeHelper) copyTreeToStorageRecursive(parent string, t *object.Tr
 			continue
 		}
 
-		path := filepath.Join(parent, e.Name)
+		path := path.Join(parent, e.Name)
 
 		var err error
 		e.Hash, err = h.copyTreeToStorageRecursive(path, h.trees[path])
diff --git a/worktree_linux.go b/worktree_linux.go
@@ -12,7 +12,6 @@ import (
 func init() {
 	fillSystemInfo = func(e *index.Entry, sys interface{}) {
 		if os, ok := sys.(*syscall.Stat_t); ok {
-
 			e.CreatedAt = time.Unix(int64(os.Ctim.Sec), int64(os.Ctim.Nsec))
 			e.Dev = uint32(os.Dev)
 			e.Inode = uint32(os.Ino)
diff --git a/worktree_windows.go b/worktree_windows.go
@@ -0,0 +1,20 @@
+// +build windows
+
+package git
+
+import (
+	"syscall"
+	"time"
+
+	"gopkg.in/src-d/go-git.v4/plumbing/format/index"
+)
+
+func init() {
+	fillSystemInfo = func(e *index.Entry, sys interface{}) {
+		if os, ok := sys.(*syscall.Win32FileAttributeData); ok {
+			seconds := os.CreationTime.Nanoseconds() / 1000000000
+			nanoseconds := os.CreationTime.Nanoseconds() - seconds*1000000000
+			e.CreatedAt = time.Unix(seconds, nanoseconds)
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package config`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"io"`
	`6`	`+ "strings"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`// An Encoder writes config files to an output stream.`
`@@ -61,7 +62,12 @@ func (e Encoder) encodeSubsection(sectionName string, s Subsection) error {`
`61`	`62`
`62`	`63`	`func (e *Encoder) encodeOptions(opts Options) error {`
`63`	`64`	`for _, o := range opts {`
`64`		`- if err := e.printf("\t%s = %s\n", o.Key, o.Value); err != nil {`
	`65`	`+ pattern := "\t%s = %s\n"`
	`66`	`+ if strings.Index(o.Value, "\\") != -1 {`
	`67`	`+ pattern = "\t%s = %q\n"`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ if err := e.printf(pattern, o.Key, o.Value); err != nil {`
`65`	`71`	`return err`
`66`	`72`	`}`
`67`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,11 @@ func (s ReceivePackSuite) SetUpTest(c C) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`func (s ReceivePackSuite) TearDownTest(c C) {`
`102`		`- err := s.daemon.Process.Signal(os.Interrupt)`
	`102`	`+ err := s.daemon.Process.Signal(os.Kill)`
`103`	`103`	`c.Assert(err, IsNil)`
	`104`	`+`
`104`	`105`	`_ = s.daemon.Wait()`
	`106`	`+`
`105`	`107`	`err = os.RemoveAll(s.base)`
`106`	`108`	`c.Assert(err, IsNil)`
`107`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// DefaultLoader is a filesystem loader ignoring host and resolving paths to /.`
`13`		`-var DefaultLoader = NewFilesystemLoader(osfs.New("/"))`
	`13`	`+var DefaultLoader = NewFilesystemLoader(osfs.New(""))`
`14`	`14`
`15`	`15`	`// Loader loads repository's storer.Storer based on an optional host and a path.`
`16`	`16`	`type Loader interface {`
Original file line number	Diff line number	Diff line change
`@@ -373,6 +373,7 @@ func (s SuiteDotGit) TestObjectPackIdx(c C) {`
`373`	`373`	`idx, err := dir.ObjectPackIdx(f.PackfileHash)`
`374`	`374`	`c.Assert(err, IsNil)`
`375`	`375`	`c.Assert(filepath.Ext(idx.Name()), Equals, ".idx")`
	`376`	`+ c.Assert(idx.Close(), IsNil)`
`376`	`377`	`}`
`377`	`378`
`378`	`379`	`func (s SuiteDotGit) TestObjectPackNotFound(c C) {`
Original file line number	Diff line number	Diff line change
`@@ -496,6 +496,10 @@ func (w *Worktree) Submodules() (Submodules, error) {`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`c, err := w.r.Config()`
	`499`	`+ if err != nil {`
	`500`	`+ return nil, err`
	`501`	`+ }`
	`502`	`+`
`499`	`503`	`for _, s := range m.Submodules {`
`500`	`504`	`l = append(l, w.newSubmodule(s, c.Submodules[s.Name]))`
`501`	`505`	`}`
`@@ -527,6 +531,7 @@ func (w Worktree) readGitmodulesFile() (config.Modules, error) {`
`527`	`531`	`return nil, err`
`528`	`532`	`}`
`529`	`533`
	`534`	`+ defer f.Close()`
`530`	`535`	`input, err := stdioutil.ReadAll(f)`
`531`	`536`	`if err != nil {`
`532`	`537`	`return nil, err`