mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 19:11:25 +01:00
bircni
299428bf10
Repository discovery preferred the current branch's upstream remote, which for a fork pull request is the pulls/<owner>/<repo> remote that pr checkout adds, so every later command targeted the fork. pr checkout now records the pull request number and base remote in branch.<name>.tea-pr and branch.<name>.tea-base-remote, discovery honors the recorded base remote, and it skips pulls/* head remotes. Signed-off-by: bircni <bircni@icloud.com>
56 lines
2.5 KiB
Go
56 lines
2.5 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package git
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type discoverRunner map[string]string
|
|
|
|
func (r discoverRunner) Output(_ context.Context, dir string, prompt bool, args ...string) (string, error) {
|
|
value, ok := r[strings.Join(args, " ")]
|
|
if dir != "/work" || prompt || !ok {
|
|
return "", errors.New("missing fake Git result")
|
|
}
|
|
return value, nil
|
|
}
|
|
|
|
func TestDiscoverRemote(t *testing.T) {
|
|
const head, tracking, base = "symbolic-ref --short HEAD", "config --get branch.main.remote", "config --get branch.main.tea-base-remote"
|
|
for _, test := range []struct {
|
|
name string
|
|
runner discoverRunner
|
|
preferred string
|
|
want string
|
|
wantErr error
|
|
}{
|
|
{name: "preferred", preferred: "fork", want: "fork"},
|
|
{name: "branch upstream", runner: discoverRunner{head: "main", tracking: "fork", "remote": "origin\nfork"}, want: "fork"},
|
|
{name: "branch upstream with slashes", runner: discoverRunner{head: "main", tracking: "team/fork", "remote": "origin\nteam/fork"}, want: "team/fork"},
|
|
{name: "pull head remote", runner: discoverRunner{head: "main", tracking: "pulls/bob/project", "remote": "origin\npulls/bob/project"}, want: "origin"},
|
|
{name: "recorded pull base", runner: discoverRunner{head: "main", tracking: "fork", base: "upstream", "remote": "origin\nupstream\nfork"}, want: "upstream"},
|
|
{name: "removed pull base", runner: discoverRunner{head: "main", tracking: "fork", base: "gone", "remote": "origin\nfork"}, want: "fork"},
|
|
{name: "local branch upstream", runner: discoverRunner{head: "main", tracking: ".", "remote": "origin\nfork"}, want: "origin"},
|
|
{name: "upstream remote", runner: discoverRunner{"remote": "origin\nupstream"}, want: "upstream"},
|
|
{name: "origin remote", runner: discoverRunner{"remote": "fork\norigin"}, want: "origin"},
|
|
{name: "sole remote", runner: discoverRunner{"remote": "fork"}, want: "fork"},
|
|
{name: "ambiguous", runner: discoverRunner{"remote": "one\ntwo"}, wantErr: ErrAmbiguousRemote},
|
|
{name: "no remotes", runner: discoverRunner{"remote": ""}, wantErr: ErrAmbiguousRemote},
|
|
} {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
remote, err := DiscoverRemote(context.Background(), test.runner, "/work", test.preferred)
|
|
require.ErrorIs(t, err, test.wantErr)
|
|
require.Equal(t, test.want, remote)
|
|
})
|
|
}
|
|
_, err := DiscoverRemote(context.Background(), discoverRunner{}, "/work", "")
|
|
require.Error(t, err)
|
|
}
|