Merge pull request #531 from mcuadros/ref-name
plumbing: moved `Reference.Is*` methods to `ReferenceName.Is*`
diff --git a/plumbing/reference.go b/plumbing/reference.go
index 5d477b9..2c30fe0 100644
--- a/plumbing/reference.go
+++ b/plumbing/reference.go
@@ -55,6 +55,26 @@
// ReferenceName reference name's
type ReferenceName string
+// IsBranch check if a reference is a branch
+func (r ReferenceName) IsBranch() bool {
+ return strings.HasPrefix(string(r), refHeadPrefix)
+}
+
+// IsNote check if a reference is a note
+func (r ReferenceName) IsNote() bool {
+ return strings.HasPrefix(string(r), refNotePrefix)
+}
+
+// IsRemote check if a reference is a remote
+func (r ReferenceName) IsRemote() bool {
+ return strings.HasPrefix(string(r), refRemotePrefix)
+}
+
+// IsTag check if a reference is a tag
+func (r ReferenceName) IsTag() bool {
+ return strings.HasPrefix(string(r), refTagPrefix)
+}
+
func (r ReferenceName) String() string {
return string(r)
}
@@ -138,26 +158,6 @@
return r.target
}
-// IsBranch check if a reference is a branch
-func (r *Reference) IsBranch() bool {
- return strings.HasPrefix(string(r.n), refHeadPrefix)
-}
-
-// IsNote check if a reference is a note
-func (r *Reference) IsNote() bool {
- return strings.HasPrefix(string(r.n), refNotePrefix)
-}
-
-// IsRemote check if a reference is a remote
-func (r *Reference) IsRemote() bool {
- return strings.HasPrefix(string(r.n), refRemotePrefix)
-}
-
-// IsTag check if a reference is a tag
-func (r *Reference) IsTag() bool {
- return strings.HasPrefix(string(r.n), refTagPrefix)
-}
-
// Strings dump a reference as a [2]string
func (r *Reference) Strings() [2]string {
var o [2]string
diff --git a/plumbing/reference_test.go b/plumbing/reference_test.go
index 97c8772..47919ef 100644
--- a/plumbing/reference_test.go
+++ b/plumbing/reference_test.go
@@ -55,21 +55,21 @@
}
func (s *ReferenceSuite) TestIsBranch(c *C) {
- r := NewHashReference(ExampleReferenceName, ZeroHash)
+ r := ExampleReferenceName
c.Assert(r.IsBranch(), Equals, true)
}
func (s *ReferenceSuite) TestIsNote(c *C) {
- r := NewHashReference(ReferenceName("refs/notes/foo"), ZeroHash)
+ r := ReferenceName("refs/notes/foo")
c.Assert(r.IsNote(), Equals, true)
}
func (s *ReferenceSuite) TestIsRemote(c *C) {
- r := NewHashReference(ReferenceName("refs/remotes/origin/master"), ZeroHash)
+ r := ReferenceName("refs/remotes/origin/master")
c.Assert(r.IsRemote(), Equals, true)
}
func (s *ReferenceSuite) TestIsTag(c *C) {
- r := NewHashReference(ReferenceName("refs/tags/v3.1."), ZeroHash)
+ r := ReferenceName("refs/tags/v3.1.")
c.Assert(r.IsTag(), Equals, true)
}
diff --git a/remote.go b/remote.go
index eb5a6a2..2409301 100644
--- a/remote.go
+++ b/remote.go
@@ -467,7 +467,7 @@
refs := make(memory.ReferenceStorage, 0)
return refs, iter.ForEach(func(ref *plumbing.Reference) error {
if !config.MatchAny(spec, ref.Name()) {
- if !ref.IsTag() || tags != AllTags {
+ if !ref.Name().IsTag() || tags != AllTags {
return nil
}
}
@@ -666,7 +666,7 @@
func (r *Remote) buildFetchedTags(refs memory.ReferenceStorage) (updated bool, err error) {
for _, ref := range refs {
- if !ref.IsTag() {
+ if !ref.Name().IsTag() {
continue
}
diff --git a/remote_test.go b/remote_test.go
index 4953b12..e2fd8ae 100644
--- a/remote_test.go
+++ b/remote_test.go
@@ -344,7 +344,7 @@
expected := make(map[string]string)
iter.ForEach(func(ref *plumbing.Reference) error {
- if !ref.IsBranch() {
+ if !ref.Name().IsBranch() {
return nil
}
diff --git a/repository.go b/repository.go
index 92174d6..e2a18c4 100644
--- a/repository.go
+++ b/repository.go
@@ -541,7 +541,7 @@
func (r *Repository) updateReferences(spec []config.RefSpec,
resolvedHead *plumbing.Reference) (updated bool, err error) {
- if !resolvedHead.IsBranch() {
+ if !resolvedHead.Name().IsBranch() {
// Detached HEAD mode
head := plumbing.NewHashReference(plumbing.HEAD, resolvedHead.Hash())
return updateReferenceStorerIfNeeded(r.Storer, head)
@@ -701,7 +701,7 @@
return storer.NewReferenceFilteredIter(
func(r *plumbing.Reference) bool {
- return r.IsTag()
+ return r.Name().IsTag()
}, refIter), nil
}
@@ -714,7 +714,7 @@
return storer.NewReferenceFilteredIter(
func(r *plumbing.Reference) bool {
- return r.IsBranch()
+ return r.Name().IsBranch()
}, refIter), nil
}
@@ -727,7 +727,7 @@
return storer.NewReferenceFilteredIter(
func(r *plumbing.Reference) bool {
- return r.IsNote()
+ return r.Name().IsNote()
}, refIter), nil
}
diff --git a/repository_test.go b/repository_test.go
index 00ce120..3077807 100644
--- a/repository_test.go
+++ b/repository_test.go
@@ -623,7 +623,6 @@
func (s *RepositorySuite) TestPush(c *C) {
url := c.MkDir()
- fmt.Println(url)
server, err := PlainInit(url, true)
c.Assert(err, IsNil)
@@ -651,7 +650,6 @@
func (s *RepositorySuite) TestPushContext(c *C) {
url := c.MkDir()
- fmt.Println(url)
_, err := PlainInit(url, true)
c.Assert(err, IsNil)
@@ -923,7 +921,7 @@
tags.ForEach(func(tag *plumbing.Reference) error {
count++
c.Assert(tag.Hash().IsZero(), Equals, false)
- c.Assert(tag.IsTag(), Equals, true)
+ c.Assert(tag.Name().IsTag(), Equals, true)
return nil
})
@@ -944,7 +942,7 @@
branches.ForEach(func(branch *plumbing.Reference) error {
count++
c.Assert(branch.Hash().IsZero(), Equals, false)
- c.Assert(branch.IsBranch(), Equals, true)
+ c.Assert(branch.Name().IsBranch(), Equals, true)
return nil
})
@@ -968,7 +966,7 @@
notes.ForEach(func(note *plumbing.Reference) error {
count++
c.Assert(note.Hash().IsZero(), Equals, false)
- c.Assert(note.IsNote(), Equals, true)
+ c.Assert(note.Name().IsNote(), Equals, true)
return nil
})
diff --git a/worktree.go b/worktree.go
index 60c8adb..4f8e740 100644
--- a/worktree.go
+++ b/worktree.go
@@ -209,7 +209,7 @@
return plumbing.ZeroHash, err
}
- if !b.IsTag() {
+ if !b.Name().IsTag() {
return b.Hash(), nil
}
@@ -244,7 +244,7 @@
}
var head *plumbing.Reference
- if target.IsBranch() {
+ if target.Name().IsBranch() {
head = plumbing.NewSymbolicReference(plumbing.HEAD, target.Name())
} else {
head = plumbing.NewHashReference(plumbing.HEAD, commit)
@@ -323,7 +323,7 @@
return err
}
- if !branch.IsBranch() {
+ if !branch.Name().IsBranch() {
return fmt.Errorf("invalid HEAD target should be a branch, found %s", branch.Type())
}
