},
{
"listeners" : {
- "button_press_event" : "() => {\n _this.el.hide();\n return false;\n}"
+ "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"reset\" , \"--hard\" });\n _this.repo.loadStatus();\n GitMonitor.gitmonitor.start();\n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n Clones.singleton().reposStore.load();\n \n _this.el.hide();\n return false;\n}"
},
- "label" : "Ignore for now",
- "xtype" : "Button",
+ "label" : "Reset to remote",
"* pack" : "add",
+ "xtype" : "Button",
"$ xns" : "Gtk"
},
{
"listeners" : {
- "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"reset\" , \"--hard\" });\n _this.repo.loadStatus();\n GitMonitor.gitmonitor.start();\n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n Clones.singleton().reposStore.load();\n \n _this.el.hide();\n return false;\n}"
+ "button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"pull\" , \"--all\" });\n _this.repo.loadStatus();\n GitMonitor.gitmonitor.start();\n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n Clones.singleton().reposStore.load();\n \n _this.el.hide();\n return false;\n}"
},
- "label" : "Reset to remote",
- "* pack" : "add",
+ "label" : "Pull updates",
"xtype" : "Button",
+ "* pack" : "add",
"$ xns" : "Gtk"
},
{
"button_press_event" : "() => {\n \n \n GitMonitor.gitmonitor.stop();\n _this.repo.git({ \"pull\" , \"--all\" });\n _this.repo.loadStatus();\n GitMonitor.gitmonitor.start();\n _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n Clones.singleton().reposStore.load();\n \n _this.el.hide();\n return false;\n}"
},
"label" : "Pull updates",
- "xtype" : "Button",
"* pack" : "add",
+ "xtype" : "Button",
"$ xns" : "Gtk"
}
]
// my vars (dec)
// set gobject values
- this.el.label = "Ignore for now";
+ this.el.label = "Reset to remote";
//listeners
this.el.button_press_event.connect( () => {
- _this.el.hide();
- return false;
+
+
+ GitMonitor.gitmonitor.stop();
+ _this.repo.git({ "reset" , "--hard" });
+ _this.repo.loadStatus();
+ GitMonitor.gitmonitor.start();
+ _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
+ _this.status_view.el.get_buffer().set_text(_this.repo.git_status);
+ Clones.singleton().reposStore.load();
+
+ _this.el.hide();
+ return false;
});
}
// my vars (dec)
// set gobject values
- this.el.label = "Reset to remote";
+ this.el.label = "Pull updates";
//listeners
this.el.button_press_event.connect( () => {
GitMonitor.gitmonitor.stop();
- _this.repo.git({ "reset" , "--hard" });
+ _this.repo.git({ "pull" , "--all" });
_this.repo.loadStatus();
GitMonitor.gitmonitor.start();
_this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);