From 4d258bd98144eed7c9e955de6f2b8bb6379aa92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= <luka.markusic@microblink.com>
Date: Wed, 31 May 2023 10:05:43 +0200
Subject: [PATCH] Use UpstreamBranch for opening pull requests

---
 pkg/gui/controllers/branches_controller.go    | 14 ++++++++---
 pkg/i18n/english.go                           |  2 ++
 .../branch/open_pull_request_no_upstream.go   | 25 +++++++++++++++++++
 pkg/integration/tests/test_list.go            |  1 +
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 pkg/integration/tests/branch/open_pull_request_no_upstream.go

diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go
index 1dc1f77e8..dc6f19398 100644
--- a/pkg/gui/controllers/branches_controller.go
+++ b/pkg/gui/controllers/branches_controller.go
@@ -296,7 +296,10 @@ func (self *BranchesController) promptToCheckoutWorktree(worktree *models.Worktr
 }
 
 func (self *BranchesController) handleCreatePullRequest(selectedBranch *models.Branch) error {
-	return self.createPullRequest(selectedBranch.Name, "")
+	if !selectedBranch.IsTrackingRemote() {
+		return self.c.ErrorMsg(self.c.Tr.PullRequestNoUpstream)
+	}
+	return self.createPullRequest(selectedBranch.UpstreamBranch, "")
 }
 
 func (self *BranchesController) handleCreatePullRequestMenu(selectedBranch *models.Branch) error {
@@ -655,7 +658,7 @@ func (self *BranchesController) createPullRequestMenu(selectedBranch *models.Bra
 			{
 				LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.DefaultBranch),
 				OnPress: func() error {
-					return self.createPullRequest(branch.Name, "")
+					return self.handleCreatePullRequest(branch)
 				},
 			},
 			{
@@ -663,7 +666,7 @@ func (self *BranchesController) createPullRequestMenu(selectedBranch *models.Bra
 				OnPress: func() error {
 					return self.c.Prompt(types.PromptOpts{
 						Title:               branch.Name + " →",
-						FindSuggestionsFunc: self.c.Helpers().Suggestions.GetBranchNameSuggestionsFunc(),
+						FindSuggestionsFunc: self.c.Helpers().Suggestions.GetRemoteBranchesSuggestionsFunc("/"),
 						HandleConfirm: func(targetBranchName string) error {
 							return self.createPullRequest(branch.Name, targetBranchName)
 						},
@@ -678,7 +681,10 @@ func (self *BranchesController) createPullRequestMenu(selectedBranch *models.Bra
 			&types.MenuItem{
 				LabelColumns: fromToLabelColumns(checkedOutBranch.Name, selectedBranch.Name),
 				OnPress: func() error {
-					return self.createPullRequest(checkedOutBranch.Name, selectedBranch.Name)
+					if !checkedOutBranch.IsTrackingRemote() || !selectedBranch.IsTrackingRemote() {
+						return self.c.ErrorMsg(self.c.Tr.PullRequestNoUpstream)
+					}
+					return self.createPullRequest(checkedOutBranch.UpstreamBranch, selectedBranch.UpstreamBranch)
 				},
 			},
 		)
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 09577c210..a6927e027 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -224,6 +224,7 @@ type TranslationSet struct {
 	FwdNoUpstream                       string
 	FwdNoLocalUpstream                  string
 	FwdCommitsToPush                    string
+	PullRequestNoUpstream               string
 	ErrorOccurred                       string
 	NoRoom                              string
 	YouAreHere                          string
@@ -1019,6 +1020,7 @@ func EnglishTranslationSet() TranslationSet {
 		FwdNoUpstream:                       "Cannot fast-forward a branch with no upstream",
 		FwdNoLocalUpstream:                  "Cannot fast-forward a branch whose remote is not registered locally",
 		FwdCommitsToPush:                    "Cannot fast-forward a branch with commits to push",
+		PullRequestNoUpstream:               "Cannot open a pull request for a branch with no upstream",
 		ErrorOccurred:                       "An error occurred! Please create an issue at",
 		NoRoom:                              "Not enough room",
 		YouAreHere:                          "YOU ARE HERE",
diff --git a/pkg/integration/tests/branch/open_pull_request_no_upstream.go b/pkg/integration/tests/branch/open_pull_request_no_upstream.go
new file mode 100644
index 000000000..877f0bdde
--- /dev/null
+++ b/pkg/integration/tests/branch/open_pull_request_no_upstream.go
@@ -0,0 +1,25 @@
+package branch
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var OpenPullRequestNoUpstream = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Open up a pull request with a missing upstream branch",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo:    func(shell *Shell) {},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().
+			Branches().
+			Focus().
+			Press(keys.Branches.CreatePullRequest)
+
+		t.ExpectPopup().Alert().
+			Title(Equals("Error")).
+			Content(Contains("Cannot open a pull request for a branch with no upstream")).
+			Confirm()
+	},
+})
diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go
index b820555f2..d22d12135 100644
--- a/pkg/integration/tests/test_list.go
+++ b/pkg/integration/tests/test_list.go
@@ -39,6 +39,7 @@ var tests = []*components.IntegrationTest{
 	branch.CreateTag,
 	branch.Delete,
 	branch.DetachedHead,
+	branch.OpenPullRequestNoUpstream,
 	branch.OpenWithCliArg,
 	branch.Rebase,
 	branch.RebaseAbortOnConflict,