go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-24 08:52:21 +02:00
Code Issues Releases Activity

rename to filtered mode

Browse Source
This commit is contained in:
Jesse Duffield 2020-03-29 10:11:15 +11:00
parent 624ae45ebb
commit a2790cfe8e
14 changed files with 106 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Config.md
View File

@ -89,7 +89,7 @@ Default path for the config file:
prevScreenMode: '_'
undo: 'z'
redo: '<c-z>'
scopingMenu: <c-s>
filteringMenu: <c-s>
status:
checkForUpdate: 'u'
recentRepos: '<enter>'

6
main.go
View File

@ -25,8 +25,8 @@ func main() {
repoPath := "."
flaggy.String(&repoPath, "p", "path", "Path of git repo")
logScope := ""
flaggy.String(&logScope, "s", "scope", "scope for `git log`, typically the path of a file")
filterPath := ""
flaggy.String(&filterPath, "f", "filter", "Path to filter on in `git log -- <path>`. When in filter mode, the commits, reflog, and stash are filtered based on the given path, and some operations are restricted")
dump := ""
flaggy.AddPositionalValue(&dump, "gitargs", 1, false, "Todo file")
@ -64,7 +64,7 @@ func main() {
log.Fatal(err.Error())
}
app, err := app.NewApp(appConfig, logScope)
app, err := app.NewApp(appConfig, filterPath)
if err == nil {
err = app.Run()

4
pkg/app/app.go
View File

@ -91,7 +91,7 @@ func newLogger(config config.AppConfigurer) *logrus.Entry {
}
// NewApp bootstrap a new application
func NewApp(config config.AppConfigurer, logScope string) (*App, error) {
func NewApp(config config.AppConfigurer, filterPath string) (*App, error) {
app := &App{
closers: []io.Closer{},
Config: config,
@ -121,7 +121,7 @@ func NewApp(config config.AppConfigurer, logScope string) (*App, error) {
if err != nil {
return app, err
}
app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config, app.Updater, logScope)
app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config, app.Updater, filterPath)
if err != nil {
return app, err
}

14
pkg/commands/commit_list_builder.go
View File

@ -84,8 +84,8 @@ func (c *CommitListBuilder) extractCommitFromLine(line string) *Commit {
}
type GetCommitsOptions struct {
Limit bool
LogScope string
Limit bool
FilterPath string
}
// GetCommits obtains the commits of the current branch
@ -96,7 +96,7 @@ func (c *CommitListBuilder) GetCommits(options GetCommitsOptions) ([]*Commit, er
if err != nil {
return nil, err
}
if rebaseMode != "" && options.LogScope == "" {
if rebaseMode != "" && options.FilterPath == "" {
// here we want to also prepend the commits that we're in the process of rebasing
rebasingCommits, err = c.getRebasingCommits(rebaseMode)
if err != nil {
@ -305,10 +305,10 @@ func (c *CommitListBuilder) getLogCmd(options GetCommitsOptions) *exec.Cmd {
limitFlag = "-300"
}
scopeFlag := ""
if options.LogScope != "" {
scopeFlag = fmt.Sprintf(" -- %s", c.OSCommand.Quote(options.LogScope))
filterFlag := ""
if options.FilterPath != "" {
filterFlag = fmt.Sprintf(" --follow -- %s", c.OSCommand.Quote(options.FilterPath))
}
return c.OSCommand.ExecutableFromString(fmt.Sprintf("git log --oneline --pretty=format:\"%%H%s%%at%s%%aN%s%%d%s%%s\" %s --abbrev=%d --date=unix %s", SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, limitFlag, 20, scopeFlag))
return c.OSCommand.ExecutableFromString(fmt.Sprintf("git log --oneline --pretty=format:\"%%H%s%%at%s%%aN%s%%d%s%%s\" %s --abbrev=%d --date=unix %s", SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, SEPARATION_CHAR, limitFlag, 20, filterFlag))
}

34
pkg/commands/git.go
View File

@ -156,7 +156,7 @@ func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filenam
return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil
}
func (c *GitCommand) getStashEntriesWithoutScope() []*StashEntry {
func (c *GitCommand) getUnfilteredStashEntries() []*StashEntry {
unescaped := "git stash list --pretty='%gs'"
rawString, _ := c.OSCommand.RunCommandWithOutput(unescaped)
stashEntries := []*StashEntry{}
@ -167,15 +167,15 @@ func (c *GitCommand) getStashEntriesWithoutScope() []*StashEntry {
}
// GetStashEntries stash entries
func (c *GitCommand) GetStashEntries(scope string) []*StashEntry {
if scope == "" {
return c.getStashEntriesWithoutScope()
func (c *GitCommand) GetStashEntries(filterPath string) []*StashEntry {
if filterPath == "" {
return c.getUnfilteredStashEntries()
}
unescaped := fmt.Sprintf("git stash list --name-only")
rawString, err := c.OSCommand.RunCommandWithOutput(unescaped)
if err != nil {
return c.getStashEntriesWithoutScope()
return c.getUnfilteredStashEntries()
}
stashEntries := []*StashEntry{}
var currentStashEntry *StashEntry
@ -191,12 +191,12 @@ outer:
match := re.FindStringSubmatch(lines[i])
idx, err := strconv.Atoi(match[1])
if err != nil {
return c.getStashEntriesWithoutScope()
return c.getUnfilteredStashEntries()
}
currentStashEntry = stashEntryFromLine(lines[i], idx)
for i+1 < len(lines) && !isAStash(lines[i+1]) {
i++
if lines[i] == scope {
if lines[i] == filterPath {
stashEntries = append(stashEntries, currentStashEntry)
continue outer
}
@ -605,12 +605,12 @@ func (c *GitCommand) Ignore(filename string) error {
return c.OSCommand.AppendLineToFile(".gitignore", filename)
}
func (c *GitCommand) ShowCmdStr(sha string, scope string) string {
scopeArg := ""
if scope != "" {
scopeArg = fmt.Sprintf(" -- %s", c.OSCommand.Quote(scope))
func (c *GitCommand) ShowCmdStr(sha string, filterPath string) string {
filterPathArg := ""
if filterPath != "" {
filterPathArg = fmt.Sprintf(" -- %s", c.OSCommand.Quote(filterPath))
}
return fmt.Sprintf("git show --color=%s --no-renames --stat -p %s %s", c.colorArg(), sha, scopeArg)
return fmt.Sprintf("git show --color=%s --no-renames --stat -p %s %s", c.colorArg(), sha, filterPathArg)
}
func (c *GitCommand) GetBranchGraphCmdStr(branchName string) string {
@ -1163,16 +1163,16 @@ func (c *GitCommand) FetchRemote(remoteName string) error {
// GetReflogCommits only returns the new reflog commits since the given lastReflogCommit
// if none is passed (i.e. it's value is nil) then we get all the reflog commits
func (c *GitCommand) GetReflogCommits(lastReflogCommit *Commit, scope string) ([]*Commit, bool, error) {
func (c *GitCommand) GetReflogCommits(lastReflogCommit *Commit, filterPath string) ([]*Commit, bool, error) {
commits := make([]*Commit, 0)
re := regexp.MustCompile(`(\w+).*HEAD@\{([^\}]+)\}: (.*)`)
scopeArg := ""
if scope != "" {
scopeArg = fmt.Sprintf(" -- %s", c.OSCommand.Quote(scope))
filterPathArg := ""
if filterPath != "" {
filterPathArg = fmt.Sprintf(" --follow -- %s", c.OSCommand.Quote(filterPath))
}
cmd := c.OSCommand.ExecutableFromString(fmt.Sprintf("git reflog --abbrev=20 --date=unix %s", scopeArg))
cmd := c.OSCommand.ExecutableFromString(fmt.Sprintf("git reflog --abbrev=20 --date=unix %s", filterPathArg))
onlyObtainedNewReflogCommits := false
err := RunLineOutputCmd(cmd, func(line string) (bool, error) {
match := re.FindStringSubmatch(line)

2
pkg/config/app_config.go
View File

@ -320,7 +320,7 @@ keybinding:
prevScreenMode: '_'
undo: 'z'
redo: '<c-z>'
scopingMenu: <c-s>
filteringMenu: <c-s>
status:
checkForUpdate: 'u'
recentRepos: '<enter>'

6
pkg/gui/branches_panel.go
View File

@ -263,7 +263,7 @@ func (gui *Gui) deleteNamedBranch(g *gocui.Gui, v *gocui.View, selectedBranch *c
}
func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -290,7 +290,7 @@ func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
}
func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -304,7 +304,7 @@ func (gui *Gui) handleRebaseOntoLocalBranch(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleRebaseOntoBranch(selectedBranchName string) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}

36
pkg/gui/commits_panel.go
View File

@ -62,7 +62,7 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
}
cmd := gui.OSCommand.ExecutableFromString(
gui.GitCommand.ShowCmdStr(commit.Sha, gui.State.LogScope),
gui.GitCommand.ShowCmdStr(commit.Sha, gui.State.FilterPath),
)
if err := gui.newPtyTask("main", cmd); err != nil {
gui.Log.Error(err)
@ -122,7 +122,7 @@ func (gui *Gui) refreshCommitsWithLimit() error {
return err
}
commits, err := builder.GetCommits(commands.GetCommitsOptions{Limit: gui.State.Panels.Commits.LimitCommits, LogScope: gui.State.LogScope})
commits, err := builder.GetCommits(commands.GetCommitsOptions{Limit: gui.State.Panels.Commits.LimitCommits, FilterPath: gui.State.FilterPath})
if err != nil {
return err
}
@ -140,7 +140,7 @@ func (gui *Gui) refreshCommitsWithLimit() error {
// specific functions
func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -165,7 +165,7 @@ func (gui *Gui) handleCommitSquashDown(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCommitFixup(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -190,7 +190,7 @@ func (gui *Gui) handleCommitFixup(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -215,7 +215,7 @@ func (gui *Gui) handleRenameCommit(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleRenameCommitEditor(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -265,7 +265,7 @@ func (gui *Gui) handleMidRebaseCommand(action string) (bool, error) {
}
func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -286,7 +286,7 @@ func (gui *Gui) handleCommitDelete(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCommitMoveDown(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -313,7 +313,7 @@ func (gui *Gui) handleCommitMoveDown(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCommitMoveUp(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -340,7 +340,7 @@ func (gui *Gui) handleCommitMoveUp(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCommitEdit(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -359,7 +359,7 @@ func (gui *Gui) handleCommitEdit(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCommitAmendTo(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -372,7 +372,7 @@ func (gui *Gui) handleCommitAmendTo(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCommitPick(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -390,7 +390,7 @@ func (gui *Gui) handleCommitPick(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCommitRevert(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -402,7 +402,7 @@ func (gui *Gui) handleCommitRevert(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCopyCommit(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -445,7 +445,7 @@ func (gui *Gui) addCommitToCherryPickedCommits(index int) {
}
func (gui *Gui) handleCopyCommitRange(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -471,7 +471,7 @@ func (gui *Gui) handleCopyCommitRange(g *gocui.Gui, v *gocui.View) error {
// HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied
func (gui *Gui) HandlePasteCommits(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -551,7 +551,7 @@ func (gui *Gui) unchooseCommit(commits []*commands.Commit, i int) []*commands.Co
}
func (gui *Gui) handleCreateFixupCommit(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@ -575,7 +575,7 @@ func (gui *Gui) handleCreateFixupCommit(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleSquashAllAboveFixupCommits(g *gocui.Gui, v *gocui.View) error {
if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}

40
pkg/gui/gui.go
View File

@ -217,12 +217,12 @@ type guiState struct {
PrevMainHeight int
OldInformation string
StartupStage int // one of INITIAL and COMPLETE. Allows us to not load everything at once
LogScope string // the filename that gets passed to git log
FilterPath string // the filename that gets passed to git log
}
// for now the split view will always be on
// NewGui builds a new gui handler
func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *commands.OSCommand, tr *i18n.Localizer, config config.AppConfigurer, updater *updates.Updater, logScope string) (*Gui, error) {
func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *commands.OSCommand, tr *i18n.Localizer, config config.AppConfigurer, updater *updates.Updater, filterPath string) (*Gui, error) {
initialState := &guiState{
Files: make([]*commands.File, 0),
@ -250,9 +250,9 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
EditHistory: stack.New(),
},
},
SideView: nil,
Ptmx: nil,
LogScope: logScope,
SideView: nil,
Ptmx: nil,
FilterPath: filterPath,
}
gui := &Gui{
@ -511,8 +511,8 @@ func (gui *Gui) layout(g *gocui.Gui) error {
donate := color.New(color.FgMagenta, color.Underline).Sprint(gui.Tr.SLocalize("Donate"))
information = donate + " " + information
}
if gui.inScopedMode() {
information = utils.ColoredString(fmt.Sprintf("%s '%s' %s", gui.Tr.SLocalize("scopingTo"), gui.State.LogScope, utils.ColoredString(gui.Tr.SLocalize("(reset)"), color.Underline)), color.FgRed, color.Bold)
if gui.inFilterMode() {
information = utils.ColoredString(fmt.Sprintf("%s '%s' %s", gui.Tr.SLocalize("filteringBy"), gui.State.FilterPath, utils.ColoredString(gui.Tr.SLocalize("(reset)"), color.Underline)), color.FgRed, color.Bold)
} else if len(gui.State.CherryPickedCommits) > 0 {
information = utils.ColoredString(fmt.Sprintf("%d commits copied", len(gui.State.CherryPickedCommits)), color.FgCyan)
}
@ -804,7 +804,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
if gui.g.CurrentView() == nil {
initialView := gui.getFilesView()
if gui.inScopedMode() {
if gui.inFilterMode() {
initialView = gui.getCommitsView()
}
if _, err := gui.g.SetCurrentView(initialView.Name()); err != nil {
@ -993,7 +993,7 @@ func (gui *Gui) Run() error {
}
defer g.Close()
if gui.inScopedMode() {
if gui.inFilterMode() {
gui.State.ScreenMode = SCREEN_HALF
} else {
gui.State.ScreenMode = SCREEN_NORMAL
@ -1123,10 +1123,9 @@ func (gui *Gui) handleInfoClick(g *gocui.Gui, v *gocui.View) error {
// if we're in the normal context there will be a donate button here
// if we have ('reset') at the end then
if gui.inScopedMode() {
if gui.inFilterMode() {
if width-cx <= len(gui.Tr.SLocalize("(reset)")) {
gui.State.LogScope = ""
return gui.Errors.ErrRestart
return gui.exitFilterMode()
} else {
return nil
}
@ -1177,13 +1176,20 @@ func (gui *Gui) handleMouseDownSecondary(g *gocui.Gui, v *gocui.View) error {
return nil
}
func (gui *Gui) inScopedMode() bool {
return gui.State.LogScope != ""
func (gui *Gui) inFilterMode() bool {
return gui.State.FilterPath != ""
}
func (gui *Gui) validateNotInScopedMode() (bool, error) {
if gui.inScopedMode() {
return false, gui.createErrorPanel("command not available in scoped mode. Either exit scoped mode or restart lazygit")
func (gui *Gui) validateNotInFilterMode() (bool, error) {
if gui.inFilterMode() {
return false, gui.createConfirmationPanel(gui.g, gui.g.CurrentView(), true, gui.Tr.SLocalize("MustExitFilterModeTitle"), gui.Tr.SLocalize("MustExitFilterModePrompt"), func(*gocui.Gui, *gocui.View) error {
return gui.exitFilterMode()
}, nil)
}
return true, nil
}
func (gui *Gui) exitFilterMode() error {
gui.State.FilterPath = ""
return gui.Errors.ErrRestart
}

2
pkg/gui/keybindings.go
View File

@ -984,7 +984,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
},
{
ViewName: "",
Key: gui.getKey("universal.scopingMenu"),
Key: gui.getKey("universal.filteringMenu"),
Modifier: gocui.ModNone,
Handler: gui.handleCreateScopingMenuPanel,
Description: gui.Tr.SLocalize("openScopingMenu"),

9
pkg/gui/reflog_panel.go
View File

@ -10,11 +10,12 @@ import (
func (gui *Gui) getSelectedReflogCommit() *commands.Commit {
selectedLine := gui.State.Panels.ReflogCommits.SelectedLine
if selectedLine == -1 || len(gui.State.ReflogCommits) == 0 {
reflogComits := gui.State.ReflogCommits
if selectedLine == -1 || len(reflogComits) == 0 {
return nil
}
return gui.State.ReflogCommits[selectedLine]
return reflogComits[selectedLine]
}
func (gui *Gui) handleReflogCommitSelect(g *gocui.Gui, v *gocui.View) error {
@ -37,7 +38,7 @@ func (gui *Gui) handleReflogCommitSelect(g *gocui.Gui, v *gocui.View) error {
v.FocusPoint(0, gui.State.Panels.ReflogCommits.SelectedLine)
cmd := gui.OSCommand.ExecutableFromString(
gui.GitCommand.ShowCmdStr(commit.Sha, gui.State.LogScope),
gui.GitCommand.ShowCmdStr(commit.Sha, gui.State.FilterPath),
)
if err := gui.newPtyTask("main", cmd); err != nil {
gui.Log.Error(err)
@ -52,7 +53,7 @@ func (gui *Gui) refreshReflogCommits() error {
lastReflogCommit = gui.State.ReflogCommits[0]
}
commits, onlyObtainedNewReflogCommits, err := gui.GitCommand.GetReflogCommits(lastReflogCommit, gui.State.LogScope)
commits, onlyObtainedNewReflogCommits, err := gui.GitCommand.GetReflogCommits(lastReflogCommit, gui.State.FilterPath)
if err != nil {
return gui.surfaceError(err)
}

16
pkg/gui/scoping_menu_panel.go
View File

@ -26,33 +26,33 @@ func (gui *Gui) handleCreateScopingMenuPanel(g *gocui.Gui, v *gocui.View) error
if fileName != "" {
menuItems = append(menuItems, &menuItem{
displayString: fmt.Sprintf("%s '%s'", gui.Tr.SLocalize("scopeTo"), fileName),
displayString: fmt.Sprintf("%s '%s'", gui.Tr.SLocalize("filterBy"), fileName),
onPress: func() error {
gui.State.LogScope = fileName
gui.State.FilterPath = fileName
return gui.Errors.ErrRestart
},
})
}
menuItems = append(menuItems, &menuItem{
displayString: gui.Tr.SLocalize("fileToScopeToOption"),
displayString: gui.Tr.SLocalize("filterPathOption"),
onPress: func() error {
return gui.createPromptPanel(gui.g, v, gui.Tr.SLocalize("enterFileName"), "", func(g *gocui.Gui, promptView *gocui.View) error {
gui.State.LogScope = strings.TrimSpace(promptView.Buffer())
gui.State.FilterPath = strings.TrimSpace(promptView.Buffer())
return gui.Errors.ErrRestart
})
},
})
if gui.inScopedMode() {
if gui.inFilterMode() {
menuItems = append(menuItems, &menuItem{
displayString: gui.Tr.SLocalize("exitOutOfScopedMode"),
displayString: gui.Tr.SLocalize("exitFilterMode"),
onPress: func() error {
gui.State.LogScope = ""
gui.State.FilterPath = ""
return gui.Errors.ErrRestart
},
})
}
return gui.createMenu(gui.Tr.SLocalize("scopingMenuTitle"), menuItems, createMenuOptions{showCancel: true})
return gui.createMenu(gui.Tr.SLocalize("FilteringMenuTitle"), menuItems, createMenuOptions{showCancel: true})
}

2
pkg/gui/stash_panel.go
View File

@ -47,7 +47,7 @@ func (gui *Gui) handleStashEntrySelect(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) refreshStashEntries(g *gocui.Gui) error {
gui.State.StashEntries = gui.GitCommand.GetStashEntries(gui.State.LogScope)
gui.State.StashEntries = gui.GitCommand.GetStashEntries(gui.State.FilterPath)
gui.refreshSelectedLine(&gui.State.Panels.Stash.SelectedLine, len(gui.State.StashEntries))

26
pkg/i18n/english.go
View File

@ -1084,8 +1084,8 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "gotoBottom",
Other: "scroll to bottom",
}, &i18n.Message{
ID: "scopingTo",
Other: "scoping to",
ID: "filteringBy",
Other: "filtering by",
}, &i18n.Message{
ID: "(reset)",
Other: "(reset)",
@ -1093,20 +1093,26 @@ func addEnglish(i18nObject *i18n.Bundle) error {
ID: "openScopingMenu",
Other: "view scoping options",
}, &i18n.Message{
ID: "scopeTo",
Other: "scope to",
ID: "filterBy",
Other: "filter by",
}, &i18n.Message{
ID: "exitOutOfScopedMode",
Other: "stop scoping",
ID: "exitFilterMode",
Other: "stop filtering by path",
}, &i18n.Message{
ID: "fileToScopeToOption",
Other: "enter path to scope to",
ID: "filterPathOption",
Other: "enter path to filter by",
}, &i18n.Message{
ID: "enterFileName",
Other: "enter path:",
}, &i18n.Message{
ID: "scopingMenuTitle",
Other: "scoping",
ID: "FilteringMenuTitle",
Other: "Filtering",
}, &i18n.Message{
ID: "MustExitFilterModeTitle",
Other: "Command not available",
}, &i18n.Message{
ID: "MustExitFilterModePrompt",
Other: "Command not available in filtered mode. Exit filtered mode?",
},
)
}