summaryrefslogtreecommitdiffstats
path: root/pkg/gui
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-09-29 20:28:39 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-09-29 20:48:49 +1000
commitce6f8ed1bcf85204aadb14d583c5f01f96ac4e49 (patch)
tree99cc821e03883c2cd7821e64b41e0d9778f51082 /pkg/gui
parent83748d78f875de8ddf7786e17ec59a1825a65c1f (diff)
move models folder into commands folder
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/branches_panel.go2
-rw-r--r--pkg/gui/cherry_picking.go2
-rw-r--r--pkg/gui/commit_files_panel.go2
-rw-r--r--pkg/gui/commits_panel.go2
-rw-r--r--pkg/gui/custom_commands.go2
-rw-r--r--pkg/gui/discard_changes_menu_panel.go2
-rw-r--r--pkg/gui/file_watching.go2
-rw-r--r--pkg/gui/files_panel.go2
-rw-r--r--pkg/gui/gui.go2
-rw-r--r--pkg/gui/presentation/branches.go2
-rw-r--r--pkg/gui/presentation/commit_files.go2
-rw-r--r--pkg/gui/presentation/commits.go2
-rw-r--r--pkg/gui/presentation/files.go2
-rw-r--r--pkg/gui/presentation/reflog_commits.go2
-rw-r--r--pkg/gui/presentation/remote_branches.go2
-rw-r--r--pkg/gui/presentation/remotes.go2
-rw-r--r--pkg/gui/presentation/stash_entries.go2
-rw-r--r--pkg/gui/presentation/tags.go2
-rw-r--r--pkg/gui/reflog_panel.go2
-rw-r--r--pkg/gui/remote_branches_panel.go2
-rw-r--r--pkg/gui/remotes_panel.go2
-rw-r--r--pkg/gui/stash_panel.go2
-rw-r--r--pkg/gui/sub_commits_panel.go2
-rw-r--r--pkg/gui/tags_panel.go2
24 files changed, 24 insertions, 24 deletions
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