improve delete support on push

plumbing/protocol/packp/updreq.go

@@ -42,6 +42,7 @@ func NewReferenceUpdateRequest() *ReferenceUpdateRequest {
 //   - report-status
 //   - ofs-delta
 //   - ref-delta
+//   - delete-refs
 // It leaves up to the user to add the following capabilities later:
 //   - atomic
 //   - ofs-delta

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)

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)
 }
 

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)

remote.go

@@ -21,7 +21,10 @@ import (
 	"gopkg.in/src-d/go-git.v4/utils/ioutil"
 )
 
-var NoErrAlreadyUpToDate = errors.New("already up-to-date")
+var (
+	NoErrAlreadyUpToDate     = errors.New("already up-to-date")
+	ErrDeleteRefNotSupported = errors.New("server does not support delete-refs")
+)
 
 // Remote represents a connection to a remote repository.
 type Remote struct {
@@ -56,7 +59,6 @@ func (r *Remote) Fetch(o *FetchOptions) error {
 // 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) {
-	// TODO: Support deletes.
 	// TODO: Sideband support
 
 	if o.RemoteName == "" {
@@ -88,6 +90,18 @@ func (r *Remote) Push(o *PushOptions) (err error) {
 		return err
 	}
 
+	isDelete := false
+	for _, rs := range o.RefSpecs {
+		if rs.IsDelete() {
+			isDelete = true
+			break
+		}
+	}
+
+	if isDelete && !ar.Capabilities.Supports(capability.DeleteRefs) {
+		return ErrDeleteRefNotSupported
+	}
+
 	req := packp.NewReferenceUpdateRequestFromCapabilities(ar.Capabilities)
 	if err := r.addReferencesToUpdate(o.RefSpecs, remoteRefs, req); err != nil {
 		return err
@@ -284,8 +298,8 @@ func (r *Remote) deleteReferences(rs config.RefSpec,
 
 		cmd := &packp.Command{
 			Name: ref.Name(),
-			Old: ref.Hash(),
-			New: plumbing.ZeroHash,
+			Old:  ref.Hash(),
+			New:  plumbing.ZeroHash,
 		}
 		req.Commands = append(req.Commands, cmd)
 		return nil