From 6cb4e249bdb9b3a7871318030e215785128fdcee Mon Sep 17 00:00:00 2001
From: risk danger olson <technoweenie@gmail.com>
Date: Mon, 27 Feb 2017 14:16:19 -0700
Subject: [PATCH] Don't print doc url and request id for expected errors

---
 lfsapi/errors.go | 12 +-----------
 locking/locks.go | 40 ++++++++++++++++------------------------
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/lfsapi/errors.go b/lfsapi/errors.go
index ac84f38c..dd9b64ee 100644
--- a/lfsapi/errors.go
+++ b/lfsapi/errors.go
@@ -20,16 +20,6 @@ func IsHTTP(err error) (*http.Response, bool) {
 	return nil, false
 }
 
-func ClientErrorMessage(msg, docURL, reqID string) string {
-	if len(docURL) > 0 {
-		msg += "\nDocs: " + docURL
-	}
-	if len(reqID) > 0 {
-		msg += "\nRequest ID: " + reqID
-	}
-	return msg
-}
-
 type ClientError struct {
 	Message          string `json:"message"`
 	DocumentationUrl string `json:"documentation_url,omitempty"`
@@ -42,7 +32,7 @@ func (e *ClientError) HTTPResponse() *http.Response {
 }
 
 func (e *ClientError) Error() string {
-	return ClientErrorMessage(e.Message, e.DocumentationUrl, e.RequestId)
+	return e.Message
 }
 
 func (c *Client) handleResponse(res *http.Response) error {
diff --git a/locking/locks.go b/locking/locks.go
index 85a9c477..c1b0d6ae 100644
--- a/locking/locks.go
+++ b/locking/locks.go
@@ -95,12 +95,10 @@ func (c *Client) LockFile(path string) (Lock, error) {
 	}
 
 	if len(lockRes.Message) > 0 {
-		return Lock{}, fmt.Errorf("Server unable to create lock: %s",
-			lfsapi.ClientErrorMessage(
-				lockRes.Message,
-				lockRes.DocumentationURL,
-				lockRes.RequestID,
-			))
+		if len(lockRes.RequestID) > 0 {
+			tracerx.Printf("Server Request ID: %s", lockRes.RequestID)
+		}
+		return Lock{}, fmt.Errorf("Server unable to create lock: %s", lockRes.Message)
 	}
 
 	lock := *lockRes.Lock
@@ -147,12 +145,10 @@ func (c *Client) UnlockFileById(id string, force bool) error {
 	}
 
 	if len(unlockRes.Message) > 0 {
-		return fmt.Errorf("Server unable to unlock: %s",
-			lfsapi.ClientErrorMessage(
-				unlockRes.Message,
-				unlockRes.DocumentationURL,
-				unlockRes.RequestID,
-			))
+		if len(unlockRes.RequestID) > 0 {
+			tracerx.Printf("Server Request ID: %s", unlockRes.RequestID)
+		}
+		return fmt.Errorf("Server unable to unlock: %s", unlockRes.Message)
 	}
 
 	if err := c.cache.RemoveById(id); err != nil {
@@ -205,12 +201,10 @@ func (c *Client) VerifiableLocks(limit int) (ourLocks, theirLocks []Lock, err er
 		}
 
 		if list.Message != "" {
-			return ourLocks, theirLocks, fmt.Errorf("Server error searching locks: %s",
-				lfsapi.ClientErrorMessage(
-					list.Message,
-					list.DocumentationURL,
-					list.RequestID,
-				))
+			if len(list.RequestID) > 0 {
+				tracerx.Printf("Server Request ID: %s", list.RequestID)
+			}
+			return ourLocks, theirLocks, fmt.Errorf("Server error searching locks: %s", list.Message)
 		}
 
 		for _, l := range list.Ours {
@@ -273,12 +267,10 @@ func (c *Client) searchRemoteLocks(filter map[string]string, limit int) ([]Lock,
 		}
 
 		if list.Message != "" {
-			return locks, fmt.Errorf("Server error searching for locks: %s",
-				lfsapi.ClientErrorMessage(
-					list.Message,
-					list.DocumentationURL,
-					list.RequestID,
-				))
+			if len(list.RequestID) > 0 {
+				tracerx.Printf("Server Request ID: %s", list.RequestID)
+			}
+			return locks, fmt.Errorf("Server error searching for locks: %s", list.Message)
 		}
 
 		for _, l := range list.Locks {