Merge pull request #2421 from Ryooooooga/tag-on-branch

docs/Config.md

@@ -203,6 +203,7 @@ keybinding:
     mergeIntoCurrentBranch: 'M'
     viewGitFlowOptions: 'i'
     fastForward: 'f' # fast-forward this branch from its upstream
+    createTag: 'T'
     pushTag: 'P'
     setUpstream: 'u' # set as upstream of checked-out branch
     fetchRemote: 'f'

docs/keybindings/Keybindings_en.md

@@ -131,6 +131,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>r</kbd>: rebase checked-out branch onto this branch
   <kbd>M</kbd>: merge into currently checked out branch
   <kbd>f</kbd>: fast-forward this branch from its upstream
+  <kbd>T</kbd>: create tag
   <kbd>g</kbd>: view reset options
   <kbd>R</kbd>: rename branch
   <kbd>u</kbd>: set/unset upstream

docs/keybindings/Keybindings_ja.md

@@ -191,6 +191,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>r</kbd>: rebase checked-out branch onto this branch
   <kbd>M</kbd>: 現在のブランチにマージ
   <kbd>f</kbd>: fast-forward this branch from its upstream
+  <kbd>T</kbd>: タグを作成
   <kbd>g</kbd>: view reset options
   <kbd>R</kbd>: ブランチ名を変更
   <kbd>u</kbd>: set/unset upstream

docs/keybindings/Keybindings_ko.md

@@ -158,6 +158,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스
   <kbd>M</kbd>: 현재 브랜치에 병합
   <kbd>f</kbd>: fast-forward this branch from its upstream
+  <kbd>T</kbd>: 태그를 생성
   <kbd>g</kbd>: view reset options
   <kbd>R</kbd>: 브랜치 이름 변경
   <kbd>u</kbd>: set/unset upstream

docs/keybindings/Keybindings_nl.md

@@ -84,6 +84,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>r</kbd>: rebase branch
   <kbd>M</kbd>: merge in met huidige checked out branch
   <kbd>f</kbd>: fast-forward deze branch vanaf zijn upstream
+  <kbd>T</kbd>: creëer tag
   <kbd>g</kbd>: bekijk reset opties
   <kbd>R</kbd>: hernoem branch
   <kbd>u</kbd>: set/unset upstream

docs/keybindings/Keybindings_pl.md

@@ -91,6 +91,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>r</kbd>: zmiana bazy gałęzi
   <kbd>M</kbd>: scal do obecnej gałęzi
   <kbd>f</kbd>: fast-forward this branch from its upstream
+  <kbd>T</kbd>: create tag
   <kbd>g</kbd>: wyświetl opcje resetu
   <kbd>R</kbd>: rename branch
   <kbd>u</kbd>: set/unset upstream

docs/keybindings/Keybindings_zh.md

@@ -73,6 +73,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
   <kbd>r</kbd>: 将已检出的分支变基到该分支
   <kbd>M</kbd>: 合并到当前检出的分支
   <kbd>f</kbd>: 从上游快进此分支
+  <kbd>T</kbd>: 创建标签
   <kbd>g</kbd>: 查看重置选项
   <kbd>R</kbd>: 重命名分支
   <kbd>u</kbd>: set/unset upstream

pkg/commands/git_commands/tag.go

@@ -14,12 +14,20 @@ func NewTagCommands(gitCommon *GitCommon) *TagCommands {
 	}
 }
 
-func (self *TagCommands) CreateLightweight(tagName string, commitSha string) error {
-	return self.cmd.New(fmt.Sprintf("git tag -- %s %s", self.cmd.Quote(tagName), commitSha)).Run()
+func (self *TagCommands) CreateLightweight(tagName string, ref string) error {
+	if len(ref) > 0 {
+		return self.cmd.New(fmt.Sprintf("git tag -- %s %s", self.cmd.Quote(tagName), self.cmd.Quote(ref))).Run()
+	} else {
+		return self.cmd.New(fmt.Sprintf("git tag -- %s", self.cmd.Quote(tagName))).Run()
+	}
 }
 
-func (self *TagCommands) CreateAnnotated(tagName, commitSha, msg string) error {
-	return self.cmd.New(fmt.Sprintf("git tag %s %s -m %s", tagName, commitSha, self.cmd.Quote(msg))).Run()
+func (self *TagCommands) CreateAnnotated(tagName, ref, msg string) error {
+	if len(ref) > 0 {
+		return self.cmd.New(fmt.Sprintf("git tag %s %s -m %s", self.cmd.Quote(tagName), self.cmd.Quote(ref), self.cmd.Quote(msg))).Run()
+	} else {
+		return self.cmd.New(fmt.Sprintf("git tag %s -m %s", self.cmd.Quote(tagName), self.cmd.Quote(msg))).Run()
+	}
 }
 
 func (self *TagCommands) Delete(tagName string) error {

pkg/config/user_config.go

@@ -235,6 +235,7 @@ type KeybindingBranchesConfig struct {
 	MergeIntoCurrentBranch string `yaml:"mergeIntoCurrentBranch"`
 	ViewGitFlowOptions     string `yaml:"viewGitFlowOptions"`
 	FastForward            string `yaml:"fastForward"`
+	CreateTag              string `yaml:"createTag"`
 	PushTag                string `yaml:"pushTag"`
 	SetUpstream            string `yaml:"setUpstream"`
 	FetchRemote            string `yaml:"fetchRemote"`
@@ -521,6 +522,7 @@ func GetDefaultConfig() *UserConfig {
 				MergeIntoCurrentBranch: "M",
 				ViewGitFlowOptions:     "i",
 				FastForward:            "f",
+				CreateTag:              "T",
 				PushTag:                "P",
 				SetUpstream:            "u",
 				FetchRemote:            "f",

pkg/gui/controllers/branches_controller.go

@@ -86,6 +86,11 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
 			Handler:     self.checkSelectedAndReal(self.fastForward),
 			Description: self.c.Tr.FastForward,
 		},
+		{
+			Key:         opts.GetKey(opts.Config.Branches.CreateTag),
+			Handler:     self.checkSelected(self.createTag),
+			Description: self.c.Tr.LcCreateTag,
+		},
 		{
 			Key:         opts.GetKey(opts.Config.Commits.ViewResetOptions),
 			Handler:     self.checkSelected(self.createResetMenu),
@@ -363,6 +368,10 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
 	})
 }
 
+func (self *BranchesController) createTag(branch *models.Branch) error {
+	return self.helpers.Tags.CreateTagMenu(branch.FullRefName(), func() {})
+}
+
 func (self *BranchesController) createResetMenu(selectedBranch *models.Branch) error {
 	return self.helpers.Refs.CreateGitResetMenu(selectedBranch.Name)
 }

pkg/gui/controllers/helpers/tags_helper.go

@@ -21,20 +21,20 @@ func NewTagsHelper(c *types.HelperCommon, git *commands.GitCommand) *TagsHelper
 	}
 }
 
-func (self *TagsHelper) CreateTagMenu(commitSha string, onCreate func()) error {
+func (self *TagsHelper) CreateTagMenu(ref string, onCreate func()) error {
 	return self.c.Menu(types.CreateMenuOptions{
 		Title: self.c.Tr.TagMenuTitle,
 		Items: []*types.MenuItem{
 			{
 				Label: self.c.Tr.LcLightweightTag,
 				OnPress: func() error {
-					return self.handleCreateLightweightTag(commitSha, onCreate)
+					return self.handleCreateLightweightTag(ref, onCreate)
 				},
 			},
 			{
 				Label: self.c.Tr.LcAnnotatedTag,
 				OnPress: func() error {
-					return self.handleCreateAnnotatedTag(commitSha, onCreate)
+					return self.handleCreateAnnotatedTag(ref, onCreate)
 				},
 			},
 		},
@@ -48,7 +48,7 @@ func (self *TagsHelper) afterTagCreate(onCreate func()) error {
 	})
 }
 
-func (self *TagsHelper) handleCreateAnnotatedTag(commitSha string, onCreate func()) error {
+func (self *TagsHelper) handleCreateAnnotatedTag(ref string, onCreate func()) error {
 	return self.c.Prompt(types.PromptOpts{
 		Title: self.c.Tr.TagNameTitle,
 		HandleConfirm: func(tagName string) error {
@@ -56,7 +56,7 @@ func (self *TagsHelper) handleCreateAnnotatedTag(commitSha string, onCreate func
 				Title: self.c.Tr.TagMessageTitle,
 				HandleConfirm: func(msg string) error {
 					self.c.LogAction(self.c.Tr.Actions.CreateAnnotatedTag)
-					if err := self.git.Tag.CreateAnnotated(tagName, commitSha, msg); err != nil {
+					if err := self.git.Tag.CreateAnnotated(tagName, ref, msg); err != nil {
 						return self.c.Error(err)
 					}
 					return self.afterTagCreate(onCreate)
@@ -66,12 +66,12 @@ func (self *TagsHelper) handleCreateAnnotatedTag(commitSha string, onCreate func
 	})
 }
 
-func (self *TagsHelper) handleCreateLightweightTag(commitSha string, onCreate func()) error {
+func (self *TagsHelper) handleCreateLightweightTag(ref string, onCreate func()) error {
 	return self.c.Prompt(types.PromptOpts{
 		Title: self.c.Tr.TagNameTitle,
 		HandleConfirm: func(tagName string) error {
 			self.c.LogAction(self.c.Tr.Actions.CreateLightweightTag)
-			if err := self.git.Tag.CreateLightweight(tagName, commitSha); err != nil {
+			if err := self.git.Tag.CreateLightweight(tagName, ref); err != nil {
 				return self.c.Error(err)
 			}
 			return self.afterTagCreate(onCreate)

pkg/integration/components/git.go

@@ -14,6 +14,10 @@ func (self *Git) CurrentBranchName(expectedName string) *Git {
 	return self.assert("git rev-parse --abbrev-ref HEAD", expectedName)
 }
 
+func (self *Git) TagNamesAt(ref string, expectedNames []string) *Git {
+	return self.assert(fmt.Sprintf(`git tag --sort=v:refname --points-at "%s"`, ref), strings.Join(expectedNames, "\n"))
+}
+
 func (self *Git) assert(cmdStr string, expected string) *Git {
 	self.assertWithRetries(func() (bool, string) {
 		output, err := self.shell.runCommandWithOutput(cmdStr)

pkg/integration/tests/branch/create_tag.go

@@ -0,0 +1,47 @@
+package branch
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Create a new tag on branch",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.
+			CreateNCommits(10).
+			NewBranch("new-branch").
+			EmptyCommit("new commit")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Branches().
+			Focus().
+			Lines(
+				MatchesRegexp(`\*\s*new-branch`).IsSelected(),
+				MatchesRegexp(`master`),
+			).
+			SelectNextItem().
+			Press(keys.Branches.CreateTag)
+
+		t.ExpectPopup().Menu().
+			Title(Equals("Create tag")).
+			Confirm()
+
+		t.ExpectPopup().Prompt().
+			Title(Equals("Tag name:")).
+			Type("new-tag").
+			Confirm()
+
+		t.Views().Tags().Focus().
+			Lines(
+				MatchesRegexp(`new-tag`).IsSelected(),
+			)
+
+		t.Git().
+			TagNamesAt("HEAD", []string{}).
+			TagNamesAt("master", []string{"new-tag"})
+	},
+})

pkg/integration/tests/tests_gen.go

@@ -27,6 +27,7 @@ var tests = []*components.IntegrationTest{
 	bisect.Basic,
 	bisect.FromOtherBranch,
 	branch.CheckoutByName,
+	branch.CreateTag,
 	branch.Delete,
 	branch.DetachedHead,
 	branch.OpenWithCliArg,