Save progress before the tornado wipes my computer

creationix · May 21, 2013 · 66d3bf4 · 66d3bf4
1 parent bf7e398
commit 66d3bf4
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 89 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "deps/leb128-frame"]
 	path = deps/leb128-frame
 	url = https://github.com/creationix/leb128-frame
+[submodule "app"]
+	path = app
+	url = git@github.com:creationix/js-git-app.git
diff --git a/app b/app
diff --git a/app/background.js b/app/background.js
diff --git a/app/icons/icon-128.png b/app/icons/icon-128.png
diff --git a/app/icons/icon-16.png b/app/icons/icon-16.png
diff --git a/app/icons/icon-256.png b/app/icons/icon-256.png
diff --git a/app/icons/icon-512.png b/app/icons/icon-512.png
diff --git a/app/index.html b/app/index.html
diff --git a/deps/bops b/deps/bops
diff --git a/deps/leb128-frame b/deps/leb128-frame
diff --git a/deps/min-stream-chrome b/deps/min-stream-chrome
diff --git a/deps/min-stream-helpers b/deps/min-stream-helpers
diff --git a/deps/min-stream-pkt-line b/deps/min-stream-pkt-line
diff --git a/app/main.js → http-server.js b/app/main.js → http-server.js
@@ -1,22 +1,6 @@
 "use strict";
 
-require('git-fs-html5')(function (err, fs) {
-  if (err) throw err;
-  window.fs = fs;
-  require('git-db-fs')(fs, "/.gitdb", function (err, db) {
-    if (err) throw err;
-    window.db = db;
-  });
-});
-
-console.log(
-  "Welcome to the js-git demo.\n" +
-  "There are some global objects you can use to manipulate the sandbox.\n" +
-  "They are `fs`, `git`, and `db`.\n" +
-  "Use auto-complete to explore their capabilities"
-);
-
-var tcp = require('min-stream-chrome');
+var tcp = require('min-stream-node');
 var helpers = require('min-stream-helpers');
 var http = require('min-stream-http-codec');
 
@@ -29,7 +13,7 @@ var app = function (respond) {
       statusCode: 200,
       headers: [
         "Content-Length", "12",
-        "Server", navigator.userAgent,
+        "Server", "node.js " + process.version,
         "Date", (new Date()).toUTCString()
       ]
     });

diff --git a/manifest.json b/manifest.json
diff --git a/node-client.js b/node-client.js
@@ -8,7 +8,7 @@ var bops = require('bops');
 
 function lsRemote(host, path) {
 
-  tcp.connect(host, 3000, function (err, client) {
+  tcp.connect(host, 9418, function (err, client) {
     if (err) throw err;
 
     console.log("Connected to %s, sending git-upload-pack request", host);
@@ -33,11 +33,10 @@ function lsRemote(host, path) {
           console.log({refs:refs,caps:caps});
           var clientCaps = [
             // "multi_ack_detailed",
-            // "side-band-64k",
+            "side-band-64k",
             // "thin-pack",
             // "ofs-delta",
             "agent=js-git/0.0.0"
-            // "agent=git/1.8.1.2"
           ];
           emit(null, pktLine.encode(["want", refs.HEAD].concat(clientCaps)));
           // emit(null, pktLine.encode(["want", refs["refs/heads/master"]]));
@@ -54,7 +53,7 @@ function lsRemote(host, path) {
         refs[message[1]] = message[0];
       },
       "pack": function (message) {
-
+        // throw new Error
       }
     };
     emit(null, pktLine.encode(["git-upload-pack", path], {host: host}, true));
@@ -72,4 +71,4 @@ function toString(value) {
   return bops.to(value);
 }
 
-lsRemote("localhost", "/conquest.git");
+lsRemote("github.com", "/creationix/conquest.git");
diff --git a/proxy.js b/proxy.js
@@ -63,10 +63,10 @@ function onConnection(err, local) {
       helpers.run([
         helpers.joiner([
           helpers.mapToPull(function (item) {
-            return [ "local", item ];
+            return [ 0, item ];
           })(localGen()),
           helpers.mapToPull(function (item) {
-            return [ "remote", item ];
+            return [ 1, item ];
           })(remoteGen()),
         ]),
         function (item) {
+6 −0		.travis.yml
+12 −0		README.md
+56 −16		leb128.js
+19 −9		package.json
+115 −0		test.js