aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common_test.go11
-rw-r--r--remote.go57
-rw-r--r--remote_test.go190
-rw-r--r--repository_test.go65
4 files changed, 152 insertions, 171 deletions
diff --git a/common_test.go b/common_test.go
index 21b4481..a7cd755 100644
--- a/common_test.go
+++ b/common_test.go
@@ -169,3 +169,14 @@ func (s *SuiteCommon) TestCountLines(c *C) {
c.Assert(o, Equals, t.e, Commentf("subtest %d, input=%q", i, t.i))
}
}
+
+func AssertReferences(c *C, r *Repository, expected map[string]string) {
+ for name, target := range expected {
+ expected := plumbing.NewReferenceFromStrings(name, target)
+
+ obtained, err := r.Reference(expected.Name(), true)
+ c.Assert(err, IsNil)
+
+ c.Assert(obtained, DeepEquals, expected)
+ }
+}
diff --git a/remote.go b/remote.go
index fa984cf..48b3c3d 100644
--- a/remote.go
+++ b/remote.go
@@ -48,23 +48,10 @@ func (r *Remote) String() string {
return fmt.Sprintf("%s\t%s (fetch)\n%[1]s\t%[3]s (push)", r.c.Name, fetch, push)
}
-// Fetch fetches references from the remote to the local repository.
-// Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are
-// no changes to be fetched and no local references to update, or an error.
-func (r *Remote) Fetch(o *FetchOptions) error {
- _, err := r.fetch(o)
- return err
-}
-
// Push performs a push to the remote. Returns NoErrAlreadyUpToDate if the
// remote was already up-to-date.
-func (r *Remote) Push(o *PushOptions) (err error) {
+func (r *Remote) Push(o *PushOptions) error {
// TODO: Sideband support
-
- if o.RemoteName == "" {
- o.RemoteName = r.c.Name
- }
-
if err := o.Validate(); err != nil {
return err
}
@@ -141,7 +128,47 @@ func (r *Remote) Push(o *PushOptions) (err error) {
return err
}
- return rs.Error()
+ if err = rs.Error(); err != nil {
+ return err
+ }
+
+ return r.updateRemoteReferenceStorage(req, rs)
+}
+
+func (r *Remote) updateRemoteReferenceStorage(
+ req *packp.ReferenceUpdateRequest,
+ result *packp.ReportStatus,
+) error {
+
+ for _, spec := range r.c.Fetch {
+ for _, c := range req.Commands {
+ if !spec.Match(c.Name) {
+ continue
+ }
+
+ local := spec.Dst(c.Name)
+ ref := plumbing.NewHashReference(local, c.New)
+ switch c.Action() {
+ case packp.Create, packp.Update:
+ if err := r.s.SetReference(ref); err != nil {
+ return err
+ }
+ case packp.Delete:
+ if err := r.s.RemoveReference(local); err != nil {
+ return err
+ }
+ }
+ }
+ }
+
+ return nil
+}
+
+// Fetch fetches references from the remote to the local repository.
+// no changes to be fetched and no local references to update, or an error.
+func (r *Remote) Fetch(o *FetchOptions) error {
+ _, err := r.fetch(o)
+ return err
}
func (r *Remote) fetch(o *FetchOptions) (storer.ReferenceStorer, error) {
diff --git a/remote_test.go b/remote_test.go
index 7ffe040..d651a64 100644
--- a/remote_test.go
+++ b/remote_test.go
@@ -5,8 +5,6 @@ import (
"io"
"io/ioutil"
"os"
- "path/filepath"
- "strings"
"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git.v4/config"
@@ -289,13 +287,14 @@ func (s *RemoteSuite) TestString(c *C) {
}
func (s *RemoteSuite) TestPushToEmptyRepository(c *C) {
+ url := c.MkDir()
+ server, err := PlainInit(url, true)
+ c.Assert(err, IsNil)
+
srcFs := fixtures.Basic().One().DotGit()
sto, err := filesystem.NewStorage(srcFs)
c.Assert(err, IsNil)
- dstFs := fixtures.ByTag("empty").One().DotGit()
- url := dstFs.Root()
-
r := newRemote(sto, &config.RemoteConfig{
Name: DefaultRemoteName,
URL: url,
@@ -307,140 +306,117 @@ func (s *RemoteSuite) TestPushToEmptyRepository(c *C) {
})
c.Assert(err, IsNil)
- dstSto, err := filesystem.NewStorage(dstFs)
- c.Assert(err, IsNil)
- dstRepo, err := Open(dstSto, nil)
+ iter, err := r.s.IterReferences()
c.Assert(err, IsNil)
- iter, err := sto.IterReferences()
- c.Assert(err, IsNil)
- err = iter.ForEach(func(ref *plumbing.Reference) error {
+ expected := make(map[string]string)
+ iter.ForEach(func(ref *plumbing.Reference) error {
if !ref.IsBranch() {
return nil
}
- dstRef, err := dstRepo.Reference(ref.Name(), true)
- c.Assert(err, IsNil, Commentf("ref: %s", ref.String()))
- c.Assert(dstRef, DeepEquals, ref)
-
+ expected[ref.Name().String()] = ref.Hash().String()
return nil
})
c.Assert(err, IsNil)
+
+ AssertReferences(c, server, expected)
+
}
func (s *RemoteSuite) TestPushTags(c *C) {
- srcFs := fixtures.ByURL("https://github.com/git-fixtures/tags.git").One().DotGit()
- sto, err := filesystem.NewStorage(srcFs)
+ url := c.MkDir()
+ server, err := PlainInit(url, true)
c.Assert(err, IsNil)
- dstFs := fixtures.ByTag("empty").One().DotGit()
- url := dstFs.Root()
+ fs := fixtures.ByURL("https://github.com/git-fixtures/tags.git").One().DotGit()
+ sto, err := filesystem.NewStorage(fs)
+ c.Assert(err, IsNil)
r := newRemote(sto, &config.RemoteConfig{
Name: DefaultRemoteName,
URL: url,
})
- rs := config.RefSpec("refs/tags/*:refs/tags/*")
err = r.Push(&PushOptions{
- RefSpecs: []config.RefSpec{rs},
+ RefSpecs: []config.RefSpec{"refs/tags/*:refs/tags/*"},
})
c.Assert(err, IsNil)
- dstSto, err := filesystem.NewStorage(dstFs)
- c.Assert(err, IsNil)
- dstRepo, err := Open(dstSto, nil)
- c.Assert(err, IsNil)
-
- ref, err := dstRepo.Storer.Reference(plumbing.ReferenceName("refs/tags/lightweight-tag"))
- c.Assert(err, IsNil)
- c.Assert(ref, DeepEquals, plumbing.NewReferenceFromStrings("refs/tags/lightweight-tag", "f7b877701fbf855b44c0a9e86f3fdce2c298b07f"))
-
- ref, err = dstRepo.Storer.Reference(plumbing.ReferenceName("refs/tags/annotated-tag"))
- c.Assert(err, IsNil)
- c.Assert(ref, DeepEquals, plumbing.NewReferenceFromStrings("refs/tags/annotated-tag", "b742a2a9fa0afcfa9a6fad080980fbc26b007c69"))
-
- ref, err = dstRepo.Storer.Reference(plumbing.ReferenceName("refs/tags/commit-tag"))
- c.Assert(err, IsNil)
- c.Assert(ref, DeepEquals, plumbing.NewReferenceFromStrings("refs/tags/commit-tag", "ad7897c0fb8e7d9a9ba41fa66072cf06095a6cfc"))
-
- ref, err = dstRepo.Storer.Reference(plumbing.ReferenceName("refs/tags/blob-tag"))
- c.Assert(err, IsNil)
- c.Assert(ref, DeepEquals, plumbing.NewReferenceFromStrings("refs/tags/blob-tag", "fe6cb94756faa81e5ed9240f9191b833db5f40ae"))
-
- ref, err = dstRepo.Storer.Reference(plumbing.ReferenceName("refs/tags/tree-tag"))
- c.Assert(err, IsNil)
- c.Assert(ref, DeepEquals, plumbing.NewReferenceFromStrings("refs/tags/tree-tag", "152175bf7e5580299fa1f0ba41ef6474cc043b70"))
+ AssertReferences(c, server, map[string]string{
+ "refs/tags/lightweight-tag": "f7b877701fbf855b44c0a9e86f3fdce2c298b07f",
+ "refs/tags/annotated-tag": "b742a2a9fa0afcfa9a6fad080980fbc26b007c69",
+ "refs/tags/commit-tag": "ad7897c0fb8e7d9a9ba41fa66072cf06095a6cfc",
+ "refs/tags/blob-tag": "fe6cb94756faa81e5ed9240f9191b833db5f40ae",
+ "refs/tags/tree-tag": "152175bf7e5580299fa1f0ba41ef6474cc043b70",
+ })
}
func (s *RemoteSuite) TestPushNoErrAlreadyUpToDate(c *C) {
- f := fixtures.Basic().One()
- sto, err := filesystem.NewStorage(f.DotGit())
+ fs := fixtures.Basic().One().DotGit()
+ sto, err := filesystem.NewStorage(fs)
c.Assert(err, IsNil)
- url := f.DotGit().Root()
+
r := newRemote(sto, &config.RemoteConfig{
Name: DefaultRemoteName,
- URL: url,
+ URL: fs.Root(),
})
- rs := config.RefSpec("refs/heads/*:refs/heads/*")
err = r.Push(&PushOptions{
- RefSpecs: []config.RefSpec{rs},
+ RefSpecs: []config.RefSpec{"refs/heads/*:refs/heads/*"},
})
c.Assert(err, Equals, NoErrAlreadyUpToDate)
}
func (s *RemoteSuite) TestPushDeleteReference(c *C) {
- f := fixtures.Basic().One()
- sto, err := filesystem.NewStorage(f.DotGit())
+ fs := fixtures.Basic().One().DotGit()
+ sto, err := filesystem.NewStorage(fs)
c.Assert(err, IsNil)
- dstFs := f.DotGit()
- dstSto, err := filesystem.NewStorage(dstFs)
+ r, err := PlainClone(c.MkDir(), true, &CloneOptions{
+ URL: fs.Root(),
+ })
c.Assert(err, IsNil)
- prepareRepo(c, dstFs.Root())
- url := dstFs.Root()
- r := newRemote(sto, &config.RemoteConfig{
- Name: DefaultRemoteName,
- URL: url,
- })
+ remote, err := r.Remote(DefaultRemoteName)
+ c.Assert(err, IsNil)
- rs := config.RefSpec(":refs/heads/branch")
- err = r.Push(&PushOptions{
- RefSpecs: []config.RefSpec{rs},
+ err = remote.Push(&PushOptions{
+ RefSpecs: []config.RefSpec{":refs/heads/branch"},
})
c.Assert(err, IsNil)
- _, err = dstSto.Reference(plumbing.ReferenceName("refs/heads/branch"))
+ _, err = sto.Reference(plumbing.ReferenceName("refs/heads/branch"))
+ c.Assert(err, Equals, plumbing.ErrReferenceNotFound)
+
+ _, err = r.Storer.Reference(plumbing.ReferenceName("refs/heads/branch"))
c.Assert(err, Equals, plumbing.ErrReferenceNotFound)
}
func (s *RemoteSuite) TestPushRejectNonFastForward(c *C) {
- f := fixtures.Basic().One()
- sto, err := filesystem.NewStorage(f.DotGit())
+ fs := fixtures.Basic().One().DotGit()
+ server, err := filesystem.NewStorage(fs)
c.Assert(err, IsNil)
- dstFs := f.DotGit()
- dstSto, err := filesystem.NewStorage(dstFs)
+ r, err := PlainClone(c.MkDir(), true, &CloneOptions{
+ URL: fs.Root(),
+ })
c.Assert(err, IsNil)
- url := dstFs.Root()
- r := newRemote(sto, &config.RemoteConfig{
- Name: DefaultRemoteName,
- URL: url,
- })
+ remote, err := r.Remote(DefaultRemoteName)
+ c.Assert(err, IsNil)
- oldRef, err := dstSto.Reference(plumbing.ReferenceName("refs/heads/branch"))
+ branch := plumbing.ReferenceName("refs/heads/branch")
+ oldRef, err := server.Reference(branch)
c.Assert(err, IsNil)
c.Assert(oldRef, NotNil)
- err = r.Push(&PushOptions{RefSpecs: []config.RefSpec{
- config.RefSpec("refs/heads/master:refs/heads/branch"),
+ err = remote.Push(&PushOptions{RefSpecs: []config.RefSpec{
+ "refs/heads/master:refs/heads/branch",
}})
c.Assert(err, ErrorMatches, "non-fast-forward update: refs/heads/branch")
- newRef, err := dstSto.Reference(plumbing.ReferenceName("refs/heads/branch"))
+ newRef, err := server.Reference(branch)
c.Assert(err, IsNil)
c.Assert(newRef, DeepEquals, oldRef)
}
@@ -475,32 +451,35 @@ func (s *RemoteSuite) TestPushForce(c *C) {
}
func (s *RemoteSuite) TestPushNewReference(c *C) {
- f := fixtures.Basic().One()
- sto, err := filesystem.NewStorage(f.DotGit())
- c.Assert(err, IsNil)
+ fs := fixtures.Basic().One().DotGit()
+ url := c.MkDir()
+ server, err := PlainClone(url, true, &CloneOptions{
+ URL: fs.Root(),
+ })
- dstFs := f.DotGit()
- dstSto, err := filesystem.NewStorage(dstFs)
+ r, err := PlainClone(c.MkDir(), true, &CloneOptions{
+ URL: url,
+ })
c.Assert(err, IsNil)
- url := dstFs.Root()
- r := newRemote(sto, &config.RemoteConfig{
- Name: DefaultRemoteName,
- URL: url,
- })
+ remote, err := r.Remote(DefaultRemoteName)
+ c.Assert(err, IsNil)
- oldRef, err := dstSto.Reference(plumbing.ReferenceName("refs/heads/branch"))
+ ref, err := r.Reference(plumbing.ReferenceName("refs/heads/master"), true)
c.Assert(err, IsNil)
- c.Assert(oldRef, NotNil)
- err = r.Push(&PushOptions{RefSpecs: []config.RefSpec{
- config.RefSpec("refs/heads/branch:refs/heads/branch2"),
+ err = remote.Push(&PushOptions{RefSpecs: []config.RefSpec{
+ "refs/heads/master:refs/heads/branch2",
}})
c.Assert(err, IsNil)
- newRef, err := dstSto.Reference(plumbing.ReferenceName("refs/heads/branch2"))
- c.Assert(err, IsNil)
- c.Assert(newRef.Hash(), Equals, oldRef.Hash())
+ AssertReferences(c, server, map[string]string{
+ "refs/heads/branch2": ref.Hash().String(),
+ })
+
+ AssertReferences(c, r, map[string]string{
+ "refs/remotes/origin/branch2": ref.Hash().String(),
+ })
}
func (s *RemoteSuite) TestPushInvalidEndpoint(c *C) {
@@ -516,7 +495,7 @@ func (s *RemoteSuite) TestPushNonExistentEndpoint(c *C) {
}
func (s *RemoteSuite) TestPushInvalidSchemaEndpoint(c *C) {
- r := newRemote(nil, &config.RemoteConfig{Name: "foo", URL: "qux://foo"})
+ r := newRemote(nil, &config.RemoteConfig{Name: "origin", URL: "qux://foo"})
err := r.Push(&PushOptions{})
c.Assert(err, ErrorMatches, ".*unsupported scheme.*")
}
@@ -571,22 +550,3 @@ func (s *RemoteSuite) TestGetHaves(c *C) {
c.Assert(err, IsNil)
c.Assert(l, HasLen, 2)
}
-
-const bareConfig = `[core]
-repositoryformatversion = 0
-filemode = true
-bare = true`
-
-func prepareRepo(c *C, path string) {
- // git-receive-pack refuses to update refs/heads/master on non-bare repo
- // so we ensure bare repo config.
- config := filepath.Join(path, "config")
- if _, err := os.Stat(config); err == nil {
- f, err := os.OpenFile(config, os.O_TRUNC|os.O_WRONLY, 0)
- c.Assert(err, IsNil)
- content := strings.NewReader(bareConfig)
- _, err = io.Copy(f, content)
- c.Assert(err, IsNil)
- c.Assert(f.Close(), IsNil)
- }
-}
diff --git a/repository_test.go b/repository_test.go
index f31cd1d..d95b65e 100644
--- a/repository_test.go
+++ b/repository_test.go
@@ -727,60 +727,43 @@ func (s *RepositorySuite) TestPullAdd(c *C) {
c.Assert(branch.Hash().String(), Not(Equals), "6ecf0ef2c2dffb796033e5a02219af86ec6584e5")
}
-func (s *RepositorySuite) TestPushToEmptyRepository(c *C) {
- srcFs := fixtures.Basic().One().DotGit()
- sto, err := filesystem.NewStorage(srcFs)
- c.Assert(err, IsNil)
-
- dstFs := fixtures.ByTag("empty").One().DotGit()
- url := dstFs.Root()
-
- r, err := Open(sto, srcFs)
+func (s *RepositorySuite) TestPush(c *C) {
+ url := c.MkDir()
+ server, err := PlainInit(url, true)
c.Assert(err, IsNil)
- _, err = r.CreateRemote(&config.RemoteConfig{
- Name: "myremote",
+ _, err = s.Repository.CreateRemote(&config.RemoteConfig{
+ Name: "test",
URL: url,
})
c.Assert(err, IsNil)
- err = r.Push(&PushOptions{RemoteName: "myremote"})
- c.Assert(err, IsNil)
-
- sto, err = filesystem.NewStorage(dstFs)
- c.Assert(err, IsNil)
- dstRepo, err := Open(sto, nil)
- c.Assert(err, IsNil)
-
- iter, err := sto.IterReferences()
+ err = s.Repository.Push(&PushOptions{
+ RemoteName: "test",
+ })
c.Assert(err, IsNil)
- err = iter.ForEach(func(ref *plumbing.Reference) error {
- if !ref.IsBranch() {
- return nil
- }
- dstRef, err := dstRepo.Reference(ref.Name(), true)
- c.Assert(err, IsNil)
- c.Assert(dstRef, DeepEquals, ref)
+ AssertReferences(c, server, map[string]string{
+ "refs/heads/master": "6ecf0ef2c2dffb796033e5a02219af86ec6584e5",
+ "refs/heads/branch": "e8d3ffab552895c19b9fcf7aa264d277cde33881",
+ })
- return nil
+ AssertReferences(c, s.Repository, map[string]string{
+ "refs/remotes/test/master": "6ecf0ef2c2dffb796033e5a02219af86ec6584e5",
+ "refs/remotes/test/branch": "e8d3ffab552895c19b9fcf7aa264d277cde33881",
})
- c.Assert(err, IsNil)
}
func (s *RepositorySuite) TestPushDepth(c *C) {
- dir, err := ioutil.TempDir("", "push-depth")
- defer os.RemoveAll(dir)
-
- origin, err := PlainClone(c.MkDir(), true, &CloneOptions{
+ url := c.MkDir()
+ server, err := PlainClone(url, true, &CloneOptions{
URL: fixtures.Basic().One().DotGit().Root(),
})
c.Assert(err, IsNil)
- fs := origin.Storer.(*filesystem.Storage).Filesystem()
r, err := Clone(memory.NewStorage(), memfs.New(), &CloneOptions{
- URL: fs.Root(),
+ URL: url,
Depth: 1,
})
c.Assert(err, IsNil)
@@ -803,13 +786,13 @@ func (s *RepositorySuite) TestPushDepth(c *C) {
err = r.Push(&PushOptions{})
c.Assert(err, IsNil)
- remote, err := origin.Head()
- c.Assert(err, IsNil)
- c.Assert(remote.Hash(), Equals, hash)
+ AssertReferences(c, server, map[string]string{
+ "refs/heads/master": hash.String(),
+ })
- local, err := r.Head()
- c.Assert(err, IsNil)
- c.Assert(local.Hash(), Equals, remote.Hash())
+ AssertReferences(c, r, map[string]string{
+ "refs/remotes/origin/master": hash.String(),
+ })
}
func (s *RepositorySuite) TestPushNonExistentRemote(c *C) {