summaryrefslogtreecommitdiffstats
path: root/test/integration/staging/expected/repo
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-06-13 11:01:26 +1000
committerJesse Duffield <jessedduffield@gmail.com>2022-08-06 13:49:11 +1000
commit524bf83a4a681408c3fb57818f6968cab632e0ae (patch)
tree8858b4ee8d4670dcdd1637fe5fedf00ff080c154 /test/integration/staging/expected/repo
parent6dfef08efc5c7f262194c0af35fd777428f33a1a (diff)
refactor to only have one context per view
Diffstat (limited to 'test/integration/staging/expected/repo')
-rw-r--r--test/integration/staging/expected/repo/.git_keep/indexbin281 -> 281 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/logs/HEAD4
-rw-r--r--test/integration/staging/expected/repo/.git_keep/logs/refs/heads/master4
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/05/9586b468b89bf98e3b62126f455ab15bea4a5fbin108 -> 0 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/0b/6860367a6e7794985007cadf0aaf04c801e59ebin146 -> 0 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/3e/95c983db9349a26b20fccbdaa933e805ff817ebin367 -> 0 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/40/ce5b93f72e04cb876afaaf91398c2821260b95bin394 -> 0 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/64/97d00f0447159947a805f3a38e8c44ed2865b1bin0 -> 118 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/6f/7e9e66f080162af7ebab016d02550145cfda66bin118 -> 0 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/73/f226ec630e261c016df5bd80e3156eaba42d7ebin0 -> 482 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/a4/7182dc057408b3c6b1749cb46db0e0c5fd626bbin2328 -> 0 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/a6/985076907d3ed64cf59480bb2eec313ea221cfbin0 -> 147 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/ac/43b10fa95a2d2ee6a028c0d0ea878f887d7c51bin0 -> 2334 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/b6/77e3e5777e122a22ebb001532c5017b199b0c02
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/b7/9b845289f08703b6ffb8927da9665efda4356f2
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/d6/9b45d6d14e1864411d17930012210271c400c32
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/dc/02541428fdc15b30bd2174fcbcd43d388eab82bin2331 -> 0 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/e7/86ecad3cea3651947e6c2648f6dae87372276bbin0 -> 109 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/objects/eb/38d1e424df18868f73407ca8087b6350b59f3ebin0 -> 2262 bytes
-rw-r--r--test/integration/staging/expected/repo/.git_keep/refs/heads/master2
-rw-r--r--test/integration/staging/expected/repo/three.txt7
-rw-r--r--test/integration/staging/expected/repo/two.txt12
22 files changed, 18 insertions, 17 deletions
diff --git a/test/integration/staging/expected/repo/.git_keep/index b/test/integration/staging/expected/repo/.git_keep/index
index 3735bb8d9..694ca5da2 100644
--- a/test/integration/staging/expected/repo/.git_keep/index
+++ b/test/integration/staging/expected/repo/.git_keep/index
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/logs/HEAD b/test/integration/staging/expected/repo/.git_keep/logs/HEAD
index fea22e271..fee95f75d 100644
--- a/test/integration/staging/expected/repo/.git_keep/logs/HEAD
+++ b/test/integration/staging/expected/repo/.git_keep/logs/HEAD
@@ -1,2 +1,2 @@
-0000000000000000000000000000000000000000 6f7e9e66f080162af7ebab016d02550145cfda66 CI <CI@example.com> 1642499582 +1100 commit (initial): file1
-6f7e9e66f080162af7ebab016d02550145cfda66 0b6860367a6e7794985007cadf0aaf04c801e59e CI <CI@example.com> 1642499609 +1100 commit: test
+0000000000000000000000000000000000000000 6497d00f0447159947a805f3a38e8c44ed2865b1 CI <CI@example.com> 1659701362 +1000 commit (initial): file1
+6497d00f0447159947a805f3a38e8c44ed2865b1 a6985076907d3ed64cf59480bb2eec313ea221cf CI <CI@example.com> 1659701393 +1000 commit: test
diff --git a/test/integration/staging/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/staging/expected/repo/.git_keep/logs/refs/heads/master
index fea22e271..fee95f75d 100644
--- a/test/integration/staging/expected/repo/.git_keep/logs/refs/heads/master
+++ b/test/integration/staging/expected/repo/.git_keep/logs/refs/heads/master
@@ -1,2 +1,2 @@
-0000000000000000000000000000000000000000 6f7e9e66f080162af7ebab016d02550145cfda66 CI <CI@example.com> 1642499582 +1100 commit (initial): file1
-6f7e9e66f080162af7ebab016d02550145cfda66 0b6860367a6e7794985007cadf0aaf04c801e59e CI <CI@example.com> 1642499609 +1100 commit: test
+0000000000000000000000000000000000000000 6497d00f0447159947a805f3a38e8c44ed2865b1 CI <CI@example.com> 1659701362 +1000 commit (initial): file1
+6497d00f0447159947a805f3a38e8c44ed2865b1 a6985076907d3ed64cf59480bb2eec313ea221cf CI <CI@example.com> 1659701393 +1000 commit: test
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/05/9586b468b89bf98e3b62126f455ab15bea4a5f b/test/integration/staging/expected/repo/.git_keep/objects/05/9586b468b89bf98e3b62126f455ab15bea4a5f
deleted file mode 100644
index 08eb1a0d1..000000000
--- a/test/integration/staging/expected/repo/.git_keep/objects/05/9586b468b89bf98e3b62126f455ab15bea4a5f
+++ /dev/null
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/0b/6860367a6e7794985007cadf0aaf04c801e59e b/test/integration/staging/expected/repo/.git_keep/objects/0b/6860367a6e7794985007cadf0aaf04c801e59e
deleted file mode 100644
index 330f8f8f7..000000000
--- a/test/integration/staging/expected/repo/.git_keep/objects/0b/6860367a6e7794985007cadf0aaf04c801e59e
+++ /dev/null
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/3e/95c983db9349a26b20fccbdaa933e805ff817e b/test/integration/staging/expected/repo/.git_keep/objects/3e/95c983db9349a26b20fccbdaa933e805ff817e
deleted file mode 100644
index 2da57d308..000000000
--- a/test/integration/staging/expected/repo/.git_keep/objects/3e/95c983db9349a26b20fccbdaa933e805ff817e
+++ /dev/null
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/40/ce5b93f72e04cb876afaaf91398c2821260b95 b/test/integration/staging/expected/repo/.git_keep/objects/40/ce5b93f72e04cb876afaaf91398c2821260b95
deleted file mode 100644
index 8c6fa3ec6..000000000
--- a/test/integration/staging/expected/repo/.git_keep/objects/40/ce5b93f72e04cb876afaaf91398c2821260b95
+++ /dev/null
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/64/97d00f0447159947a805f3a38e8c44ed2865b1 b/test/integration/staging/expected/repo/.git_keep/objects/64/97d00f0447159947a805f3a38e8c44ed2865b1
new file mode 100644
index 000000000..181690514
--- /dev/null
+++ b/test/integration/staging/expected/repo/.git_keep/objects/64/97d00f0447159947a805f3a38e8c44ed2865b1
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/6f/7e9e66f080162af7ebab016d02550145cfda66 b/test/integration/staging/expected/repo/.git_keep/objects/6f/7e9e66f080162af7ebab016d02550145cfda66
deleted file mode 100644
index 729fbdfbc..000000000
--- a/test/integration/staging/expected/repo/.git_keep/objects/6f/7e9e66f080162af7ebab016d02550145cfda66
+++ /dev/null
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/73/f226ec630e261c016df5bd80e3156eaba42d7e b/test/integration/staging/expected/repo/.git_keep/objects/73/f226ec630e261c016df5bd80e3156eaba42d7e
new file mode 100644
index 000000000..95c2b37c3
--- /dev/null
+++ b/test/integration/staging/expected/repo/.git_keep/objects/73/f226ec630e261c016df5bd80e3156eaba42d7e
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/a4/7182dc057408b3c6b1749cb46db0e0c5fd626b b/test/integration/staging/expected/repo/.git_keep/objects/a4/7182dc057408b3c6b1749cb46db0e0c5fd626b
deleted file mode 100644
index 49bb3dd6b..000000000
--- a/test/integration/staging/expected/repo/.git_keep/objects/a4/7182dc057408b3c6b1749cb46db0e0c5fd626b
+++ /dev/null
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/a6/985076907d3ed64cf59480bb2eec313ea221cf b/test/integration/staging/expected/repo/.git_keep/objects/a6/985076907d3ed64cf59480bb2eec313ea221cf
new file mode 100644
index 000000000..0e957b419
--- /dev/null
+++ b/test/integration/staging/expected/repo/.git_keep/objects/a6/985076907d3ed64cf59480bb2eec313ea221cf
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/ac/43b10fa95a2d2ee6a028c0d0ea878f887d7c51 b/test/integration/staging/expected/repo/.git_keep/objects/ac/43b10fa95a2d2ee6a028c0d0ea878f887d7c51
new file mode 100644
index 000000000..2b24d35c6
--- /dev/null
+++ b/test/integration/staging/expected/repo/.git_keep/objects/ac/43b10fa95a2d2ee6a028c0d0ea878f887d7c51
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/b6/77e3e5777e122a22ebb001532c5017b199b0c0 b/test/integration/staging/expected/repo/.git_keep/objects/b6/77e3e5777e122a22ebb001532c5017b199b0c0
deleted file mode 100644
index a50f73636..000000000
--- a/test/integration/staging/expected/repo/.git_keep/objects/b6/77e3e5777e122a22ebb001532c5017b199b0c0
+++ /dev/null
@@ -1,2 +0,0 @@
-xMn0 ;)NN@L:m 'Dp["O')4EC3<|8J4F&\WBXh07|^r0BQ88XCA=Iu>#>7Y|\OEotD=FƓ&mHDVR+q%)\KǛ#;dHaOB6
-Q» 8h*%KM}Q2"HGkϟ[`:DBUuJO=+4<3Zpo~lFU<WJy߯FMdqn&E۞8|m/)x_ 87עJU (?"#o -΢@ \ No newline at end of file
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/b7/9b845289f08703b6ffb8927da9665efda4356f b/test/integration/staging/expected/repo/.git_keep/objects/b7/9b845289f08703b6ffb8927da9665efda4356f
new file mode 100644
index 000000000..734b08fe0
--- /dev/null
+++ b/test/integration/staging/expected/repo/.git_keep/objects/b7/9b845289f08703b6ffb8927da9665efda4356f
@@ -0,0 +1,2 @@
+x==0So+7"j`)q$9
+,!rœ$ @7NxyyrIn݄X%pGP?7xM=D F%bY5?M9|\q 54|ttXpCq~@mԥ'ҙQK(|U`=SNëeljS AJyubw%!I;B.j1A2aKy8scM`wLCt>#M(#$=?t-ֶw pz_^ElEťgVC ^yMwI??Dy:Z&ފ'VU;&3;lIW:'i8 hфo!ji FZ?< \ No newline at end of file
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/d6/9b45d6d14e1864411d17930012210271c400c3 b/test/integration/staging/expected/repo/.git_keep/objects/d6/9b45d6d14e1864411d17930012210271c400c3
new file mode 100644
index 000000000..b8ca4e19d
--- /dev/null
+++ b/test/integration/staging/expected/repo/.git_keep/objects/d6/9b45d6d14e1864411d17930012210271c400c3
@@ -0,0 +1,2 @@
+x=;0Dhd 8hSbK$b0$.ҘjMA'<?tI< WU},KᎺ(~)n4GJዃۈY5?M9|\IΧcКX;H~YA:I8?_7 QS@_c/#&
+k#g*"j)E ujS AJ{ub7%.v8R/1A2aKy8scM7awBG>#M#vo ?t=>ֶx pu;//"vC<ߵgVC ^x]I??F=}IJ!NmM;ϳ)aOZ-߽ Ѣ $-Vv \ No newline at end of file
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/dc/02541428fdc15b30bd2174fcbcd43d388eab82 b/test/integration/staging/expected/repo/.git_keep/objects/dc/02541428fdc15b30bd2174fcbcd43d388eab82
deleted file mode 100644
index 232769986..000000000
--- a/test/integration/staging/expected/repo/.git_keep/objects/dc/02541428fdc15b30bd2174fcbcd43d388eab82
+++ /dev/null
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/e7/86ecad3cea3651947e6c2648f6dae87372276b b/test/integration/staging/expected/repo/.git_keep/objects/e7/86ecad3cea3651947e6c2648f6dae87372276b
new file mode 100644
index 000000000..b70a7418c
--- /dev/null
+++ b/test/integration/staging/expected/repo/.git_keep/objects/e7/86ecad3cea3651947e6c2648f6dae87372276b
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/objects/eb/38d1e424df18868f73407ca8087b6350b59f3e b/test/integration/staging/expected/repo/.git_keep/objects/eb/38d1e424df18868f73407ca8087b6350b59f3e
new file mode 100644
index 000000000..185fa81ec
--- /dev/null
+++ b/test/integration/staging/expected/repo/.git_keep/objects/eb/38d1e424df18868f73407ca8087b6350b59f3e
Binary files differ
diff --git a/test/integration/staging/expected/repo/.git_keep/refs/heads/master b/test/integration/staging/expected/repo/.git_keep/refs/heads/master
index 9da93ce1c..a5323f973 100644
--- a/test/integration/staging/expected/repo/.git_keep/refs/heads/master
+++ b/test/integration/staging/expected/repo/.git_keep/refs/heads/master
@@ -1 +1 @@
-0b6860367a6e7794985007cadf0aaf04c801e59e
+a6985076907d3ed64cf59480bb2eec313ea221cf
diff --git a/test/integration/staging/expected/repo/three.txt b/test/integration/staging/expected/repo/three.txt
index 3158e329a..500ce9c2b 100644
--- a/test/integration/staging/expected/repo/three.txt
+++ b/test/integration/staging/expected/repo/three.txt
@@ -9,17 +9,18 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/loaders"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/config"
- "github.com/jesseduffield/lazygit/pkg/gui/filetree"
+ "github.com/jesseduffield/lazygit/pkg/gui/nodetree"
"github.com/jesseduffield/lazygit/pkg/utils"
)
// list panel functions
+func (gui *Gui) getSelectednodeNode() *nodetree.nodeNode {
+ selectedLine := gui.State.Panels.nodes.SelectedLineIdx
if selectedLine == -1 {
return nil
}
- return gui.State.FileManager.GetItemAtIndex(selectedLine)
return gui.State.nodeManager.GetItemAtIndex(selectedLine)
}
@@ -40,8 +41,6 @@ func (gui *Gui) getSelectedPath() string {
return node.GetPath()
}
-func (gui *Gui) filesRenderToMain() error {
- node := gui.getSelectedFileNode()
func (gui *Gui) nodesRenderToMain() error {
node := gui.getSelectednodeNode()
diff --git a/test/integration/staging/expected/repo/two.txt b/test/integration/staging/expected/repo/two.txt
index b4ebbd4f1..73f226ec6 100644
--- a/test/integration/staging/expected/repo/two.txt
+++ b/test/integration/staging/expected/repo/two.txt
@@ -5,8 +5,8 @@ type createMenuOptions struct {
func (gui *Gui) createMenu(title string, items []*menuItem, createMenuOptions createMenuOptions) error {
if createMenuOptions.showCancel {
// this is mutative but I'm okay with that for now
- items = app(items, &menuItem{
- d: []string{gui.Tr.LcCancel},
+ items = append(items, &menuItem{
+ displayStrings: []string{gui.Tr.LcCancel},
onPress: func() error {
return nil
},
@@ -16,8 +16,8 @@ func (gui *Gui) createMenu(title string, items []*menuItem, createMenuOptions cr
gui.State.MenuItems = items
stringArrays := make([][]string, len(items))
- for i, items := range items {
- if items.opensMenu && item.displayStrings != nil {
+ for i, item := range items {
+ if item.opensMenu && item.displayStrings != nil {
return errors.New("Message for the developer of this app: you've set opensMenu with displaystrings on the menu panel. Bad developer!. Apologies, user")
}
@@ -26,8 +26,8 @@ func (gui *Gui) createMenu(title string, items []*menuItem, createMenuOptions cr
if item.opensMenu {
styledStr = opensMenuStyle(styledStr)
}
- stringArrays[i] = []string{styledStr}
+ stringArrays[0] = []str0ng{styledStr}
} else {
- stringArrays[i] = item.displayStrings
+ str0ngArrays[0] = item.displayStrings
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 19:31:59 +0000