@@ -45,7 +45,7 @@ pub struct App {
4545 inspect_commit_popup : InspectCommitComponent ,
4646 external_editor_popup : ExternalEditorComponent ,
4747 push_popup : PushComponent ,
48- fetch_popup : PullComponent ,
48+ pull_popup : PullComponent ,
4949 tag_commit_popup : TagCommitComponent ,
5050 create_branch_popup : CreateBranchComponent ,
5151 rename_branch_popup : RenameBranchComponent ,
@@ -111,7 +111,7 @@ impl App {
111111 theme. clone ( ) ,
112112 key_config. clone ( ) ,
113113 ) ,
114- fetch_popup : PullComponent :: new (
114+ pull_popup : PullComponent :: new (
115115 & queue,
116116 sender,
117117 theme. clone ( ) ,
@@ -308,7 +308,7 @@ impl App {
308308 self . revlog . update_git ( ev) ?;
309309 self . inspect_commit_popup . update_git ( ev) ?;
310310 self . push_popup . update_git ( ev) ?;
311- self . fetch_popup . update_git ( ev) ?;
311+ self . pull_popup . update_git ( ev) ?;
312312
313313 //TODO: better system for this
314314 // can we simply process the queue here and everyone just uses the queue to schedule a cmd update?
@@ -330,7 +330,7 @@ impl App {
330330 || self . inspect_commit_popup . any_work_pending ( )
331331 || self . input . is_state_changing ( )
332332 || self . push_popup . any_work_pending ( )
333- || self . fetch_popup . any_work_pending ( )
333+ || self . pull_popup . any_work_pending ( )
334334 }
335335
336336 ///
@@ -356,7 +356,7 @@ impl App {
356356 inspect_commit_popup,
357357 external_editor_popup,
358358 push_popup,
359- fetch_popup ,
359+ pull_popup ,
360360 tag_commit_popup,
361361 create_branch_popup,
362362 rename_branch_popup,
@@ -554,7 +554,7 @@ impl App {
554554 flags. insert ( NeedsUpdate :: ALL )
555555 }
556556 InternalEvent :: Pull ( branch) => {
557- self . fetch_popup . fetch ( branch) ?;
557+ self . pull_popup . fetch ( branch) ?;
558558 flags. insert ( NeedsUpdate :: ALL )
559559 }
560560 } ;
@@ -617,7 +617,7 @@ impl App {
617617 || self . tag_commit_popup . is_visible ( )
618618 || self . create_branch_popup . is_visible ( )
619619 || self . push_popup . is_visible ( )
620- || self . fetch_popup . is_visible ( )
620+ || self . pull_popup . is_visible ( )
621621 || self . select_branch_popup . is_visible ( )
622622 || self . rename_branch_popup . is_visible ( )
623623 }
@@ -647,7 +647,7 @@ impl App {
647647 self . create_branch_popup . draw ( f, size) ?;
648648 self . rename_branch_popup . draw ( f, size) ?;
649649 self . push_popup . draw ( f, size) ?;
650- self . fetch_popup . draw ( f, size) ?;
650+ self . pull_popup . draw ( f, size) ?;
651651 self . reset . draw ( f, size) ?;
652652 self . msg . draw ( f, size) ?;
653653
0 commit comments