Merger.bjs

Merger.bjs
Merger.js
Merger.js

diff --git a/Merger.bjs b/Merger.bjs
index 36b4cbf..b279406 100644 (file)
--- a/Merger.bjs
+++ b/Merger.bjs
@@ -231,7 +231,7 @@
                                             "items": [
                                                 {
                                                     "listeners": {
-                                                        "clicked": "function (self) {\n    \n     \n     var model = this.get('/historyTreeStore');\n    \n    if (model.release === false) {\n        return;\n    }\n    \n \n    var files = this.get('/changedFilesView').files();\n    \n     if (!files.length) {\n        return; // error.!\n    }\n    var diff = Merger.repo.diff(files, model.release, model.rev);\n   \n   \n   print(\"history?\");\n   \n    \n    var history =  Merger.repo.history(files, 1, 'rev', model.rev);\n    \n    print(\"History\" + JSON.stringify(history, null,4));\n    \n    Commit = imports.Commit.Commit;\n\n    Commit.el.set_modal(true);\n    Commit.el.set_transient_for(Merger.el);\n\n    var ce = Commit.show({\n        repo : Merger.repo,\n        files : files,\n        release : model.release,\n        rev : model.rev,\n        author : history[0].changeby,\n        changed : history[0].changed_raw\n        \n    \n    });\n    if (ce === false ) {\n        return;\n    }\n    \n    \n    var diff = Merger.repo.diff(files, model.release, model.rev);\n    \n    \n    print(JSON.stringify(ce,null,4));\n    //.... commit!!!\n    \n    imports.gitlive.monitor.pause();\n    \n    Merger.repo.checkout(model.release);\n    \n    Merger.repo.applyPatch(diff);\n    \n    var author = Merger.repo.parseAuthor(ce.author);\n    \n    // add all the files..\n    Merger.repo.add(files);\n    Merger.repo.commit({\n        name    : author.name,\n        email   : author.email,\n        author  : ce.author,\n        changed : ce.changed,\n        reason  : ce.message\n        \n    });\n    \n    Merger.repo.checkout(model.working);\n    \n    imports.gitlive.monitor.resume();\n    \n    \n    \n    \n    \n    \n\n\n}"
+                                                        "clicked": "function (self) {\n    \n     \n     var model = this.get('/historyTreeStore');\n    \n    if (model.release === false) {\n        return;\n    }\n    \n \n    var files = this.get('/changedFilesView').files();\n    \n     if (!files.length) {\n        return; // error.!\n    }\n    var diff = Merger.repo.diff(files, model.release, model.rev);\n   \n   \n   print(\"history?\");\n   \n    \n    var history =  Merger.repo.history(files, 1, 'rev', model.rev);\n    \n    print(\"History\" + JSON.stringify(history, null,4));\n    \n    Commit = imports.Commit.Commit;\n\n    Commit.el.set_modal(true);\n    Commit.el.set_transient_for(Merger.el);\n\n    var ce = Commit.show({\n        repo : Merger.repo,\n        files : files,\n        release : model.release,\n        rev : model.rev,\n        author : history[0].changeby,\n        changed : history[0].changed_raw\n        \n    \n    });\n    if (ce === false ) {\n        return;\n    }\n    \n    \n    var diff = Merger.repo.diff(files, model.release, model.rev);\n    \n    \n    print(JSON.stringify(ce,null,4));\n    //.... commit!!!\n    \n    imports.GitMonitor.GitMonitor.pause();\n    \n    Merger.repo.checkout(model.release);\n    \n    Merger.repo.applyPatch(diff);\n    \n    var author = Merger.repo.parseAuthor(ce.author);\n    \n    // add all the files..\n    Merger.repo.add(files);\n    Merger.repo.commit({\n        name    : author.name,\n        email   : author.email,\n        author  : ce.author,\n        changed : ce.changed,\n        reason  : ce.message\n        \n    });\n    \n    Merger.repo.checkout(model.working);\n    \n   imports.GitMonitor.GitMonitor.resume();\n    \n    \n    \n    \n    \n    \n\n\n}"
                                                     },
                                                     "label": "Commit diff (no merge)",
                                                     "xtype": "Button",

diff --git a/Merger.js b/Merger.js
index 261cdb5..cf0e1d9 100644 (file)
--- a/Merger.js
+++ b/Merger.js
@@ -627,7 +627,7 @@ Merger=new XObject({
                                                     print(JSON.stringify(ce,null,4));
                                                     //.... commit!!!
                                                     
-                                                    imports.gitlive.monitor.pause();
+                                                    imports.GitMonitor.GitMonitor.pause();
                                                     
                                                     Merger.repo.checkout(model.release);
                                                     
@@ -648,7 +648,7 @@ Merger=new XObject({
                                                     
                                                     Merger.repo.checkout(model.working);
                                                     
-                                                    imports.gitlive.monitor.resume();
+                                                   imports.GitMonitor.GitMonitor.resume();