From cda8fa2c2a3c34c4d4642bb1913f24edd437b32a Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 12 May 2020 13:40:37 -0400 Subject: [PATCH] api: remove obsolete repository.tree path --- api/graph/generated/generated.go | 101 ------------------------------- api/graph/schema.graphqls | 5 -- api/graph/schema.resolvers.go | 6 +- 3 files changed, 1 insertion(+), 111 deletions(-) diff --git a/api/graph/generated/generated.go b/api/graph/generated/generated.go index cdf9516..aa81861 100644 --- a/api/graph/generated/generated.go +++ b/api/graph/generated/generated.go @@ -136,7 +136,6 @@ type ComplexityRoot struct { Path func(childComplexity int, revspec *string, path string) int References func(childComplexity int, cursor *model.Cursor) int RevparseSingle func(childComplexity int, revspec string) int - Tree func(childComplexity int, revspec *string, path *string) int Updated func(childComplexity int) int UpstreamURL func(childComplexity int) int Visibility func(childComplexity int) int @@ -239,7 +238,6 @@ type RepositoryResolver interface { Objects(ctx context.Context, obj *model.Repository, ids []*string) ([]model.Object, error) Log(ctx context.Context, obj *model.Repository, cursor *model.Cursor) ([]*model.Commit, error) - Tree(ctx context.Context, obj *model.Repository, revspec *string, path *string) (*model.Tree, error) Path(ctx context.Context, obj *model.Repository, revspec *string, path string) (*model.TreeEntry, error) RevparseSingle(ctx context.Context, obj *model.Repository, revspec string) (model.Object, error) } @@ -768,18 +766,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.Repository.RevparseSingle(childComplexity, args["revspec"].(string)), true - case "Repository.tree": - if e.complexity.Repository.Tree == nil { - break - } - - args, err := ec.field_Repository_tree_args(context.TODO(), rawArgs) - if err != nil { - return 0, false - } - - return e.complexity.Repository.Tree(childComplexity, args["revspec"].(*string), args["path"].(*string)), true - case "Repository.updated": if e.complexity.Repository.Updated == nil { break @@ -1275,11 +1261,6 @@ type Repository { # the revspec to begin logging from. log(cursor: Cursor): [Commit]! - # Returns the tree for a given revspec - # - # path: optional path to the tree to retrieve - tree(revspec: String = "HEAD", path: String): Tree - # # Returns a tree entry for a given path and revspec path(revspec: String = "HEAD", path: String!): TreeEntry @@ -1850,28 +1831,6 @@ func (ec *executionContext) field_Repository_revparse_single_args(ctx context.Co return args, nil } -func (ec *executionContext) field_Repository_tree_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) { - var err error - args := map[string]interface{}{} - var arg0 *string - if tmp, ok := rawArgs["revspec"]; ok { - arg0, err = ec.unmarshalOString2ᚖstring(ctx, tmp) - if err != nil { - return nil, err - } - } - args["revspec"] = arg0 - var arg1 *string - if tmp, ok := rawArgs["path"]; ok { - arg1, err = ec.unmarshalOString2ᚖstring(ctx, tmp) - if err != nil { - return nil, err - } - } - args["path"] = arg1 - return args, nil -} - func (ec *executionContext) field_Tree_entries_args(ctx context.Context, rawArgs map[string]interface{}) (map[string]interface{}, error) { var err error args := map[string]interface{}{} @@ -4137,44 +4096,6 @@ func (ec *executionContext) _Repository_log(ctx context.Context, field graphql.C return ec.marshalNCommit2ᚕᚖgitᚗsrᚗhtᚋאsircmpwnᚋgitᚗsrᚗhtᚋapiᚋgraphᚋmodelᚐCommit(ctx, field.Selections, res) } -func (ec *executionContext) _Repository_tree(ctx context.Context, field graphql.CollectedField, obj *model.Repository) (ret graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - ret = graphql.Null - } - }() - fc := &graphql.FieldContext{ - Object: "Repository", - Field: field, - Args: nil, - IsMethod: true, - } - - ctx = graphql.WithFieldContext(ctx, fc) - rawArgs := field.ArgumentMap(ec.Variables) - args, err := ec.field_Repository_tree_args(ctx, rawArgs) - if err != nil { - ec.Error(ctx, err) - return graphql.Null - } - fc.Args = args - resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { - ctx = rctx // use context from middleware stack in children - return ec.resolvers.Repository().Tree(rctx, obj, args["revspec"].(*string), args["path"].(*string)) - }) - if err != nil { - ec.Error(ctx, err) - return graphql.Null - } - if resTmp == nil { - return graphql.Null - } - res := resTmp.(*model.Tree) - fc.Result = res - return ec.marshalOTree2ᚖgitᚗsrᚗhtᚋאsircmpwnᚋgitᚗsrᚗhtᚋapiᚋgraphᚋmodelᚐTree(ctx, field.Selections, res) -} - func (ec *executionContext) _Repository_path(ctx context.Context, field graphql.CollectedField, obj *model.Repository) (ret graphql.Marshaler) { defer func() { if r := recover(); r != nil { @@ -7491,17 +7412,6 @@ func (ec *executionContext) _Repository(ctx context.Context, sel ast.SelectionSe } return res }) - case "tree": - field := field - out.Concurrently(i, func() (res graphql.Marshaler) { - defer func() { - if r := recover(); r != nil { - ec.Error(ctx, ec.Recover(ctx, r)) - } - }() - res = ec._Repository_tree(ctx, field, obj) - return res - }) case "path": field := field out.Concurrently(i, func() (res graphql.Marshaler) { @@ -9182,17 +9092,6 @@ func (ec *executionContext) marshalOTime2ᚖtimeᚐTime(ctx context.Context, sel return ec.marshalOTime2timeᚐTime(ctx, sel, *v) } -func (ec *executionContext) marshalOTree2gitᚗsrᚗhtᚋאsircmpwnᚋgitᚗsrᚗhtᚋapiᚋgraphᚋmodelᚐTree(ctx context.Context, sel ast.SelectionSet, v model.Tree) graphql.Marshaler { - return ec._Tree(ctx, sel, &v) -} - -func (ec *executionContext) marshalOTree2ᚖgitᚗsrᚗhtᚋאsircmpwnᚋgitᚗsrᚗhtᚋapiᚋgraphᚋmodelᚐTree(ctx context.Context, sel ast.SelectionSet, v *model.Tree) graphql.Marshaler { - if v == nil { - return graphql.Null - } - return ec._Tree(ctx, sel, v) -} - func (ec *executionContext) marshalOTreeEntry2gitᚗsrᚗhtᚋאsircmpwnᚋgitᚗsrᚗhtᚋapiᚋgraphᚋmodelᚐTreeEntry(ctx context.Context, sel ast.SelectionSet, v model.TreeEntry) graphql.Marshaler { return ec._TreeEntry(ctx, sel, &v) } diff --git a/api/graph/schema.graphqls b/api/graph/schema.graphqls index e1c2fc8..5f8a25f 100644 --- a/api/graph/schema.graphqls +++ b/api/graph/schema.graphqls @@ -99,11 +99,6 @@ type Repository { # the revspec to begin logging from. log(cursor: Cursor): [Commit]! - # Returns the tree for a given revspec - # - # path: optional path to the tree to retrieve - tree(revspec: String = "HEAD", path: String): Tree - # # Returns a tree entry for a given path and revspec path(revspec: String = "HEAD", path: String!): TreeEntry diff --git a/api/graph/schema.resolvers.go b/api/graph/schema.resolvers.go index cbabfdb..6edd463 100644 --- a/api/graph/schema.resolvers.go +++ b/api/graph/schema.resolvers.go @@ -207,10 +207,6 @@ func (r *repositoryResolver) Log(ctx context.Context, obj *model.Repository, cur panic(fmt.Errorf("not implemented")) } -func (r *repositoryResolver) Tree(ctx context.Context, obj *model.Repository, revspec *string, path *string) (*model.Tree, error) { - panic(fmt.Errorf("not implemented")) -} - func (r *repositoryResolver) Path(ctx context.Context, obj *model.Repository, revspec *string, path string) (*model.TreeEntry, error) { rev := plumbing.Revision("HEAD") if revspec != nil { @@ -237,6 +233,7 @@ func (r *repositoryResolver) Path(ctx context.Context, obj *model.Repository, re } else { tree = model.TreeFromObject(obj.Repo(), treeObj) } + // TODO: Cursor return tree.Entry(path), nil } @@ -250,7 +247,6 @@ func (r *repositoryResolver) RevparseSingle(ctx context.Context, obj *model.Repo return nil, fmt.Errorf("No such object") } return model.LookupObject(obj.Repo(), *hash) - } func (r *treeResolver) Entries(ctx context.Context, obj *model.Tree, cursor *model.Cursor) ([]*model.TreeEntry, error) { -- 2.38.4