aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/transport
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2017-07-11 06:37:32 -0700
committerGitHub <noreply@github.com>2017-07-11 06:37:32 -0700
commitd42ecf655db7969fdaaa3e65be18e0c9be7ddb8f (patch)
tree7691e5817dee02594904786c7a9f3f6a990b39d0 /plumbing/transport
parent09cd5ccfd384be79e8c49d0d0bccd22589098809 (diff)
parent09f5f2a35f0f4c42b2def0642540f32e59fdeeb3 (diff)
downloadgo-git-d42ecf655db7969fdaaa3e65be18e0c9be7ddb8f.tar.gz
Merge pull request #472 from smola/fix-caps-delete-refs
improve delete support on push
Diffstat (limited to 'plumbing/transport')
-rw-r--r--plumbing/transport/server/receive_pack_test.go5
-rw-r--r--plumbing/transport/server/server.go44
-rw-r--r--plumbing/transport/test/receive_pack.go4
3 files changed, 16 insertions, 37 deletions
diff --git a/plumbing/transport/server/receive_pack_test.go b/plumbing/transport/server/receive_pack_test.go
index 73ba60b..54c2fba 100644
--- a/plumbing/transport/server/receive_pack_test.go
+++ b/plumbing/transport/server/receive_pack_test.go
@@ -27,11 +27,6 @@ func (s *ReceivePackSuite) TearDownTest(c *C) {
s.Suite.TearDownSuite(c)
}
-// TODO
-func (s *ReceivePackSuite) TestSendPackAddDeleteReference(c *C) {
- c.Skip("delete reference not supported yet")
-}
-
// Overwritten, server returns error earlier.
func (s *ReceivePackSuite) TestAdvertisedReferencesNotExists(c *C) {
r, err := s.Client.NewReceivePackSession(s.NonExistentEndpoint, s.EmptyAuth)
diff --git a/plumbing/transport/server/server.go b/plumbing/transport/server/server.go
index 89fce5f..dd278c8 100644
--- a/plumbing/transport/server/server.go
+++ b/plumbing/transport/server/server.go
@@ -225,31 +225,11 @@ func (s *rpSession) ReceivePack(req *packp.ReferenceUpdateRequest) (*packp.Repor
return s.reportStatus(), err
}
- updatedRefs := s.updatedReferences(req)
-
- if s.caps.Supports(capability.Atomic) && s.firstErr != nil {
- //TODO: add support for 'atomic' once we have reference
- // transactions, currently we do not announce it.
- rs := s.reportStatus()
- for _, cs := range rs.CommandStatuses {
- if cs.Error() == nil {
- cs.Status = ""
- }
- }
- }
-
- for name, ref := range updatedRefs {
- //TODO: add support for 'delete-refs' once we can delete
- // references, currently we do not announce it.
- err := s.storer.SetReference(ref)
- s.setStatus(name, err)
- }
-
+ s.updateReferences(req)
return s.reportStatus(), s.firstErr
}
-func (s *rpSession) updatedReferences(req *packp.ReferenceUpdateRequest) map[plumbing.ReferenceName]*plumbing.Reference {
- refs := map[plumbing.ReferenceName]*plumbing.Reference{}
+func (s *rpSession) updateReferences(req *packp.ReferenceUpdateRequest) {
for _, cmd := range req.Commands {
exists, err := referenceExists(s.storer, cmd.Name)
if err != nil {
@@ -265,19 +245,16 @@ func (s *rpSession) updatedReferences(req *packp.ReferenceUpdateRequest) map[plu
}
ref := plumbing.NewHashReference(cmd.Name, cmd.New)
- refs[ref.Name()] = ref
+ err := s.storer.SetReference(ref)
+ s.setStatus(cmd.Name, err)
case packp.Delete:
if !exists {
s.setStatus(cmd.Name, ErrUpdateReference)
continue
}
- if !s.caps.Supports(capability.DeleteRefs) {
- s.setStatus(cmd.Name, fmt.Errorf("delete not supported"))
- continue
- }
-
- refs[cmd.Name] = nil
+ err := s.storer.RemoveReference(cmd.Name)
+ s.setStatus(cmd.Name, err)
case packp.Update:
if !exists {
s.setStatus(cmd.Name, ErrUpdateReference)
@@ -290,11 +267,10 @@ func (s *rpSession) updatedReferences(req *packp.ReferenceUpdateRequest) map[plu
}
ref := plumbing.NewHashReference(cmd.Name, cmd.New)
- refs[ref.Name()] = ref
+ err := s.storer.SetReference(ref)
+ s.setStatus(cmd.Name, err)
}
}
-
- return refs
}
func (s *rpSession) failAtomicUpdate() (*packp.ReportStatus, error) {
@@ -368,6 +344,10 @@ func (*rpSession) setSupportedCapabilities(c *capability.List) error {
return err
}
+ if err := c.Set(capability.DeleteRefs); err != nil {
+ return err
+ }
+
return c.Set(capability.ReportStatus)
}
diff --git a/plumbing/transport/test/receive_pack.go b/plumbing/transport/test/receive_pack.go
index bb1c58a..15172c8 100644
--- a/plumbing/transport/test/receive_pack.go
+++ b/plumbing/transport/test/receive_pack.go
@@ -308,6 +308,10 @@ func (s *ReceivePackSuite) testSendPackDeleteReference(c *C) {
req.Capabilities.Set(capability.ReportStatus)
}
+ if !ar.Capabilities.Supports(capability.DeleteRefs) {
+ c.Fatal("capability delete-refs not supported")
+ }
+
c.Assert(r.Close(), IsNil)
s.receivePack(c, s.Endpoint, req, nil, false)