fixup! feat: add fork remote command

Add integration test. Requires extending replaceForkUsername to support the
local relative paths we use for remotes in integration tests.

Author: stefanhaller

pkg/gui/controllers/remotes_controller.go

@@ -216,13 +216,19 @@ func (self *RemotesController) add() error {
 // 1. SCP-like SSH: git@host:owner[/subgroups]/repo(.git)
 // 2. SSH URL style: ssh://user@host[:port]/owner[/subgroups]/repo(.git)
 // 3. HTTPS: https://host/owner[/subgroups]/repo(.git)
-var urlRegex = regexp.MustCompile(`^(git@[^:]+:|ssh://[^/]+/|https?://[^/]+/)([^/]+(?:/[^/]+)*)/([^/]+?)(\.git)?$`)
+// 4. Only for integration tests: ../repo_name
+var (
+	urlRegex                = regexp.MustCompile(`^(git@[^:]+:|ssh://[^/]+/|https?://[^/]+/)([^/]+(?:/[^/]+)*)/([^/]+?)(\.git)?$`)
+	integrationTestUrlRegex = regexp.MustCompile(`^\.\./.+$`)
+)
 
 // Rewrites a Git remote URL to use the given fork username,
 // keeping the repo name and host intact. Supports SCP-like SSH, SSH URL style, and HTTPS.
-func replaceForkUsername(originUrl, forkUsername string) (string, error) {
+func replaceForkUsername(originUrl, forkUsername string, isIntegrationTest bool) (string, error) {
 	if urlRegex.MatchString(originUrl) {
 		return urlRegex.ReplaceAllString(originUrl, "${1}"+forkUsername+"/$3$4"), nil
+	} else if isIntegrationTest && integrationTestUrlRegex.MatchString(originUrl) {
+		return "../" + forkUsername, nil
 	}
 
 	return "", fmt.Errorf("unsupported or invalid remote URL: %s", originUrl)
@@ -261,7 +267,7 @@ func (self *RemotesController) addFork() error {
 				branchToCheckout = parts[1]
 			}
 			originUrl := origin.Urls[0]
-			remoteUrl, err := replaceForkUsername(originUrl, forkUsername)
+			remoteUrl, err := replaceForkUsername(originUrl, forkUsername, self.c.RunningIntegrationTest())
 			if err != nil {
 				return err
 			}

pkg/gui/controllers/remotes_controller_test.go

@@ -53,7 +53,7 @@ func TestReplaceForkUsername_SSH_OK(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			got, err := replaceForkUsername(c.in, c.forkUser)
+			got, err := replaceForkUsername(c.in, c.forkUser, false)
 			assert.NoError(t, err)
 			assert.Equal(t, c.expected, got)
 		})
@@ -95,13 +95,19 @@ func TestReplaceForkUsername_HTTPS_OK(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			got, err := replaceForkUsername(c.in, c.forkUser)
+			got, err := replaceForkUsername(c.in, c.forkUser, false)
 			assert.NoError(t, err)
 			assert.Equal(t, c.expected, got)
 		})
 	}
 }
 
+func TestReplaceForkUsername_IntegrationTest_OK(t *testing.T) {
+	got, err := replaceForkUsername("../origin", "bob", true)
+	assert.NoError(t, err)
+	assert.Equal(t, "../bob", got)
+}
+
 func TestReplaceForkUsername_Errors(t *testing.T) {
 	cases := []struct {
 		name     string
@@ -143,11 +149,16 @@ func TestReplaceForkUsername_Errors(t *testing.T) {
 			in:       "",
 			forkUser: "x",
 		},
+		{
+			name:     "integration test URL outside of integration test",
+			in:       "../origin",
+			forkUser: "x",
+		},
 	}
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			_, err := replaceForkUsername(c.in, c.forkUser)
+			_, err := replaceForkUsername(c.in, c.forkUser, false)
 			assert.EqualError(t, err, "unsupported or invalid remote URL: "+c.in)
 		})
 	}

pkg/integration/components/shell.go

@@ -392,6 +392,12 @@ func (self *Shell) SetBranchUpstream(branch string, upstream string) *Shell {
 	return self
 }
 
+func (self *Shell) RemoveBranch(branch string) *Shell {
+	self.RunCommand([]string{"git", "branch", "-d", branch})
+
+	return self
+}
+
 func (self *Shell) RemoveRemoteBranch(remoteName string, branch string) *Shell {
 	self.RunCommand([]string{"git", "-C", "../" + remoteName, "branch", "-d", branch})
 

pkg/integration/tests/remote/add_fork_remote.go

@@ -0,0 +1,47 @@
+package remote
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var AddForkRemote = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Use the 'Add fork remote' command to add a fork remote and check out a branch from it",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("commit")
+		shell.CloneIntoRemote("origin")
+		shell.NewBranch("feature")
+		shell.Clone("fork")
+		shell.Checkout("master")
+		shell.RemoveBranch("feature")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Remotes().
+			Focus().
+			Lines(
+				Contains("origin").IsSelected(),
+			).
+			Press(keys.Branches.AddForkRemote)
+
+		t.ExpectPopup().Prompt().
+			Title(Equals("Fork owner (username/org). Use username:branch to check out a branch")).
+			Type("fork:feature").
+			Confirm()
+
+		t.Views().Remotes().
+			Lines(
+				Contains("origin"),
+				Contains("fork").IsSelected(),
+			)
+
+		t.Views().Branches().
+			IsFocused().
+			Lines(
+				Contains("feature ✓"),
+				Contains("master"),
+			)
+	},
+})

pkg/integration/tests/test_list.go

@@ -21,6 +21,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/misc"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/patch_building"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/reflog"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/remote"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/shell_commands"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/staging"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/stash"
@@ -351,6 +352,7 @@ var tests = []*components.IntegrationTest{
 	reflog.DoNotShowBranchMarkersInReflogSubcommits,
 	reflog.Patch,
 	reflog.Reset,
+	remote.AddForkRemote,
 	shell_commands.BasicShellCommand,
 	shell_commands.ComplexShellCommand,
 	shell_commands.DeleteFromHistory,