Waiting for coverage results... If this message persists check your coverage integration. Go to coverage settings
Accessibility survey
Some code cleanups to the "discard file changes from commit" feature
Closed
stefanhaller merged cleanup-discard-file-changes-from-commit into master
#4679
Last updated
Up to quality standards.
pkg/gui/controllers
pkg/gui/controllers/commits_files_controller.go
Diff coverage
100 %
@@ -313,19 +313,13 @@ func (self *CommitFilesController) discard(selectedNodes []*filetree.CommitFileN
313// Reset the current patch if there is one. 314if self.c.Git().Patch.PatchBuilder.Active() { 315self.c.Git().Patch.PatchBuilder.Reset() 316if err := self.c.Refresh(types.RefreshOptions{Mode: types.BLOCK_UI}); err != nil { 317return err 318} 319} 320 321for _, node := range selectedNodes { 322err := node.ForEachFile(func(file *models.CommitFile) error { 323filePaths = append(filePaths, file.GetPath()) 324return nil 325}) 326if err != nil { 327return err 328} 329} 330 331err := self.c.Git().Rebase.DiscardOldFileChanges(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), filePaths)313// Reset the current patch if there is one. 314if self.c.Git().Patch.PatchBuilder.Active() { 315self.c.Git().Patch.PatchBuilder.Reset() 316} 317 318for _, node := range selectedNodes { 319_ = node.ForEachFile(func(file *models.CommitFile) error { 2 hits320filePaths = append(filePaths, file.GetPath()) 321return nil 322}) 323} 324 325err := self.c.Git().Rebase.DiscardOldFileChanges(self.c.Model().Commits, self.c.Contexts().LocalCommits.GetSelectedLineIdx(), filePaths)@@ -336,7 +330,8 @@ func (self *CommitFilesController) discard(selectedNodes []*filetree.CommitFileN
336if self.context().RangeSelectEnabled() { 337self.context().GetList().CancelRangeSelect() 338} 339return self.c.Refresh(types.RefreshOptions{Mode: types.SYNC}) 340}) 341}, 342})330if self.context().RangeSelectEnabled() { 331self.context().GetList().CancelRangeSelect() 332} 333 334return nil 1 hits335}) 336}, 337})