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

privatise some fields

Browse Source
This commit is contained in:
Jesse Duffield 2022-01-05 11:59:04 +11:00
parent 05fa483f48
commit bbb5eee23a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/commands/patch/patch_manager.go
View File

@ -34,7 +34,7 @@ type PatchManager struct {
// To is the commit sha if we're dealing with files of a commit, or a stash ref for a stash // To is the commit sha if we're dealing with files of a commit, or a stash ref for a stash
To string To string
From string From string
Reverse bool reverse bool
// CanRebase tells us whether we're allowed to modify our commits. CanRebase should be true for commits of the currently checked out branch and false for everything else // CanRebase tells us whether we're allowed to modify our commits. CanRebase should be true for commits of the currently checked out branch and false for everything else
// TODO: move this out into a proper mode struct in the gui package: it doesn't really belong here // TODO: move this out into a proper mode struct in the gui package: it doesn't really belong here
@ -43,18 +43,18 @@ type PatchManager struct {
// fileInfoMap starts empty but you add files to it as you go along // fileInfoMap starts empty but you add files to it as you go along
fileInfoMap map[string]*fileInfo fileInfoMap map[string]*fileInfo
Log *logrus.Entry Log *logrus.Entry
ApplyPatch applyPatchFunc applyPatch applyPatchFunc
// LoadFileDiff loads the diff of a file, for a given to (typically a commit SHA) // loadFileDiff loads the diff of a file, for a given to (typically a commit SHA)
LoadFileDiff loadFileDiffFunc loadFileDiff loadFileDiffFunc
} }
// NewPatchManager returns a new PatchManager // NewPatchManager returns a new PatchManager
func NewPatchManager(log *logrus.Entry, applyPatch applyPatchFunc, loadFileDiff loadFileDiffFunc) *PatchManager { func NewPatchManager(log *logrus.Entry, applyPatch applyPatchFunc, loadFileDiff loadFileDiffFunc) *PatchManager {
return &PatchManager{ return &PatchManager{
Log: log, Log: log,
ApplyPatch: applyPatch, applyPatch: applyPatch,
LoadFileDiff: loadFileDiff, loadFileDiff: loadFileDiff,
} }
} }
@ -62,7 +62,7 @@ func NewPatchManager(log *logrus.Entry, applyPatch applyPatchFunc, loadFileDiff
func (p *PatchManager) Start(from, to string, reverse bool, canRebase bool) { func (p *PatchManager) Start(from, to string, reverse bool, canRebase bool) {
p.To = to p.To = to
p.From = from p.From = from
p.Reverse = reverse p.reverse = reverse
p.CanRebase = canRebase p.CanRebase = canRebase
p.fileInfoMap = map[string]*fileInfo{} p.fileInfoMap = map[string]*fileInfo{}
} }
@ -118,7 +118,7 @@ func (p *PatchManager) getFileInfo(filename string) (*fileInfo, error) {
return info, nil return info, nil
} }
diff, err := p.LoadFileDiff(p.From, p.To, p.Reverse, filename, true) diff, err := p.loadFileDiff(p.From, p.To, p.reverse, filename, true)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -265,7 +265,7 @@ func (p *PatchManager) ApplyPatches(reverse bool) error {
if patch == "" { if patch == "" {
continue continue
} }
if err = p.ApplyPatch(patch, applyFlags...); err != nil { if err = p.applyPatch(patch, applyFlags...); err != nil {
continue continue
} }
break break
@ -301,5 +301,5 @@ func (p *PatchManager) IsEmpty() bool {
// if any of these things change we'll need to reset and start a new patch // if any of these things change we'll need to reset and start a new patch
func (p *PatchManager) NewPatchRequired(from string, to string, reverse bool) bool { func (p *PatchManager) NewPatchRequired(from string, to string, reverse bool) bool {
return from != p.From || to != p.To || reverse != p.Reverse return from != p.From || to != p.To || reverse != p.reverse
} }