diff --git a/pkg/commands/commits.go b/pkg/commands/commits.go index 7fc4cc2a9..48f0412a2 100644 --- a/pkg/commands/commits.go +++ b/pkg/commands/commits.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" - "github.com/jesseduffield/lazygit/pkg/models" ) // RenameCommit renames the topmost commit with the given name diff --git a/pkg/commands/files.go b/pkg/commands/files.go index e52de446b..f2e67993f 100644 --- a/pkg/commands/files.go +++ b/pkg/commands/files.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-errors/errors" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/commands/git_test.go b/pkg/commands/git_test.go index 65076acb4..45c1c9b7b 100644 --- a/pkg/commands/git_test.go +++ b/pkg/commands/git_test.go @@ -12,10 +12,10 @@ import ( "github.com/go-errors/errors" gogit "github.com/go-git/go-git/v5" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/i18n" - "github.com/jesseduffield/lazygit/pkg/models" "github.com/jesseduffield/lazygit/pkg/test" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/stretchr/testify/assert" diff --git a/pkg/commands/loading_branches.go b/pkg/commands/loading_branches.go index 99c60d9c9..67ad1c89d 100644 --- a/pkg/commands/loading_branches.go +++ b/pkg/commands/loading_branches.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/sirupsen/logrus" ) diff --git a/pkg/commands/loading_commit_files.go b/pkg/commands/loading_commit_files.go index ed0f855d4..8a633156c 100644 --- a/pkg/commands/loading_commit_files.go +++ b/pkg/commands/loading_commit_files.go @@ -3,8 +3,8 @@ package commands import ( "strings" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/patch" - "github.com/jesseduffield/lazygit/pkg/models" ) // GetFilesInDiff get the specified commit files diff --git a/pkg/commands/loading_commits.go b/pkg/commands/loading_commits.go index d29e03a28..72946aeb6 100644 --- a/pkg/commands/loading_commits.go +++ b/pkg/commands/loading_commits.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/fatih/color" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/i18n" - "github.com/jesseduffield/lazygit/pkg/models" "github.com/sirupsen/logrus" ) diff --git a/pkg/commands/loading_files.go b/pkg/commands/loading_files.go index 8455ed0d5..8d68d269e 100644 --- a/pkg/commands/loading_files.go +++ b/pkg/commands/loading_files.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/commands/loading_reflog_commits.go b/pkg/commands/loading_reflog_commits.go index 5950349fc..0c6915543 100644 --- a/pkg/commands/loading_reflog_commits.go +++ b/pkg/commands/loading_reflog_commits.go @@ -5,8 +5,8 @@ import ( "regexp" "strconv" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" - "github.com/jesseduffield/lazygit/pkg/models" ) // GetReflogCommits only returns the new reflog commits since the given lastReflogCommit diff --git a/pkg/commands/loading_remotes.go b/pkg/commands/loading_remotes.go index f1f95b52e..49d4fabfe 100644 --- a/pkg/commands/loading_remotes.go +++ b/pkg/commands/loading_remotes.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) func (c *GitCommand) GetRemotes() ([]*models.Remote, error) { diff --git a/pkg/commands/loading_stash.go b/pkg/commands/loading_stash.go index 29e033ab0..3b79bdfb4 100644 --- a/pkg/commands/loading_stash.go +++ b/pkg/commands/loading_stash.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/commands/loading_tags.go b/pkg/commands/loading_tags.go index c651d9cf2..9ed350fd5 100644 --- a/pkg/commands/loading_tags.go +++ b/pkg/commands/loading_tags.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/models/branch.go b/pkg/commands/models/branch.go similarity index 100% rename from pkg/models/branch.go rename to pkg/commands/models/branch.go diff --git a/pkg/models/commit.go b/pkg/commands/models/commit.go similarity index 100% rename from pkg/models/commit.go rename to pkg/commands/models/commit.go diff --git a/pkg/models/commit_file.go b/pkg/commands/models/commit_file.go similarity index 100% rename from pkg/models/commit_file.go rename to pkg/commands/models/commit_file.go diff --git a/pkg/models/file.go b/pkg/commands/models/file.go similarity index 100% rename from pkg/models/file.go rename to pkg/commands/models/file.go diff --git a/pkg/models/remote.go b/pkg/commands/models/remote.go similarity index 100% rename from pkg/models/remote.go rename to pkg/commands/models/remote.go diff --git a/pkg/models/remote_branch.go b/pkg/commands/models/remote_branch.go similarity index 100% rename from pkg/models/remote_branch.go rename to pkg/commands/models/remote_branch.go diff --git a/pkg/models/stash_entry.go b/pkg/commands/models/stash_entry.go similarity index 100% rename from pkg/models/stash_entry.go rename to pkg/commands/models/stash_entry.go diff --git a/pkg/models/submodule_config.go b/pkg/commands/models/submodule_config.go similarity index 100% rename from pkg/models/submodule_config.go rename to pkg/commands/models/submodule_config.go diff --git a/pkg/models/tag.go b/pkg/commands/models/tag.go similarity index 100% rename from pkg/models/tag.go rename to pkg/commands/models/tag.go diff --git a/pkg/commands/patch_rebases.go b/pkg/commands/patch_rebases.go index a926e491e..c51a24ed7 100644 --- a/pkg/commands/patch_rebases.go +++ b/pkg/commands/patch_rebases.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/go-errors/errors" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/patch" - "github.com/jesseduffield/lazygit/pkg/models" ) // DeletePatchesFromCommit applies a patch in reverse for a commit diff --git a/pkg/commands/pull_request.go b/pkg/commands/pull_request.go index 934b3ff57..af46318f5 100644 --- a/pkg/commands/pull_request.go +++ b/pkg/commands/pull_request.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/go-errors/errors" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/config" - "github.com/jesseduffield/lazygit/pkg/models" ) // Service is a service that repository is on (Github, Bitbucket, ...) diff --git a/pkg/commands/pull_request_test.go b/pkg/commands/pull_request_test.go index 02fa5d03f..075792783 100644 --- a/pkg/commands/pull_request_test.go +++ b/pkg/commands/pull_request_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/stretchr/testify/assert" ) diff --git a/pkg/commands/rebasing.go b/pkg/commands/rebasing.go index 30e87c5dc..df1f43607 100644 --- a/pkg/commands/rebasing.go +++ b/pkg/commands/rebasing.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/go-errors/errors" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/mgutz/str" ) diff --git a/pkg/commands/remotes.go b/pkg/commands/remotes.go index 59793a155..6d69b37cd 100644 --- a/pkg/commands/remotes.go +++ b/pkg/commands/remotes.go @@ -1,7 +1,7 @@ package commands import ( - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) func (c *GitCommand) AddRemote(name string, url string) error { diff --git a/pkg/commands/submodules.go b/pkg/commands/submodules.go index 1a19259d9..fb72d090d 100644 --- a/pkg/commands/submodules.go +++ b/pkg/commands/submodules.go @@ -5,7 +5,7 @@ import ( "os" "regexp" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) // .gitmodules looks like this: diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index dae81f7fa..8bc6fd93c 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -6,7 +6,7 @@ import ( "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) // list panel functions diff --git a/pkg/gui/cherry_picking.go b/pkg/gui/cherry_picking.go index 1355c7d4e..bf2b25ee1 100644 --- a/pkg/gui/cherry_picking.go +++ b/pkg/gui/cherry_picking.go @@ -1,6 +1,6 @@ package gui -import "github.com/jesseduffield/lazygit/pkg/models" +import "github.com/jesseduffield/lazygit/pkg/commands/models" // you can only copy from one context at a time, because the order and position of commits matter diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index 84356a833..f8273723f 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -2,7 +2,7 @@ package gui import ( "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) func (gui *Gui) getSelectedCommitFile() *models.CommitFile { diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go index 4259fb1a2..25e418dac 100644 --- a/pkg/gui/commits_panel.go +++ b/pkg/gui/commits_panel.go @@ -5,7 +5,7 @@ import ( "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) // list panel functions diff --git a/pkg/gui/custom_commands.go b/pkg/gui/custom_commands.go index c15052fb3..df148a7af 100644 --- a/pkg/gui/custom_commands.go +++ b/pkg/gui/custom_commands.go @@ -8,7 +8,7 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/discard_changes_menu_panel.go b/pkg/gui/discard_changes_menu_panel.go index 277f03062..8c761a3e9 100644 --- a/pkg/gui/discard_changes_menu_panel.go +++ b/pkg/gui/discard_changes_menu_panel.go @@ -2,7 +2,7 @@ package gui import ( "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) func (gui *Gui) submoduleFromFile(file *models.File) *models.SubmoduleConfig { diff --git a/pkg/gui/file_watching.go b/pkg/gui/file_watching.go index e503316b4..09b994a14 100644 --- a/pkg/gui/file_watching.go +++ b/pkg/gui/file_watching.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/fsnotify/fsnotify" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/sirupsen/logrus" ) diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 4d4007a7b..157b75599 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -14,7 +14,7 @@ import ( "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/utils" "github.com/mgutz/str" ) diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 8c85a468f..57d450f8a 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -22,11 +22,11 @@ import ( "github.com/golang-collections/collections/stack" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" "github.com/jesseduffield/lazygit/pkg/commands/patch" "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/i18n" - "github.com/jesseduffield/lazygit/pkg/models" "github.com/jesseduffield/lazygit/pkg/tasks" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/updates" diff --git a/pkg/gui/presentation/branches.go b/pkg/gui/presentation/branches.go index 17107698d..72def1f6c 100644 --- a/pkg/gui/presentation/branches.go +++ b/pkg/gui/presentation/branches.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/fatih/color" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/presentation/commit_files.go b/pkg/gui/presentation/commit_files.go index 01e56a1f3..d90e3e990 100644 --- a/pkg/gui/presentation/commit_files.go +++ b/pkg/gui/presentation/commit_files.go @@ -2,8 +2,8 @@ package presentation import ( "github.com/fatih/color" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/patch" - "github.com/jesseduffield/lazygit/pkg/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go index d66795e7a..aeecd71a7 100644 --- a/pkg/gui/presentation/commits.go +++ b/pkg/gui/presentation/commits.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/fatih/color" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/presentation/files.go b/pkg/gui/presentation/files.go index 648b621b8..4adb78ea2 100644 --- a/pkg/gui/presentation/files.go +++ b/pkg/gui/presentation/files.go @@ -2,7 +2,7 @@ package presentation import ( "github.com/fatih/color" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/presentation/reflog_commits.go b/pkg/gui/presentation/reflog_commits.go index b7ae68347..d435c1387 100644 --- a/pkg/gui/presentation/reflog_commits.go +++ b/pkg/gui/presentation/reflog_commits.go @@ -2,7 +2,7 @@ package presentation import ( "github.com/fatih/color" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/presentation/remote_branches.go b/pkg/gui/presentation/remote_branches.go index 5d1c76709..94eaaf20b 100644 --- a/pkg/gui/presentation/remote_branches.go +++ b/pkg/gui/presentation/remote_branches.go @@ -1,7 +1,7 @@ package presentation import ( - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/presentation/remotes.go b/pkg/gui/presentation/remotes.go index 2c099fb18..15a450891 100644 --- a/pkg/gui/presentation/remotes.go +++ b/pkg/gui/presentation/remotes.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/fatih/color" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/presentation/stash_entries.go b/pkg/gui/presentation/stash_entries.go index d9985fcba..fbd153919 100644 --- a/pkg/gui/presentation/stash_entries.go +++ b/pkg/gui/presentation/stash_entries.go @@ -1,7 +1,7 @@ package presentation import ( - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/presentation/tags.go b/pkg/gui/presentation/tags.go index 0f11b521e..04deb6423 100644 --- a/pkg/gui/presentation/tags.go +++ b/pkg/gui/presentation/tags.go @@ -1,7 +1,7 @@ package presentation import ( - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/reflog_panel.go b/pkg/gui/reflog_panel.go index f00f4c6ed..165e575a1 100644 --- a/pkg/gui/reflog_panel.go +++ b/pkg/gui/reflog_panel.go @@ -2,7 +2,7 @@ package gui import ( "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) // list panel functions diff --git a/pkg/gui/remote_branches_panel.go b/pkg/gui/remote_branches_panel.go index 12587447a..b879272b3 100644 --- a/pkg/gui/remote_branches_panel.go +++ b/pkg/gui/remote_branches_panel.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) // list panel functions diff --git a/pkg/gui/remotes_panel.go b/pkg/gui/remotes_panel.go index e310cebe7..7a77a0074 100644 --- a/pkg/gui/remotes_panel.go +++ b/pkg/gui/remotes_panel.go @@ -6,7 +6,7 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/utils" ) diff --git a/pkg/gui/stash_panel.go b/pkg/gui/stash_panel.go index 765163408..fddffead0 100644 --- a/pkg/gui/stash_panel.go +++ b/pkg/gui/stash_panel.go @@ -2,7 +2,7 @@ package gui import ( "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) // list panel functions diff --git a/pkg/gui/sub_commits_panel.go b/pkg/gui/sub_commits_panel.go index 55cfec86c..a44051bd8 100644 --- a/pkg/gui/sub_commits_panel.go +++ b/pkg/gui/sub_commits_panel.go @@ -3,7 +3,7 @@ package gui import ( "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) // list panel functions diff --git a/pkg/gui/tags_panel.go b/pkg/gui/tags_panel.go index d1ad97168..ef20545a0 100644 --- a/pkg/gui/tags_panel.go +++ b/pkg/gui/tags_panel.go @@ -2,7 +2,7 @@ package gui import ( "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/models" + "github.com/jesseduffield/lazygit/pkg/commands/models" ) // list panel functions