From 573cd092a5f467d0fab1acbd9cc0b80040cae565 Mon Sep 17 00:00:00 2001
From: Shishir Mahajan <shishir.mahajan@redhat.com>
Date: Fri, 23 Jan 2015 17:15:35 -0500
Subject: [PATCH] cleanup of docker tag command code

Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
---
 graph/service.go |  3 +--
 graph/tag.go     | 25 -------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/graph/service.go b/graph/service.go
index 675e12a1a9537..fda99902ca5f9 100644
--- a/graph/service.go
+++ b/graph/service.go
@@ -12,8 +12,7 @@ import (
 func (s *TagStore) Install(eng *engine.Engine) error {
 	for name, handler := range map[string]engine.Handler{
 		"image_set":      s.CmdSet,
-		"image_tag":      s.CmdTag,
-		"tag":            s.CmdTagLegacy, // FIXME merge with "image_tag"
+		"tag":            s.CmdTag,
 		"image_get":      s.CmdGet,
 		"image_inspect":  s.CmdLookup,
 		"image_tarlayer": s.CmdTarLayer,
diff --git a/graph/tag.go b/graph/tag.go
index 3d89422f9d6d9..b33e49d5936e6 100644
--- a/graph/tag.go
+++ b/graph/tag.go
@@ -2,34 +2,9 @@ package graph
 
 import (
 	"github.com/docker/docker/engine"
-	"github.com/docker/docker/pkg/parsers"
 )
 
-// CmdTag assigns a new name and tag to an existing image. If the tag already exists,
-// it is changed and the image previously referenced by the tag loses that reference.
-// This may cause the old image to be garbage-collected if its reference count reaches zero.
-//
-// Syntax: image_tag NEWNAME OLDNAME
-// Example: image_tag shykes/myapp:latest shykes/myapp:1.42.0
 func (s *TagStore) CmdTag(job *engine.Job) engine.Status {
-	if len(job.Args) != 2 {
-		return job.Errorf("usage: %s NEWNAME OLDNAME", job.Name)
-	}
-	var (
-		newName = job.Args[0]
-		oldName = job.Args[1]
-	)
-	newRepo, newTag := parsers.ParseRepositoryTag(newName)
-	// FIXME: Set should either parse both old and new name, or neither.
-	// 	the current prototype is inconsistent.
-	if err := s.Set(newRepo, newTag, oldName, true); err != nil {
-		return job.Error(err)
-	}
-	return engine.StatusOK
-}
-
-// FIXME: merge into CmdTag above, and merge "image_tag" and "tag" into a single job.
-func (s *TagStore) CmdTagLegacy(job *engine.Job) engine.Status {
 	if len(job.Args) != 2 && len(job.Args) != 3 {
 		return job.Errorf("Usage: %s IMAGE REPOSITORY [TAG]\n", job.Name)
 	}