Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Commit da704cf

Browse files
alcortesmalcortesm
committed
replace os.FileMode use with filemode.FileMode
1 parent 09e4358 commit da704cf

File tree

14 files changed

+248
-283
lines changed

14 files changed

+248
-283
lines changed

‎plumbing/format/index/decoder_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ package index
33
import (
44
"testing"
55

6-
. "gopkg.in/check.v1"
7-
"github.com/src-d/go-git-fixtures"
86
"srcd.works/go-git.v4/plumbing"
7+
"srcd.works/go-git.v4/plumbing/filemode"
8+
9+
"github.com/src-d/go-git-fixtures"
10+
. "gopkg.in/check.v1"
911
)
1012

1113
func Test(t *testing.T) { TestingT(t) }
@@ -53,7 +55,7 @@ func (s *IndexSuite) TestDecodeEntries(c *C) {
5355
c.Assert(e.Size, Equals, uint32(189))
5456
c.Assert(e.Hash.String(), Equals, "32858aad3c383ed1ff0a0f9bdf231d54a00c9e88")
5557
c.Assert(e.Name, Equals, ".gitignore")
56-
c.Assert(e.Mode.String(), Equals, "-rw-r--r--")
58+
c.Assert(e.Mode, Equals, filemode.Regular)
5759

5860
e = idx.Entries[1]
5961
c.Assert(e.Name, Equals, "CHANGELOG")

‎plumbing/format/index/index.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package index
22

33
import (
44
"errors"
5-
"os"
65
"time"
76

87
"srcd.works/go-git.v4/plumbing"
8+
"srcd.works/go-git.v4/plumbing/filemode"
99
)
1010

1111
var (
@@ -62,7 +62,7 @@ type Entry struct {
6262
// Dev and Inode of the tracked path
6363
Dev, Inode uint32
6464
// Mode of the path
65-
Mode os.FileMode
65+
Mode filemode.FileMode
6666
// UID and GID, userid and group id of the owner
6767
UID, GID uint32
6868
// Size is the length in bytes for regular files

‎plumbing/object/change_adaptor_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package object
22

33
import (
4-
"os"
54
"sort"
65

76
"srcd.works/go-git.v4/plumbing"
7+
"srcd.works/go-git.v4/plumbing/filemode"
88
"srcd.works/go-git.v4/plumbing/storer"
99
"srcd.works/go-git.v4/storage/filesystem"
1010
"srcd.works/go-git.v4/utils/merkletrie"
@@ -51,7 +51,7 @@ func newPath(nn ...noder.Noder) noder.Path { return noder.Path(nn) }
5151

5252
func (s *ChangeAdaptorSuite) TestTreeNoderHashHasMode(c *C) {
5353
hash := plumbing.NewHash("aaaa")
54-
mode := FileMode
54+
mode := filemode.Regular
5555

5656
treeNoder := &treeNoder{
5757
hash: hash,
@@ -64,8 +64,8 @@ func (s *ChangeAdaptorSuite) TestTreeNoderHashHasMode(c *C) {
6464
0x00, 0x00, 0x00, 0x00,
6565
0x00, 0x00, 0x00, 0x00,
6666
0x00, 0x00, 0x00, 0x00,
67-
0xa4, 0x81, 0x00, 0x00, // object.FileMode in little endian
6867
}
68+
expected = append(expected, filemode.Regular.Bytes()...)
6969

7070
c.Assert(treeNoder.Hash(), DeepEquals, expected)
7171
}
@@ -74,7 +74,7 @@ func (s *ChangeAdaptorSuite) TestNewChangeInsert(c *C) {
7474
tree := &Tree{}
7575
entry := TreeEntry{
7676
Name: "name",
77-
Mode: os.FileMode(42),
77+
Mode: filemode.FileMode(42),
7878
Hash: plumbing.NewHash("aaaaa"),
7979
}
8080
path := newPath(newNoder(tree, entry))
@@ -100,7 +100,7 @@ func (s *ChangeAdaptorSuite) TestNewChangeDelete(c *C) {
100100
tree := &Tree{}
101101
entry := TreeEntry{
102102
Name: "name",
103-
Mode: os.FileMode(42),
103+
Mode: filemode.FileMode(42),
104104
Hash: plumbing.NewHash("aaaaa"),
105105
}
106106
path := newPath(newNoder(tree, entry))
@@ -126,7 +126,7 @@ func (s *ChangeAdaptorSuite) TestNewChangeModify(c *C) {
126126
treeA := &Tree{}
127127
entryA := TreeEntry{
128128
Name: "name",
129-
Mode: os.FileMode(42),
129+
Mode: filemode.FileMode(42),
130130
Hash: plumbing.NewHash("aaaaa"),
131131
}
132132
pathA := newPath(newNoder(treeA, entryA))
@@ -136,7 +136,7 @@ func (s *ChangeAdaptorSuite) TestNewChangeModify(c *C) {
136136
treeB := &Tree{}
137137
entryB := TreeEntry{
138138
Name: "name",
139-
Mode: os.FileMode(42),
139+
Mode: filemode.FileMode(42),
140140
Hash: plumbing.NewHash("bbbb"),
141141
}
142142
pathB := newPath(newNoder(treeB, entryB))
@@ -295,7 +295,7 @@ func (s *ChangeAdaptorSuite) TestChangeEntryFromSortPath(c *C) {
295295
tree := &Tree{}
296296
entry := TreeEntry{
297297
Name: "name",
298-
Mode: os.FileMode(42),
298+
Mode: filemode.FileMode(42),
299299
Hash: plumbing.NewHash("aaaaa"),
300300
}
301301
path := newPath(newNoder(tree, entry))
@@ -312,14 +312,14 @@ func (s *ChangeAdaptorSuite) TestChangeEntryFromLongPath(c *C) {
312312
treeA := &Tree{}
313313
entryA := TreeEntry{
314314
Name: "nameA",
315-
Mode: os.FileMode(42),
315+
Mode: filemode.FileMode(42),
316316
Hash: plumbing.NewHash("aaaa"),
317317
}
318318

319319
treeB := &Tree{}
320320
entryB := TreeEntry{
321321
Name: "nameB",
322-
Mode: os.FileMode(24),
322+
Mode: filemode.FileMode(24),
323323
Hash: plumbing.NewHash("bbbb"),
324324
}
325325

‎plumbing/object/change_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package object
22

33
import (
4-
"os"
54
"sort"
65

76
"srcd.works/go-git.v4/plumbing"
7+
"srcd.works/go-git.v4/plumbing/filemode"
88
"srcd.works/go-git.v4/plumbing/storer"
99
"srcd.works/go-git.v4/storage/filesystem"
1010
"srcd.works/go-git.v4/utils/merkletrie"
@@ -48,7 +48,7 @@ func (s *ChangeSuite) TestInsert(c *C) {
4848

4949
path := "examples/clone/main.go"
5050
name := "main.go"
51-
mode := os.FileMode(100644)
51+
mode := filemode.Regular
5252
blob := plumbing.NewHash("f95dc8f7923add1a8b9f72ecb1e8db1402de601a")
5353
tree := plumbing.NewHash("6efca3ff41cab651332f9ebc0c96bb26be809615")
5454

@@ -94,7 +94,7 @@ func (s *ChangeSuite) TestDelete(c *C) {
9494

9595
path := "utils/difftree/difftree.go"
9696
name := "difftree.go"
97-
mode := os.FileMode(100644)
97+
mode := filemode.Regular
9898
blob := plumbing.NewHash("e2cb9a5719daf634d45a063112b4044ee81da13e")
9999
tree := plumbing.NewHash("f3d11566401ce4b0808aab9dd6fad3d5abf1481a")
100100

@@ -142,7 +142,7 @@ func (s *ChangeSuite) TestModify(c *C) {
142142

143143
path := "utils/difftree/difftree.go"
144144
name := "difftree.go"
145-
mode := os.FileMode(100644)
145+
mode := filemode.Regular
146146
fromBlob := plumbing.NewHash("05f583ace3a9a078d8150905a53a4d82567f125f")
147147
fromTree := plumbing.NewHash("b1f01b730b855c82431918cb338ad47ed558999b")
148148
toBlob := plumbing.NewHash("de927fad935d172929aacf20e71f3bf0b91dd6f9")
@@ -215,7 +215,7 @@ func (s *ChangeSuite) TestErrorsFindingChildsAreDetected(c *C) {
215215

216216
path := "utils/difftree/difftree.go"
217217
name := "difftree.go"
218-
mode := os.FileMode(100644)
218+
mode := filemode.Regular
219219
fromBlob := plumbing.NewHash("aaaa") // does not exists
220220
fromTree := plumbing.NewHash("b1f01b730b855c82431918cb338ad47ed558999b")
221221
toBlob := plumbing.NewHash("bbbb") // does not exists

‎plumbing/object/difftree.go‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package object
22

33
import (
44
"bytes"
5-
"os"
65

6+
"srcd.works/go-git.v4/plumbing/filemode"
77
"srcd.works/go-git.v4/utils/merkletrie"
88
"srcd.works/go-git.v4/utils/merkletrie/noder"
99
)
@@ -49,14 +49,11 @@ func equivalentMode(a, b []byte) bool {
4949
}
5050

5151
var (
52-
file = modeToBytes(FileMode)
53-
fileDeprecated = modeToBytes(FileModeDeprecated)
54-
// remove this by fixing plumbing.Object mode ASAP
55-
fileGoGit = modeToBytes(os.FileMode(0644))
52+
file = filemode.Regular.Bytes()
53+
fileDeprecated = filemode.Deprecated.Bytes()
5654
)
5755

5856
func isFilish(b []byte) bool {
5957
return bytes.Equal(b, file) ||
60-
bytes.Equal(b, fileDeprecated) ||
61-
bytes.Equal(b, fileGoGit)
58+
bytes.Equal(b, fileDeprecated)
6259
}

‎plumbing/object/difftree_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package object
22

33
import (
4-
"os"
54
"sort"
65

76
"srcd.works/go-git.v4/plumbing"
7+
"srcd.works/go-git.v4/plumbing/filemode"
88
"srcd.works/go-git.v4/plumbing/format/packfile"
99
"srcd.works/go-git.v4/plumbing/storer"
1010
"srcd.works/go-git.v4/storage/filesystem"
@@ -362,19 +362,19 @@ func (s *DiffTreeSuite) TestIssue279(c *C) {
362362
// mode to a 100644 or vice versa.
363363
from := &treeNoder{
364364
hash: plumbing.NewHash("d08e895238bac36d8220586fdc28c27e1a7a76d3"),
365-
mode: os.FileMode(0100664),
365+
mode: filemode.Regular,
366366
}
367367
to := &treeNoder{
368368
hash: plumbing.NewHash("d08e895238bac36d8220586fdc28c27e1a7a76d3"),
369-
mode: os.FileMode(0100644),
369+
mode: filemode.Regular,
370370
}
371371
c.Assert(hashEqual(from, to), Equals, true)
372372
c.Assert(hashEqual(to, from), Equals, true)
373373

374374
// but should detect if the contents of the file also changed.
375375
to = &treeNoder{
376376
hash: plumbing.NewHash("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
377-
mode: os.FileMode(0100644),
377+
mode: filemode.Regular,
378378
}
379379
c.Assert(hashEqual(from, to), Equals, false)
380380
c.Assert(hashEqual(to, from), Equals, false)

‎plumbing/object/file.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package object
33
import (
44
"bytes"
55
"io"
6-
"os"
76
"strings"
87

8+
"srcd.works/go-git.v4/plumbing/filemode"
99
"srcd.works/go-git.v4/plumbing/storer"
1010
"srcd.works/go-git.v4/utils/ioutil"
1111
)
@@ -16,13 +16,13 @@ type File struct {
1616
// depending of the function that generates it.
1717
Name string
1818
// Mode is the file mode.
19-
Mode os.FileMode
19+
Mode filemode.FileMode
2020
// Blob with the contents of the file.
2121
Blob
2222
}
2323

2424
// NewFile returns a File based on the given blob object
25-
func NewFile(name string, m os.FileMode, b *Blob) *File {
25+
func NewFile(name string, m filemode.FileMode, b *Blob) *File {
2626
return &File{Name: name, Mode: m, Blob: *b}
2727
}
2828

@@ -81,7 +81,7 @@ func (iter *FileIter) Next() (*File, error) {
8181
return nil, err
8282
}
8383

84-
if entry.Mode.IsDir() || entry.Mode == SubmoduleMode {
84+
if entry.Mode == filemode.Dir || entry.Mode == filemode.Submodule {
8585
continue
8686
}
8787

‎plumbing/object/file_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package object
33
import (
44
"io"
55

6-
"github.com/src-d/go-git-fixtures"
76
"srcd.works/go-git.v4/plumbing"
7+
"srcd.works/go-git.v4/plumbing/filemode"
88
"srcd.works/go-git.v4/plumbing/storer"
99
"srcd.works/go-git.v4/storage/filesystem"
1010

11+
"github.com/src-d/go-git-fixtures"
1112
. "gopkg.in/check.v1"
1213
)
1314

@@ -58,7 +59,7 @@ func (s *FileSuite) TestIter(c *C) {
5859
exp := t.files[k]
5960
file, err := iter.Next()
6061
c.Assert(err, IsNil, Commentf("subtest %d, iter %d, err=%v", i, k, err))
61-
c.Assert(file.Mode.String(), Equals, "-rw-r--r--")
62+
c.Assert(file.Mode, Equals, filemode.Regular)
6263
c.Assert(file.Hash.IsZero(), Equals, false)
6364
c.Assert(file.Hash, Equals, file.ID())
6465
c.Assert(file.Name, Equals, exp.Name, Commentf("subtest %d, iter %d, name=%s, expected=%s", i, k, file.Name, exp.Hash))

‎plumbing/object/object_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/src-d/go-git-fixtures"
109
"srcd.works/go-git.v4/plumbing"
10+
"srcd.works/go-git.v4/plumbing/filemode"
1111
"srcd.works/go-git.v4/plumbing/storer"
1212
"srcd.works/go-git.v4/storage/filesystem"
1313

14+
"github.com/src-d/go-git-fixtures"
1415
. "gopkg.in/check.v1"
1516
)
1617

@@ -91,7 +92,7 @@ func (s *ObjectsSuite) TestParseTree(c *C) {
9192
tree.buildMap()
9293
c.Assert(tree.m, HasLen, 8)
9394
c.Assert(tree.m[".gitignore"].Name, Equals, ".gitignore")
94-
c.Assert(tree.m[".gitignore"].Mode.String(), Equals, "-rw-r--r--")
95+
c.Assert(tree.m[".gitignore"].Mode, Equals, filemode.Regular)
9596
c.Assert(tree.m[".gitignore"].Hash.String(), Equals, "32858aad3c383ed1ff0a0f9bdf231d54a00c9e88")
9697

9798
count := 0

0 commit comments

Comments
 (0)