gtkhotkey-0.2.1-patched.tgz

[gitlive] / Merger.js

diff --git a/Merger.js b/Merger.js
index 8995acb..ed605d4 100644 (file)
--- a/Merger.js
+++ b/Merger.js
@@ -629,6 +629,20 @@ Merger=new XObject({
                                                     //.... 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);
@@ -654,19 +668,24 @@ Merger=new XObject({
                                                             
                                                         });
                                                         
-                                                       
+                                                      
                                                     } 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);
                                                     
                                                     
@@ -683,8 +702,11 @@ Merger=new XObject({
                                                     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.
                                                     });