1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
package commit
import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)
var DiscardOldFileChanges = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Discarding a range of files from an old commit.",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.CreateFileAndAdd("dir1/d1_file0", "file0\n")
shell.CreateFileAndAdd("dir1/subd1/subfile0", "file1\n")
shell.CreateFileAndAdd("dir2/d2_file1", "d2f1 content\n")
shell.CreateFileAndAdd("dir2/d2_file2", "d2f4 content\n")
shell.Commit("remove one file from this commit")
shell.UpdateFileAndAdd("dir2/d2_file1", "d2f1 content\nsecond line\n")
shell.DeleteFileAndAdd("dir2/d2_file2")
shell.CreateFileAndAdd("dir2/d2_file3", "d2f3 content\n")
shell.CreateFileAndAdd("dir2/d2_file4", "d2f2 content\n")
shell.Commit("remove four files from this commit")
shell.CreateFileAndAdd("dir1/fileToRemove", "file to remove content\n")
shell.CreateFileAndAdd("dir1/multiLineFile", "this file has\ncontent on\nthree lines\n")
shell.CreateFileAndAdd("dir1/subd1/file2ToRemove", "file2 to remove content\n")
shell.Commit("remove changes in multiple dirs from this commit")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits().
Focus().
Lines(
Contains("remove changes in multiple dirs from this commit").IsSelected(),
Contains("remove four files from this commit"),
Contains("remove one file from this commit"),
).
NavigateToLine(Contains("remove one file from this commit")).
PressEnter()
// Check removing a single file from an old commit
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ /").IsSelected(),
Equals(" ▼ dir1"),
Equals(" ▼ subd1"),
Equals(" A subfile0"),
Equals(" A d1_file0"),
Equals(" ▼ dir2"),
Equals(" A d2_file1"),
Equals(" A d2_file2"),
).
NavigateToLine(Contains("d1_file0")).
Press(keys.Universal.Remove)
t.ExpectPopup().Confirmation().
Title(Equals("Discard file changes")).
Content(Equals("Are you sure you want to remove changes to the selected file(s) from this commit?\n\nThis action will start a rebase, reverting these file changes. Be aware that if subsequent commits depend on these changes, you may need to resolve conflicts.\nNote: This will also reset any active custom patches.")).
Confirm()
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ /"),
Equals(" ▼ dir1/subd1"),
Equals(" A subfile0"),
Equals(" ▼ dir2"),
Equals(" A d2_file1").IsSelected(),
Equals(" A d2_file2"),
).
PressEscape()
// Check removing 4 files in the same directory
t.Views().Commits().
Focus().
Lines(
Contains("remove changes in multiple dirs from this commit"),
Contains("remove four files from this commit"),
Contains("remove one file from this commit").IsSelected(),
).
NavigateToLine(Contains("remove four files from this commit")).
PressEnter()
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir2").IsSelected(),
Equals(" M d2_file1"),
Equals(" D d2_file2"),
Equals(" A d2_file3"),
Equals(" A d2_file4"),
).
NavigateToLine(Contains("d2_file1")).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("d2_file4")).
Press(keys.Universal.Remove)
t.ExpectPopup().Confirmation().
Title(Equals("Discard file changes")).
Content(Equals("Are you sure you want to remove changes to the selected file(s) from this commit?\n\nThis action will start a rebase, reverting these file changes. Be aware that if subsequent commits depend on these changes, you may need to resolve conflicts.\nNote: This will also reset any active custom patches.")).
Confirm()
t.Views().CommitFiles().
IsFocused().
Lines(
Contains("(none)"),
).
PressEscape()
// Check removing multiple files from 2 directories w/ a custom patch.
// This checks node selection logic & if the custom patch is getting reset.
t.Views().Commits().
IsFocused().
Lines(
Contains("remove changes in multiple dirs from this commit"),
Contains("remove four files from this commit").IsSelected(),
Contains("remove one file from this commit"),
).
NavigateToLine(Contains("remove changes in multiple dirs from this commit")).
PressEnter()
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir1").IsSelected(),
Equals(" ▼ subd1"),
Equals(" A file2ToRemove"),
Equals(" A fileToRemove"),
Equals(" A multiLineFile"),
).
NavigateToLine(Contains("multiLineFile")).
PressEnter()
t.Views().PatchBuilding().
IsFocused().
SelectedLine(
Contains("+this file has"),
).
PressPrimaryAction().
PressEscape()
t.Views().CommitFiles().
IsFocused().
Lines(
Equals("▼ dir1"),
Equals(" ▼ subd1"),
Equals(" A file2ToRemove"),
Equals(" A fileToRemove"),
Equals(" ◐ multiLineFile").IsSelected(),
).
NavigateToLine(Contains("dir1")).
Press(keys.Universal.ToggleRangeSelect).
NavigateToLine(Contains("subd1")).
Press(keys.Universal.Remove)
t.ExpectPopup().Confirmation().
Title(Equals("Discard file changes")).
Content(Equals("Are you sure you want to remove changes to the selected file(s) from this commit?\n\nThis action will start a rebase, reverting these file changes. Be aware that if subsequent commits depend on these changes, you may need to resolve conflicts.\nNote: This will also reset any active custom patches.")).
Confirm()
// "Building patch" will still be in this view if the patch isn't reset properly
t.Views().Information().Content(DoesNotContain("Building patch"))
t.Views().CommitFiles().
IsFocused().
Lines(
Contains("(none)"),
)
},
})
|
