opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-26 23:53:19 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2592 from ipfs/fix/object-diff-resolve

Browse Source 
fix resolve call in object diff
This commit is contained in:
Jeromy Johnson
2016-04-19 16:39:03 -07:00
parent b3690ead2a 6d90fe35ca
commit d4622c4404
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/commands/object/diff.go
View File

@ -6,10 +6,15 @@ import (
"io" "io"
cmds "github.com/ipfs/go-ipfs/commands" cmds "github.com/ipfs/go-ipfs/commands"
core "github.com/ipfs/go-ipfs/core"
dagutils "github.com/ipfs/go-ipfs/merkledag/utils" dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
path "github.com/ipfs/go-ipfs/path" path "github.com/ipfs/go-ipfs/path"
) )
type Changes struct {
Changes []*dagutils.Change
}
var ObjectDiffCmd = &cmds.Command{ var ObjectDiffCmd = &cmds.Command{
Helptext: cmds.HelpText{ Helptext: cmds.HelpText{
Tagline: "takes a diff of the two given objects", Tagline: "takes a diff of the two given objects",
@ -68,13 +73,13 @@ Example:
ctx := req.Context() ctx := req.Context()
obj_a, err := node.Resolver.ResolvePath(ctx, pa) obj_a, err := core.Resolve(ctx, node, pa)
if err != nil { if err != nil {
res.SetError(err, cmds.ErrNormal) res.SetError(err, cmds.ErrNormal)
return return
} }
obj_b, err := node.Resolver.ResolvePath(ctx, pb) obj_b, err := core.Resolve(ctx, node, pb)
if err != nil { if err != nil {
res.SetError(err, cmds.ErrNormal) res.SetError(err, cmds.ErrNormal)
return return
@ -86,15 +91,15 @@ Example:
return return
} }
res.SetOutput(changes) res.SetOutput(&Changes{changes})
}, },
Type: []*dagutils.Change{}, Type: Changes{},
Marshalers: cmds.MarshalerMap{ Marshalers: cmds.MarshalerMap{
cmds.Text: func(res cmds.Response) (io.Reader, error) { cmds.Text: func(res cmds.Response) (io.Reader, error) {
verbose, _, _ := res.Request().Option("v").Bool() verbose, _, _ := res.Request().Option("v").Bool()
changes := res.Output().([]*dagutils.Change) changes := res.Output().(*Changes)
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
for _, change := range changes { for _, change := range changes.Changes {
if verbose { if verbose {
switch change.Type { switch change.Type {
case dagutils.Add: case dagutils.Add: