object links: Added text marshaling

core/commands2/ls.go

@@ -82,11 +82,7 @@ it contains, with the following format:
 				if len(output) > 1 {
 					s += fmt.Sprintf("%s:\n", object.Hash)
 				}
-
+				s += marshalLinks(object.Links)
-				for _, link := range object.Links {
-					s += fmt.Sprintf("%s %v %s\n", link.Hash, link.Size, link.Name)
-				}
-
 				if len(output) > 1 {
 					s += "\n"
 				}
@@ -97,3 +93,10 @@ it contains, with the following format:
 	},
 	Type: &LsOutput{},
 }
+
+func marshalLinks(links []Link) (s string) {
+	for _, link := range links {
+		s += fmt.Sprintf("%s %v %s\n", link.Hash, link.Size, link.Name)
+	}
+	return s
+}

core/commands2/object.go

@@ -108,6 +108,13 @@ It outputs to stdout, and <key> is a base58 encoded multihash.
 
 		return objectLinks(n, key)
 	},
+	Marshalers: cmds.MarshalerMap{
+		cmds.Text: func(res cmds.Response) ([]byte, error) {
+			object := res.Output().(*Object)
+			marshalled := marshalLinks(object.Links)
+			return []byte(marshalled), nil
+		},
+	},
 	Type: &Object{},
 }