Skip to content

Commit 66d3bf4

Browse files
committed
Save progress before the tornado wipes my computer
1 parent bf7e398 commit 66d3bf4

17 files changed

+17
-89
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@
2828
[submodule "deps/leb128-frame"]
2929
path = deps/leb128-frame
3030
url = https://github.com/creationix/leb128-frame
31+
[submodule "app"]
32+
path = app
33+
url = git@github.com:creationix/js-git-app.git

app

Submodule app added at 7d15229

app/background.js

-16
This file was deleted.

app/icons/icon-128.png

-11.6 KB
Binary file not shown.

app/icons/icon-16.png

-826 Bytes
Binary file not shown.

app/icons/icon-256.png

-24.3 KB
Binary file not shown.

app/icons/icon-512.png

-55.1 KB
Binary file not shown.

app/index.html

-11
This file was deleted.

deps/bops

Submodule bops updated 1 file

deps/min-stream-chrome

deps/min-stream-helpers

deps/min-stream-pkt-line

app/main.js http-server.js

+2-18
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
11
"use strict";
22

3-
require('git-fs-html5')(function (err, fs) {
4-
if (err) throw err;
5-
window.fs = fs;
6-
require('git-db-fs')(fs, "/.gitdb", function (err, db) {
7-
if (err) throw err;
8-
window.db = db;
9-
});
10-
});
11-
12-
console.log(
13-
"Welcome to the js-git demo.\n" +
14-
"There are some global objects you can use to manipulate the sandbox.\n" +
15-
"They are `fs`, `git`, and `db`.\n" +
16-
"Use auto-complete to explore their capabilities"
17-
);
18-
19-
var tcp = require('min-stream-chrome');
3+
var tcp = require('min-stream-node');
204
var helpers = require('min-stream-helpers');
215
var http = require('min-stream-http-codec');
226

@@ -29,7 +13,7 @@ var app = function (respond) {
2913
statusCode: 200,
3014
headers: [
3115
"Content-Length", "12",
32-
"Server", navigator.userAgent,
16+
"Server", "node.js " + process.version,
3317
"Date", (new Date()).toUTCString()
3418
]
3519
});

manifest.json

-32
This file was deleted.

node-client.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var bops = require('bops');
88

99
function lsRemote(host, path) {
1010

11-
tcp.connect(host, 3000, function (err, client) {
11+
tcp.connect(host, 9418, function (err, client) {
1212
if (err) throw err;
1313

1414
console.log("Connected to %s, sending git-upload-pack request", host);
@@ -33,11 +33,10 @@ function lsRemote(host, path) {
3333
console.log({refs:refs,caps:caps});
3434
var clientCaps = [
3535
// "multi_ack_detailed",
36-
// "side-band-64k",
36+
"side-band-64k",
3737
// "thin-pack",
3838
// "ofs-delta",
3939
"agent=js-git/0.0.0"
40-
// "agent=git/1.8.1.2"
4140
];
4241
emit(null, pktLine.encode(["want", refs.HEAD].concat(clientCaps)));
4342
// emit(null, pktLine.encode(["want", refs["refs/heads/master"]]));
@@ -54,7 +53,7 @@ function lsRemote(host, path) {
5453
refs[message[1]] = message[0];
5554
},
5655
"pack": function (message) {
57-
56+
// throw new Error
5857
}
5958
};
6059
emit(null, pktLine.encode(["git-upload-pack", path], {host: host}, true));
@@ -72,4 +71,4 @@ function toString(value) {
7271
return bops.to(value);
7372
}
7473

75-
lsRemote("localhost", "/conquest.git");
74+
lsRemote("github.com", "/creationix/conquest.git");

proxy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ function onConnection(err, local) {
6363
helpers.run([
6464
helpers.joiner([
6565
helpers.mapToPull(function (item) {
66-
return [ "local", item ];
66+
return [ 0, item ];
6767
})(localGen()),
6868
helpers.mapToPull(function (item) {
69-
return [ "remote", item ];
69+
return [ 1, item ];
7070
})(remoteGen()),
7171
]),
7272
function (item) {

0 commit comments

Comments
 (0)