go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-25 12:24:47 +02:00
Code Issues Releases Activity

Add "Absolute path" item to the file view's copy menu

Browse Source 
Rename the existing item to "Relative path".
This commit is contained in:
Stefan Haller 2025-03-21 08:25:12 +01:00
parent 200e490398
commit a8f6b04ff3
5 changed files with 74 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/gui/controllers/commits_files_controller.go
View File

@ -2,6 +2,7 @@ package controllers
import (
"errors"
"path/filepath"
"strings"
"github.com/jesseduffield/gocui"
@ -228,8 +229,8 @@ func (self *CommitFilesController) openCopyMenu() error {
DisabledReason: self.require(self.singleItemSelected())(),
Key: 'n',
}
copyPathItem := &types.MenuItem{
Label: self.c.Tr.CopyFilePath,
copyRelativePathItem := &types.MenuItem{
Label: self.c.Tr.CopyRelativeFilePath,
OnPress: func() error {
if err := self.c.OS().CopyToClipboard(node.GetPath()); err != nil {
return err
@ -240,6 +241,18 @@ func (self *CommitFilesController) openCopyMenu() error {
DisabledReason: self.require(self.singleItemSelected())(),
Key: 'p',
}
copyAbsolutePathItem := &types.MenuItem{
Label: self.c.Tr.CopyAbsoluteFilePath,
OnPress: func() error {
if err := self.c.OS().CopyToClipboard(filepath.Join(self.c.Git().RepoPaths.RepoPath(), node.GetPath())); err != nil {
return err
}
self.c.Toast(self.c.Tr.FilePathCopiedToast)
return nil
},
DisabledReason: self.require(self.singleItemSelected())(),
Key: 'P',
}
copyFileDiffItem := &types.MenuItem{
Label: self.c.Tr.CopySelectedDiff,
OnPress: func() error {
@ -282,7 +295,8 @@ func (self *CommitFilesController) openCopyMenu() error {
Title: self.c.Tr.CopyToClipboardMenu,
Items: []*types.MenuItem{
copyNameItem,
copyPathItem,
copyRelativePathItem,
copyAbsolutePathItem,
copyFileDiffItem,
copyAllDiff,
copyFileContentItem,

20
pkg/gui/controllers/files_controller.go
View File

@ -3,6 +3,7 @@ package controllers
import (
"errors"
"fmt"
"path/filepath"
"strings"
"github.com/jesseduffield/gocui"
@ -976,8 +977,8 @@ func (self *FilesController) openCopyMenu() error {
DisabledReason: self.require(self.singleItemSelected())(),
Key: 'n',
}
copyPathItem := &types.MenuItem{
Label: self.c.Tr.CopyFilePath,
copyRelativePathItem := &types.MenuItem{
Label: self.c.Tr.CopyRelativeFilePath,
OnPress: func() error {
if err := self.c.OS().CopyToClipboard(node.GetPath()); err != nil {
return err
@ -988,6 +989,18 @@ func (self *FilesController) openCopyMenu() error {
DisabledReason: self.require(self.singleItemSelected())(),
Key: 'p',
}
copyAbsolutePathItem := &types.MenuItem{
Label: self.c.Tr.CopyAbsoluteFilePath,
OnPress: func() error {
if err := self.c.OS().CopyToClipboard(filepath.Join(self.c.Git().RepoPaths.RepoPath(), node.GetPath())); err != nil {
return err
}
self.c.Toast(self.c.Tr.FilePathCopiedToast)
return nil
},
DisabledReason: self.require(self.singleItemSelected())(),
Key: 'P',
}
copyFileDiffItem := &types.MenuItem{
Label: self.c.Tr.CopySelectedDiff,
Tooltip: self.c.Tr.CopyFileDiffTooltip,
@ -1044,7 +1057,8 @@ func (self *FilesController) openCopyMenu() error {
Title: self.c.Tr.CopyToClipboardMenu,
Items: []*types.MenuItem{
copyNameItem,
copyPathItem,
copyRelativePathItem,
copyAbsolutePathItem,
copyFileDiffItem,
copyAllDiff,
},

6
pkg/i18n/english.go
View File

@ -76,7 +76,8 @@ type TranslationSet struct {
FileFilter string
CopyToClipboardMenu string
CopyFileName string
CopyFilePath string
CopyRelativeFilePath string
CopyAbsoluteFilePath string
CopyFileDiffTooltip string
CopySelectedDiff string
CopyAllFilesDiff string
@ -1120,7 +1121,8 @@ func EnglishTranslationSet() *TranslationSet {
FileFilter: "Filter files by status",
CopyToClipboardMenu: "Copy to clipboard",
CopyFileName: "File name",
CopyFilePath: "Path",
CopyRelativeFilePath: "Relative path",
CopyAbsoluteFilePath: "Absolute path",
CopyFileDiffTooltip: "If there are staged items, this command considers only them. Otherwise, it considers all the unstaged ones.",
CopySelectedDiff: "Diff of selected file",
CopyAllFilesDiff: "Diff of all files",

17
pkg/integration/tests/diff/copy_to_clipboard.go
View File

@ -1,6 +1,8 @@
package diff
import (
"os"
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
@ -63,7 +65,7 @@ var CopyToClipboard = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Copy to clipboard")).
Select(Contains("Path")).
Select(Contains("Relative path")).
Confirm().
Tap(func() {
t.ExpectToast(Equals("File path copied to clipboard"))
@ -71,6 +73,19 @@ var CopyToClipboard = NewIntegrationTest(NewIntegrationTestArgs{
})
}).
Press(keys.Files.CopyFileInfoToClipboard).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Copy to clipboard")).
Select(Contains("Absolute path")).
Confirm().
Tap(func() {
t.ExpectToast(Equals("File path copied to clipboard"))
repoDir, _ := os.Getwd()
// On windows the following path would have backslashes, but we don't run integration tests on windows yet.
expectClipboard(t, Equals(repoDir+"/dir/file1"))
})
}).
Press(keys.Files.CopyFileInfoToClipboard).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Copy to clipboard")).

22
pkg/integration/tests/file/copy_menu.go
View File

@ -1,6 +1,8 @@
package file
import (
"os"
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
@ -103,13 +105,13 @@ var CopyMenu = NewIntegrationTest(NewIntegrationTestArgs{
expectClipboard(t, Equals("1-unstaged_file"))
})
// Copy file path
// Copy relative file path
t.Views().Files().
Press(keys.Files.CopyFileInfoToClipboard).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Copy to clipboard")).
Select(Contains("Path")).
Select(Contains("Relative path")).
Confirm()
t.ExpectToast(Equals("File path copied to clipboard"))
@ -117,6 +119,22 @@ var CopyMenu = NewIntegrationTest(NewIntegrationTestArgs{
expectClipboard(t, Equals("dir/1-unstaged_file"))
})
// Copy absolute file path
t.Views().Files().
Press(keys.Files.CopyFileInfoToClipboard).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Copy to clipboard")).
Select(Contains("Absolute path")).
Confirm()
t.ExpectToast(Equals("File path copied to clipboard"))
repoDir, _ := os.Getwd()
// On windows the following path would have backslashes, but we don't run integration tests on windows yet.
expectClipboard(t, Equals(repoDir+"/dir/1-unstaged_file"))
})
// Selected path diff on a single (unstaged) file
t.Views().Files().
Press(keys.Files.CopyFileInfoToClipboard).