@@ -45,7 +45,7 @@ pub struct App {
45
45
inspect_commit_popup : InspectCommitComponent ,
46
46
external_editor_popup : ExternalEditorComponent ,
47
47
push_popup : PushComponent ,
48
- fetch_popup : PullComponent ,
48
+ pull_popup : PullComponent ,
49
49
tag_commit_popup : TagCommitComponent ,
50
50
create_branch_popup : CreateBranchComponent ,
51
51
rename_branch_popup : RenameBranchComponent ,
@@ -111,7 +111,7 @@ impl App {
111
111
theme. clone ( ) ,
112
112
key_config. clone ( ) ,
113
113
) ,
114
- fetch_popup : PullComponent :: new (
114
+ pull_popup : PullComponent :: new (
115
115
& queue,
116
116
sender,
117
117
theme. clone ( ) ,
@@ -308,7 +308,7 @@ impl App {
308
308
self . revlog . update_git ( ev) ?;
309
309
self . inspect_commit_popup . update_git ( ev) ?;
310
310
self . push_popup . update_git ( ev) ?;
311
- self . fetch_popup . update_git ( ev) ?;
311
+ self . pull_popup . update_git ( ev) ?;
312
312
313
313
//TODO: better system for this
314
314
// can we simply process the queue here and everyone just uses the queue to schedule a cmd update?
@@ -330,7 +330,7 @@ impl App {
330
330
|| self . inspect_commit_popup . any_work_pending ( )
331
331
|| self . input . is_state_changing ( )
332
332
|| self . push_popup . any_work_pending ( )
333
- || self . fetch_popup . any_work_pending ( )
333
+ || self . pull_popup . any_work_pending ( )
334
334
}
335
335
336
336
///
@@ -356,7 +356,7 @@ impl App {
356
356
inspect_commit_popup,
357
357
external_editor_popup,
358
358
push_popup,
359
- fetch_popup ,
359
+ pull_popup ,
360
360
tag_commit_popup,
361
361
create_branch_popup,
362
362
rename_branch_popup,
@@ -554,7 +554,7 @@ impl App {
554
554
flags. insert ( NeedsUpdate :: ALL )
555
555
}
556
556
InternalEvent :: Pull ( branch) => {
557
- self . fetch_popup . fetch ( branch) ?;
557
+ self . pull_popup . fetch ( branch) ?;
558
558
flags. insert ( NeedsUpdate :: ALL )
559
559
}
560
560
} ;
@@ -617,7 +617,7 @@ impl App {
617
617
|| self . tag_commit_popup . is_visible ( )
618
618
|| self . create_branch_popup . is_visible ( )
619
619
|| self . push_popup . is_visible ( )
620
- || self . fetch_popup . is_visible ( )
620
+ || self . pull_popup . is_visible ( )
621
621
|| self . select_branch_popup . is_visible ( )
622
622
|| self . rename_branch_popup . is_visible ( )
623
623
}
@@ -647,7 +647,7 @@ impl App {
647
647
self . create_branch_popup . draw ( f, size) ?;
648
648
self . rename_branch_popup . draw ( f, size) ?;
649
649
self . push_popup . draw ( f, size) ?;
650
- self . fetch_popup . draw ( f, size) ?;
650
+ self . pull_popup . draw ( f, size) ?;
651
651
self . reset . draw ( f, size) ?;
652
652
self . msg . draw ( f, size) ?;
653
653
0 commit comments