//.... commit!!!
imports.GitMonitor.GitMonitor.pause();
+
+
+
+ var msg = new Gtk.MessageDialog( {
+ buttons : Gtk.ButtonsType.NONE,
+ text: "Committing Changes"
+ });
+
+ msg.set_transient_for(Merger.el);
+ msg.set_modal(true);
+ msg.show_all();
+
+
+
try {
Merger.repo.checkout(model.release);
});
-
+
} catch (e) {
//message..
-
- var msg = new Gtk.MessageDialog({
+ msg.hide();
+
+ var emsg = new Gtk.MessageDialog({
message_type: Gtk.MessageType.ERROR,
buttons : Gtk.ButtonsType.OK,
text: e.message
});
- msg.run();
- msg.destroy();
+ emsg.set_transient_for(Merger.el);
+ emsg.set_modal(true);
+ emsg.run();
+ emsg.destroy();
Merger.repo.stash(); // revert change.. - so we can go back...
}
+ msg.show_all();
+ msg.set_markup("Changing to previous branch");
Merger.repo.checkout(model.working);
// if gitlive was previously running warn the user that it is now paused..
-
+ /*
var cmsg = new Gtk.MessageDialog({
message_type: Gtk.MessageType.ERROR,
buttons : Gtk.ButtonsType.OK,
});
cmsg.run();
cmsg.destroy();
-
- imports.GitMonitor.GitMonitor.resume();
-
+ */
+ var _t = this;
+ GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, function() {
+ imports.GitMonitor.GitMonitor.resume();
+ msg.hide();
+ msg.destroy();
+ _t.get('/historyTreeStore').loadTree();
+ _t.get('/changedFilesStore').el.clear();
+ _t.get('/patchview').showDiff(files);
+ return false; //only once.
+ });