workflows: don't sign commit

So we can get newer git-buildpackage

.github/workflows/cd.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   cd:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -26,3 +26,20 @@ jobs:
         with:
           token: ${{secrets.GITHUB_API_TOKEN}}
           formula: lazygit
+      - name: Checkout PPA repo
+        uses: actions/checkout@v2
+        with:
+          repository: dawidd6/lazygit-debian
+          token: ${{secrets.GITHUB_API_TOKEN}}
+          fetch-depth: 0
+      - name: Update PPA repo
+        run: |
+          version="$(echo "$GITHUB_REF" | sed 's@refs/tags/v@@')"
+          sudo apt install -y git-buildpackage
+          git fetch --tags https://github.com/$GITHUB_REPOSITORY
+          gbp import-ref -u "$version"
+          gbp dch -D xenial -N "$version"-1
+          git add debian/changelog
+          git commit -m "d/changelog: dch $version"
+          gbp tag
+          git push --tags origin master

docs/Config.md

@@ -111,6 +111,8 @@ Default path for the config file:
       diffingMenu: 'W'
       diffingMenu-alt: '<c-e>' # deprecated
       copyToClipboard: '<c-o>'
+      submitEditorText: '<enter>'
+      appendNewline: '<tab>'
     status:
       checkForUpdate: 'u'
       recentRepos: '<enter>'
@@ -156,6 +158,7 @@ Default path for the config file:
       tagCommit: 'T'
       checkoutCommit: '<space>'
       resetCherryPick: '<c-R>'
+      copyCommitMessageToClipboard: '<c-y>'
     stash:
       popStash: 'g'
     commitFiles:

pkg/commands/commits.go

@@ -22,7 +22,13 @@ func (c *GitCommand) ResetToCommit(sha string, strength string, options oscomman
 
 // Commit commits to git
 func (c *GitCommand) Commit(message string, flags string) (*exec.Cmd, error) {
-	command := fmt.Sprintf("git commit %s -m %s", flags, strconv.Quote(message))
+	splitMessage := strings.Split(message, "\n")
+	lineArgs := ""
+	for _, line := range splitMessage {
+		lineArgs += fmt.Sprintf(" -m %s", strconv.Quote(line))
+	}
+
+	command := fmt.Sprintf("git commit %s%s", flags, lineArgs)
 	if c.usingGpg() {
 		return c.OSCommand.ShellCommandFromString(command), nil
 	}

pkg/commands/remotes.go

@@ -1,6 +1,8 @@
 package commands
 
 import (
+	"fmt"
+
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 )
 
@@ -20,8 +22,9 @@ func (c *GitCommand) UpdateRemoteUrl(remoteName string, updatedUrl string) error
 	return c.OSCommand.RunCommand("git remote set-url %s %s", remoteName, updatedUrl)
 }
 
-func (c *GitCommand) DeleteRemoteBranch(remoteName string, branchName string) error {
-	return c.OSCommand.RunCommand("git push %s --delete %s", remoteName, branchName)
+func (c *GitCommand) DeleteRemoteBranch(remoteName string, branchName string, promptUserForCredential func(string) string) error {
+	command := fmt.Sprintf("git push %s --delete %s", remoteName, branchName)
+	return c.OSCommand.DetectUnamePass(command, promptUserForCredential)
 }
 
 // CheckRemoteBranchExists Returns remote branch

pkg/commands/tags.go

@@ -1,5 +1,7 @@
 package commands
 
+import "fmt"
+
 func (c *GitCommand) CreateLightweightTag(tagName string, commitSha string) error {
 	return c.OSCommand.RunCommand("git tag %s %s", tagName, commitSha)
 }
@@ -8,6 +10,7 @@ func (c *GitCommand) DeleteTag(tagName string) error {
 	return c.OSCommand.RunCommand("git tag -d %s", tagName)
 }
 
-func (c *GitCommand) PushTag(remoteName string, tagName string) error {
-	return c.OSCommand.RunCommand("git push %s %s", remoteName, tagName)
+func (c *GitCommand) PushTag(remoteName string, tagName string, promptUserForCredential func(string) string) error {
+	command := fmt.Sprintf("git push %s %s", remoteName, tagName)
+	return c.OSCommand.DetectUnamePass(command, promptUserForCredential)
 }

pkg/config/user_config.go

@@ -144,6 +144,8 @@ type KeybindingUniversalConfig struct {
 	DiffingMenu                  string `yaml:"diffingMenu"`
 	DiffingMenuAlt               string `yaml:"diffingMenu-alt"`
 	CopyToClipboard              string `yaml:"copyToClipboard"`
+	SubmitEditorText             string `yaml:"submitEditorText"`
+	AppendNewline                string `yaml:"appendNewline"`
 }
 
 type KeybindingStatusConfig struct {
@@ -180,24 +182,25 @@ type KeybindingBranchesConfig struct {
 }
 
 type KeybindingCommitsConfig struct {
-	SquashDown             string `yaml:"squashDown"`
-	RenameCommit           string `yaml:"renameCommit"`
-	RenameCommitWithEditor string `yaml:"renameCommitWithEditor"`
-	ViewResetOptions       string `yaml:"viewResetOptions"`
-	MarkCommitAsFixup      string `yaml:"markCommitAsFixup"`
-	CreateFixupCommit      string `yaml:"createFixupCommit"`
-	SquashAboveCommits     string `yaml:"squashAboveCommits"`
-	MoveDownCommit         string `yaml:"moveDownCommit"`
-	MoveUpCommit           string `yaml:"moveUpCommit"`
-	AmendToCommit          string `yaml:"amendToCommit"`
-	PickCommit             string `yaml:"pickCommit"`
-	RevertCommit           string `yaml:"revertCommit"`
-	CherryPickCopy         string `yaml:"cherryPickCopy"`
-	CherryPickCopyRange    string `yaml:"cherryPickCopyRange"`
-	PasteCommits           string `yaml:"pasteCommits"`
-	TagCommit              string `yaml:"tagCommit"`
-	CheckoutCommit         string `yaml:"checkoutCommit"`
-	ResetCherryPick        string `yaml:"resetCherryPick"`
+	SquashDown                   string `yaml:"squashDown"`
+	RenameCommit                 string `yaml:"renameCommit"`
+	RenameCommitWithEditor       string `yaml:"renameCommitWithEditor"`
+	ViewResetOptions             string `yaml:"viewResetOptions"`
+	MarkCommitAsFixup            string `yaml:"markCommitAsFixup"`
+	CreateFixupCommit            string `yaml:"createFixupCommit"`
+	SquashAboveCommits           string `yaml:"squashAboveCommits"`
+	MoveDownCommit               string `yaml:"moveDownCommit"`
+	MoveUpCommit                 string `yaml:"moveUpCommit"`
+	AmendToCommit                string `yaml:"amendToCommit"`
+	PickCommit                   string `yaml:"pickCommit"`
+	RevertCommit                 string `yaml:"revertCommit"`
+	CherryPickCopy               string `yaml:"cherryPickCopy"`
+	CherryPickCopyRange          string `yaml:"cherryPickCopyRange"`
+	PasteCommits                 string `yaml:"pasteCommits"`
+	TagCommit                    string `yaml:"tagCommit"`
+	CheckoutCommit               string `yaml:"checkoutCommit"`
+	ResetCherryPick              string `yaml:"resetCherryPick"`
+	CopyCommitMessageToClipboard string `yaml:"copyCommitMessageToClipboard"`
 }
 
 type KeybindingStashConfig struct {
@@ -359,6 +362,8 @@ func GetDefaultConfig() *UserConfig {
 				DiffingMenu:                  "W",
 				DiffingMenuAlt:               "<c-e>",
 				CopyToClipboard:              "<c-o>",
+				SubmitEditorText:             "<enter>",
+				AppendNewline:                "<tab>",
 			},
 			Status: KeybindingStatusConfig{
 				CheckForUpdate: "u",
@@ -390,24 +395,26 @@ func GetDefaultConfig() *UserConfig {
 				SetUpstream:            "u",
 				FetchRemote:            "f",
 			},
-			Commits: KeybindingCommitsConfig{SquashDown: "s",
-				RenameCommit:           "r",
-				RenameCommitWithEditor: "R",
-				ViewResetOptions:       "g",
-				MarkCommitAsFixup:      "f",
-				CreateFixupCommit:      "F",
-				SquashAboveCommits:     "S",
-				MoveDownCommit:         "<c-j>",
-				MoveUpCommit:           "<c-k>",
-				AmendToCommit:          "A",
-				PickCommit:             "p",
-				RevertCommit:           "t",
-				CherryPickCopy:         "c",
-				CherryPickCopyRange:    "C",
-				PasteCommits:           "v",
-				TagCommit:              "T",
-				CheckoutCommit:         "<space>",
-				ResetCherryPick:        "<c-R>",
+			Commits: KeybindingCommitsConfig{
+				SquashDown:                   "s",
+				RenameCommit:                 "r",
+				RenameCommitWithEditor:       "R",
+				ViewResetOptions:             "g",
+				MarkCommitAsFixup:            "f",
+				CreateFixupCommit:            "F",
+				SquashAboveCommits:           "S",
+				MoveDownCommit:               "<c-j>",
+				MoveUpCommit:                 "<c-k>",
+				AmendToCommit:                "A",
+				PickCommit:                   "p",
+				RevertCommit:                 "t",
+				CherryPickCopy:               "c",
+				CherryPickCopyRange:          "C",
+				PasteCommits:                 "v",
+				TagCommit:                    "T",
+				CheckoutCommit:               "<space>",
+				ResetCherryPick:              "<c-R>",
+				CopyCommitMessageToClipboard: "<c-y>",
 			},
 			Stash: KeybindingStashConfig{
 				PopStash: "g",

pkg/gui/arrangement.go

@@ -47,7 +47,7 @@ func (gui *Gui) getMidSectionWeights() (int, int) {
 	mainSectionWeight := int(1/sidePanelWidthRatio) - 1
 	sideSectionWeight := 1
 
-	if gui.isMainPanelSplit() {
+	if gui.splitMainPanelSideBySide() {
 		mainSectionWeight = 5 // need to shrink side panel to make way for main panels if side-by-side
 	}
 
@@ -108,6 +108,28 @@ func (gui *Gui) infoSectionChildren(informationStr string, appStatus string) []*
 	return result
 }
 
+func (gui *Gui) splitMainPanelSideBySide() bool {
+	if !gui.isMainPanelSplit() {
+		return false
+	}
+
+	mainPanelSplitMode := gui.Config.GetUserConfig().Gui.MainPanelSplitMode
+	width, height := gui.g.Size()
+
+	switch mainPanelSplitMode {
+	case "vertical":
+		return false
+	case "horizontal":
+		return true
+	default:
+		if width < 200 && height > 30 { // 2 80 character width panels + 40 width for side panel
+			return false
+		} else {
+			return true
+		}
+	}
+}
+
 func (gui *Gui) getWindowDimensions(informationStr string, appStatus string) map[string]boxlayout.Dimensions {
 	width, height := gui.g.Size()
 
@@ -119,6 +141,11 @@ func (gui *Gui) getWindowDimensions(informationStr string, appStatus string) map
 		sidePanelsDirection = boxlayout.ROW
 	}
 
+	mainPanelsDirection := boxlayout.ROW
+	if gui.splitMainPanelSideBySide() {
+		mainPanelsDirection = boxlayout.COLUMN
+	}
+
 	root := &boxlayout.Box{
 		Direction: boxlayout.ROW,
 		Children: []*boxlayout.Box{
@@ -132,23 +159,7 @@ func (gui *Gui) getWindowDimensions(informationStr string, appStatus string) map
 						ConditionalChildren: gui.sidePanelChildren,
 					},
 					{
-						ConditionalDirection: func(width int, height int) int {
-							mainPanelSplitMode := gui.Config.GetUserConfig().Gui.MainPanelSplitMode
-
-							switch mainPanelSplitMode {
-							case "vertical":
-								return boxlayout.ROW
-							case "horizontal":
-								return boxlayout.COLUMN
-							default:
-								if width < 160 && height > 30 { // 2 80 character width panels
-									return boxlayout.ROW
-								} else {
-									return boxlayout.COLUMN
-								}
-							}
-						},
-						Direction: boxlayout.COLUMN,
+						Direction: mainPanelsDirection,
 						Weight:    mainSectionWeight,
 						Children:  gui.mainSectionChildren(),
 					},

pkg/gui/commit_message_panel.go

@@ -83,6 +83,11 @@ func (gui *Gui) RenderCommitLength() {
 // we've just copy+pasted the editor from gocui to here so that we can also re-
 // render the commit message length on each keypress
 func (gui *Gui) commitMessageEditor(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
+	newlineKey, ok := gui.getKey(gui.Config.GetUserConfig().Keybinding.Universal.AppendNewline).(gocui.Key)
+	if !ok {
+		newlineKey = gocui.KeyTab
+	}
+
 	switch {
 	case key == gocui.KeyBackspace || key == gocui.KeyBackspace2:
 		v.EditDelete(true)
@@ -96,7 +101,7 @@ func (gui *Gui) commitMessageEditor(v *gocui.View, key gocui.Key, ch rune, mod g
 		v.MoveCursor(-1, 0, false)
 	case key == gocui.KeyArrowRight:
 		v.MoveCursor(1, 0, false)
-	case key == gocui.KeyTab:
+	case key == newlineKey:
 		v.EditNewLine()
 	case key == gocui.KeySpace:
 		v.EditWrite(' ')

pkg/gui/commits_panel.go

@@ -591,3 +591,16 @@ func (gui *Gui) handleGotoBottomForCommitsPanel(g *gocui.Gui, v *gocui.View) err
 
 	return nil
 }
+
+func (gui *Gui) handleCopySelectedCommitMessageToClipboard() error {
+	commit := gui.getSelectedLocalCommit()
+	if commit == nil {
+		return nil
+	}
+
+	message, err := gui.GitCommand.GetCommitMessage(commit.Sha)
+	if err != nil {
+		return gui.surfaceError(err)
+	}
+	return gui.OSCommand.CopyToClipboard(message)
+}

pkg/gui/keybindings.go

@@ -821,6 +821,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.wrappedHandler(gui.exitCherryPickingMode),
 			Description: gui.Tr.LcResetCherryPick,
 		},
+		{
+			ViewName:    "commits",
+			Contexts:    []string{BRANCH_COMMITS_CONTEXT_KEY},
+			Key:         gui.getKey(config.Commits.CopyCommitMessageToClipboard),
+			Handler:     gui.wrappedHandler(gui.handleCopySelectedCommitMessageToClipboard),
+			Description: gui.Tr.LcCopyCommitMessageToClipboard,
+		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{REFLOG_COMMITS_CONTEXT_KEY},
@@ -964,7 +971,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 		},
 		{
 			ViewName: "commitMessage",
-			Key:      gui.getKey(config.Universal.Confirm),
+			Key:      gui.getKey(config.Universal.SubmitEditorText),
 			Modifier: gocui.ModNone,
 			Handler:  gui.handleCommitConfirm,
 		},

pkg/gui/remote_branches_panel.go

@@ -60,9 +60,8 @@ func (gui *Gui) handleDeleteRemoteBranch(g *gocui.Gui, v *gocui.View) error {
 		prompt: message,
 		handleConfirm: func() error {
 			return gui.WithWaitingStatus(gui.Tr.DeletingStatus, func() error {
-				if err := gui.GitCommand.DeleteRemoteBranch(remoteBranch.RemoteName, remoteBranch.Name); err != nil {
-					return err
-				}
+				err := gui.GitCommand.DeleteRemoteBranch(remoteBranch.RemoteName, remoteBranch.Name, gui.promptUserForCredential)
+				gui.handleCredentialsPopup(err)
 
 				return gui.refreshSidePanels(refreshOptions{scope: []int{BRANCHES, REMOTES}})
 			})

pkg/gui/remotes_panel.go

@@ -166,7 +166,6 @@ func (gui *Gui) handleFetchRemote(g *gocui.Gui, v *gocui.View) error {
 		gui.Mutexes.FetchMutex.Lock()
 		defer gui.Mutexes.FetchMutex.Unlock()
 
-		// TODO: test this
 		err := gui.GitCommand.FetchRemote(remote.Name, gui.promptUserForCredential)
 		gui.handleCredentialsPopup(err)
 

pkg/gui/tags_panel.go

@@ -98,10 +98,12 @@ func (gui *Gui) handlePushTag(g *gocui.Gui, v *gocui.View) error {
 	)
 
 	return gui.prompt(title, "origin", func(response string) error {
-		if err := gui.GitCommand.PushTag(response, tag.Name); err != nil {
-			return gui.surfaceError(err)
-		}
-		return nil
+		return gui.WithWaitingStatus(gui.Tr.PushingTagStatus, func() error {
+			err := gui.GitCommand.PushTag(response, tag.Name, gui.promptUserForCredential)
+			gui.handleCredentialsPopup(err)
+
+			return nil
+		})
 	})
 }
 

pkg/i18n/dutch.go

@@ -371,6 +371,7 @@ func dutchTranslationSet() TranslationSet {
 		LcOpenDiffingMenu:                   "open diff menu",
 		LcShowingGitDiff:                    "laat output zien voor:",
 		LcCopyCommitShaToClipboard:          "copieer commit SHA naar clipboard",
+		LcCopyCommitMessageToClipboard:      "copieer commit bericht naar clipboard",
 		LcCopyBranchNameToClipboard:         "copieer branch name naar clipboard",
 		LcCopyFileNameToClipboard:           "kopieer de bestandsnaam naar het klembord",
 		LcCopyCommitFileNameToClipboard:     "kopieer de vastgelegde bestandsnaam naar het klembord",

pkg/i18n/english.go

@@ -381,6 +381,7 @@ type TranslationSet struct {
 	LcOpenDiffingMenu                   string
 	LcShowingGitDiff                    string
 	LcCopyCommitShaToClipboard          string
+	LcCopyCommitMessageToClipboard      string
 	LcCopyBranchNameToClipboard         string
 	LcCopyFileNameToClipboard           string
 	LcCopyCommitFileNameToClipboard     string
@@ -427,6 +428,7 @@ type TranslationSet struct {
 	SubCommitsTitle                     string
 	SubmodulesTitle                     string
 	NavigationTitle                     string
+	PushingTagStatus                    string
 }
 
 const englishReleaseNotes = `## lazygit 0.23.2 Release Notes
@@ -878,6 +880,7 @@ func englishTranslationSet() TranslationSet {
 		LcOpenDiffingMenu:                   "open diff menu",
 		LcShowingGitDiff:                    "showing output for:",
 		LcCopyCommitShaToClipboard:          "copy commit SHA to clipboard",
+		LcCopyCommitMessageToClipboard:      "copy commit message to clipboard",
 		LcCopyBranchNameToClipboard:         "copy branch name to clipboard",
 		LcCopyFileNameToClipboard:           "copy the file name to the clipboard",
 		LcCopyCommitFileNameToClipboard:     "copy the committed file name to the clipboard",
@@ -924,5 +927,6 @@ func englishTranslationSet() TranslationSet {
 		SubCommitsTitle:                     "Sub-commits",
 		SubmodulesTitle:                     "Submodules",
 		NavigationTitle:                     "List Panel Navigation",
+		PushingTagStatus:                    "pushing tag",
 	}
 }

pkg/utils/utils.go

@@ -102,8 +102,8 @@ func Loader() string {
 // ResolvePlaceholderString populates a template with values
 func ResolvePlaceholderString(str string, arguments map[string]string) string {
 	for key, value := range arguments {
-		str = strings.ReplaceAll(str, "{{"+key+"}}", value)
-		str = strings.ReplaceAll(str, "{{."+key+"}}", value)
+		str = strings.Replace(str, "{{"+key+"}}", value, -1)
+		str = strings.Replace(str, "{{."+key+"}}", value, -1)
 	}
 	return str
 }