From 6ab6cdce719c22eb3f5293c1089132bf9ff55903 Mon Sep 17 00:00:00 2001
From: Stephen J Day <stephen.day@docker.com>
Date: Thu, 2 Mar 2017 13:50:09 -0800
Subject: [PATCH] cmd/dist: change fetch to fetch-object command

To allow us to differentiate from fetching an image, fetch a part of an
image and pulling an image, we now call the `fetch` command the
`fetch-object` command. We can now introduce a command that does the
complete image fetch without creating snapshots, allowing `pull` to
perform the entire process.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
---
 cmd/dist/delete.go                    | 2 +-
 cmd/dist/{fetch.go => fetchobject.go} | 4 ++--
 cmd/dist/main.go                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename cmd/dist/{fetch.go => fetchobject.go} (98%)

diff --git a/cmd/dist/delete.go b/cmd/dist/delete.go
index a881b33..3b12c1e 100644
--- a/cmd/dist/delete.go
+++ b/cmd/dist/delete.go
@@ -14,7 +14,7 @@ import (
 
 var deleteCommand = cli.Command{
 	Name:      "delete",
-	Aliases:   []string{"delete", "del", "remove", "rm"},
+	Aliases:   []string{"del", "remove", "rm"},
 	Usage:     "permanently delete one or more blobs.",
 	ArgsUsage: "[flags] [<digest>, ...]",
 	Description: `Delete one or more blobs permanently. Successfully deleted
diff --git a/cmd/dist/fetch.go b/cmd/dist/fetchobject.go
similarity index 98%
rename from cmd/dist/fetch.go
rename to cmd/dist/fetchobject.go
index 506c34d..5a81e32 100644
--- a/cmd/dist/fetch.go
+++ b/cmd/dist/fetchobject.go
@@ -25,8 +25,8 @@ import (
 // then receives object/hint lines on stdin, returning content as
 // needed.
 
-var fetchCommand = cli.Command{
-	Name:        "fetch",
+var fetchObjectCommand = cli.Command{
+	Name:        "fetch-object",
 	Usage:       "retrieve objects from a remote",
 	ArgsUsage:   "[flags] <remote> <object> [<hint>, ...]",
 	Description: `Fetch objects by identifier from a remote.`,
diff --git a/cmd/dist/main.go b/cmd/dist/main.go
index 580be0e..2172a37 100644
--- a/cmd/dist/main.go
+++ b/cmd/dist/main.go
@@ -61,7 +61,7 @@ distribution tool
 		},
 	}
 	app.Commands = []cli.Command{
-		fetchCommand,
+		fetchObjectCommand,
 		ingestCommand,
 		activeCommand,
 		getCommand,