mugit @ d1bac8e

···
        24
        24
         	Size   int64

      
        25
        25
         }

      
        26
        26
         

      
        27
        
        -func (g *Repo) makeNiceTree(t *object.Tree, parent string) []NiceTree {

      
        
        27
        +func (g *Repo) makeNiceTree(ctx context.Context, t *object.Tree, parent string) []NiceTree {

      
        28
        28
         	var nts []NiceTree

      
        29
        29
         

      
        30
        
        -	ctx, cancel := context.WithTimeout(context.TODO(), 2*time.Second)

      
        
        30
        +	ctx, cancel := context.WithTimeout(ctx, 2*time.Second)

      
        31
        31
         	defer cancel()

      
        32
        32
         

      
        33
        33
         	cms, err := g.lastCommitForFilesInTree(ctx, t, parent)

      ···
        50
        50
         	return nts

      
        51
        51
         }

      
        52
        52
         

      
        53
        
        -func (g *Repo) FileTree(path string) ([]NiceTree, error) {

      
        
        53
        +func (g *Repo) FileTree(ctx context.Context, path string) ([]NiceTree, error) {

      
        54
        54
         	c, err := g.r.CommitObject(g.h)

      
        55
        55
         	if err != nil {

      
        56
        56
         		return nil, fmt.Errorf("commit object: %w", err)

      ···
        63
        63
         

      
        64
        64
         	var files []NiceTree

      
        65
        65
         	if path == "" {

      
        66
        
        -		files = g.makeNiceTree(tree, path)

      
        
        66
        +		files = g.makeNiceTree(ctx, tree, path)

      
        67
        67
         	} else {

      
        68
        68
         		o, err := tree.FindEntry(path)

      
        69
        69
         		if err != nil {

      ···
        75
        75
         			if err != nil {

      
        76
        76
         				return nil, err

      
        77
        77
         			}

      
        78
        
        -			files = g.makeNiceTree(subtree, path)

      
        
        78
        +			files = g.makeNiceTree(ctx, subtree, path)

      
        79
        79
         		}

      
        80
        80
         	}

      
        81
        81
         

      

···
        137
        137
         		return

      
        138
        138
         	}

      
        139
        139
         

      
        140
        
        -	tree, err := repo.FileTree(treePath)

      
        
        140
        +	tree, err := repo.FileTree(r.Context(), treePath)

      
        141
        141
         	if err != nil {

      
        142
        142
         		h.write500(w, err)

      
        143
        143
         		return