diff locally

4 files changed, 80 insertions, 64 deletions

diff --git a/.gitmodules b/.gitmodules
index 460084b..b3a70fb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "vkBeautify"]
-	path = vkBeautify
-	url = https://github.com/vkiryukhin/vkBeautify
 [submodule "octokat.js"]
 	path = octokat.js
 	url = https://github.com/philschatz/octokat.js
diff --git a/github.js b/github.js
index f043b41..3d46578 100644
--- a/github.js
+++ b/github.js
@@ -156,70 +156,88 @@ GitHubBackend.prototype.saveProject = function (commitMessage, parentCommitSha,
                 }
             });
 
-            pushChanges = function () {
+            pushChanges = function (codeData, parentCSha) {
                 if (myself.gh !== null) {
                     writeChanges = function (code, pcSha) {
-                        myself.upload([
-                            {
-                                "name": "snap.xml",
-                                "data": data
-                            },
-                            {
-                                "name": "README.md",
-                                "data": ide.projectNotes
-                            }], ide.projectName, pcSha, commitMessage,
-                            function (commit) {
-                                myself.gh.repos(myself.username, ide.projectName).compare(pcSha, commit.sha).fetch().then(
-                                    function (result) {
-                                        var newcode = "", newnotes = "";
-                                        var dmp = new diff_match_patch();
-                                        var patch, text;
+                        myself.gh.repos(myself.username, ide.projectName).commits.fetch().then(
+                            function (commits) {
+                                if (commits[0].sha !== pcSha) { // if the local copy is outdated
+                                    myself.gh.repos(myself.username, ide.projectName).contents('snap.xml').fetch({ref: pcSha}).then(
+                                        function (parentCodeFile) {
+                                            myself.gh.repos(myself.username, ide.projectName).contents('README.md').fetch({ref: pcSha}).then(
+                                                function (parentNotesFile) {
+                                                    myself.gh.repos(myself.username, ide.projectName).contents('snap.xml').fetch().then(
+                                                        function (headCodeFile) {
+                                                            myself.gh.repos(myself.username, ide.projectName).contents('README.md').fetch().then(
+                                                                function (headNoteFile) {
+                                                                    var localCode = codeData, localNotes = ide.projectNotes;
+                                                                    var parentCode = atob(parentCodeFile.content), parentNotes = atob(parentNotesFile.content);
+                                                                    var headCode = atob(headCodeFile.content), headNotes = atob(headNoteFile.content);
+                                                                    var dmp = new diff_match_patch();
+                                                                    var codePatch, notePatch;
 
-                                        result.files.forEach(
-                                            function (file) {
-                                                text = file.patch.replace(/\\ No newline at end of file/g, '');
-                                                if (file.filename === "snap.xml") {
-                                                    patch = dmp.patch_fromText(text);
-                                                    newcode = dmp.patch_apply(patch, code)[0];
-                                                } else if (file.filename === "README.md") {
-                                                    patch = dmp.patch_fromText(text);
-                                                    newnotes = dmp.patch_apply(patch, code)[0];
-                                                }
-                                            }
-                                        );
+                                                                    // diff parent <-> local
+                                                                    codePatch = dmp.patch_make(parentCode, localCode);
+                                                                    notePatch = dmp.patch_make(parentNotes, localNotes);
+                                                                    console.log(dmp.patch_toText(codePatch));//DEBUG
+                                                                    // patch (parent<->local) => head
+                                                                    localCode = dmp.patch_apply(codePatch, headCode)[0];
+                                                                    localNotes = dmp.patch_apply(notePatch, headNotes)[0];
+
+                                                                    // perform a `git merge`
+                                                                    // TODO TODO TODO 422 Not a fast-forward
 
-                                        myself.upload([
-                                            {
-                                                "name": "snap.xml",
-                                                "data": newcode
-                                            },
-                                            {
-                                                "name": "README.md",
-                                                "data": newnotes
-                                            }], ide.projectName, commit.sha, commitMessage,
-                                            function (commit) {
-                                                myself.gh.repos(myself.username, ide.projectName).git.refs('heads/master').update({sha: commit.sha}).then(
-                                                    function () {
-                                                        callBack.call();
-                                                    }
-                                                );
-                                            }
-                                        );
-                                    }
-                                );
+                                                                    myself.upload([
+                                                                        {
+                                                                            "name": "snap.xml",
+                                                                            "data": localCode
+                                                                        },
+                                                                        {
+                                                                            "name": "README.md",
+                                                                        "data": localNotes
+                                                                        }], ide.projectName, commits[0].sha, commitMessage,
+                                                                        function (mergecommit) {
+                                                                            myself.gh.repos(myself.username, ide.projectName).git.refs('heads/master').update({sha: mergecommit.sha}).then(
+                                                                                function () {
+                                                                                    callBack.call();
+                                                                                }
+                                                                            );
+                                                                        }
+                                                                    );
+                                                                }
+                                                            );
+                                                        }
+                                                    );
+                                                }
+                                            );
+                                        }
+                                    );
+                                } else {
+                                    // Fast-forward
+                                    myself.upload([
+                                        {
+                                            "name": "snap.xml",
+                                            "data": data
+                                        },
+                                        {
+                                            "name": "README.md",
+                                            "data": ide.projectNotes
+                                        }], ide.projectName, pcSha, commitMessage,
+                                        function (commit) {
+                                            myself.gh.repos(myself.username, ide.projectName).git.refs('heads/master').update({sha: commit.sha}).then(
+                                                function () {
+                                                    callBack.call();
+                                                }
+                                            );
+                                        }
+                                    );
+                                }
                             }
                         );
                     };
 
-
-
-                    if (parentCommitSha !== null) { // repo was just created
-                        myself.getProject(myself.username, ide.projectName,
-                            writeChanges,
-                            function (error) {
-                                errorCall.call(this, error, 'GitHub');
-                            }
-                        );
+                    if (parentCSha !== null) { // repo was just created
+                        writeChanges(codeData, parentCSha);
                     } else {
                         myself.gh.repos(myself.username, ide.projectName).commits.fetch().then(
                             function (commits) {
@@ -239,13 +257,15 @@ GitHubBackend.prototype.saveProject = function (commitMessage, parentCommitSha,
                     'auto_init': true,
                     'license_template': 'mit' // discuss
                 }).then(
-                    pushChanges,
+                    function () {
+                        pushChanges(data, null);
+                    },
                     function (error) {
                         errorCall.call(this, error, 'GitHub');
                     }
                 );
             } else {
-                pushChanges();
+                pushChanges(data, parentCommitSha);
             }
 
         },
diff --git a/snap.html b/snap.html
index 4ee8478..89e24aa 100755
--- a/snap.html
+++ b/snap.html
@@ -21,7 +21,6 @@
                 <script type="text/javascript" src="octokat.js/dist/octokat.js"></script>
                 <script type="text/javascript" src="github.js"></script>
 		<script type="text/javascript" src="sha512.js"></script>
-                <script type="text/javascript" src="vkBeautify/vkbeautify.js"></script>
                 <script type="text/javascript" src="google-diff-match-patch-js/diff_match_patch_uncompressed.js"></script>
 		<script type="text/javascript">
 			var world;
diff --git a/store.js b/store.js
index 56ead6c..f8d46bf 100644
--- a/store.js
+++ b/store.js
@@ -97,7 +97,7 @@ XML_Serializer.prototype.serialize = function (object) {
     this.flushMedia();
     xml = this.store(object);
     this.flush();
-    return vkbeautify.xml(xml);
+    return xml;
 };
 
 XML_Serializer.prototype.store = function (object, mediaID) {
@@ -135,7 +135,7 @@ XML_Serializer.prototype.mediaXML = function () {
         );
         xml = xml + str;
     });
-    return vkbeautify.xml(xml + '</media>');
+    return xml + '</media>';
 };
 
 XML_Serializer.prototype.add = function (object) {