Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Started removing dust (manual merge of loose_storage.js and package.j…

…son)
  • Loading branch information...
commit 5c914992ede44141547f36fc20133eef9352f2c7 1 parent 69f5da5
@jankeromnes jankeromnes authored committed
View
10 lib/git/index.js
@@ -14,7 +14,7 @@
[
'zlib'
].forEach(function(path){
- var module = require('../zlib/' + path);
+ var module = require(path);
for (var i in module)
exports[i] = module[i];
});
@@ -35,11 +35,3 @@
exports[i] = module[i];
});
-[
- 'compress'
-].forEach(function(path){
- var module = require('compress');
- for (var i in module)
- exports[i] = module[i];
-});
-
View
6 lib/git/loose_storage.js
@@ -1,12 +1,10 @@
var util = require('util'),
fs = require('fs'),
BinaryParser = require('./binary_parser').BinaryParser,
- Zlib = require('../zlib/zlib').Zlib,
+ Zlib = require('zlib'),
RawObject = require('./raw_object').RawObject,
crypto = require('crypto');
-var compress = require('compress');
-
var OBJ_TYPES = [null, "commit", "tree", "blob", "tag"];
LooseStorage = exports.LooseStorage = function(directory) {
@@ -133,7 +131,7 @@ LooseStorage.prototype.put_raw_object = function(content, type) {
fs.statSync(path);
} catch(err) {
// Create gzip stream
- var gzip = new compress.Gzip;
+ var gzip = new Zlib.Gzip;
// Deflate the data
var data = gzip.deflate(store);
// File does not exist create the directory
View
4 lib/git/mime/mime_types.js
@@ -1242,7 +1242,7 @@ x-world/x-vrml @wrl,vrml"
// }x
// Crazy regex to match lines
-var crazy_regexp = /^([*])?(!)?(?:(\w+):)?([-\w.+]+)\/([-\w.+]*)(?:\s@([^\s]+))?(?:\s:((?:base64|7bit|8bit|quoted\-printable)))?(?:\s'(.+))?(?:\s=(.+))?$/x;
+var crazy_regexp = /^([*])?(!)?(?:(\w+):)?([-\w.+]+)\/([-\w.+]*)(?:\s@([^\s]+))?(?:\s:((?:base64|7bit|8bit|quoted\-printable)))?(?:\s'(.+))?(?:\s=(.+))?$/;
var media_type_re = /([-\w.+]+)\/([-\w.+]*)/;
var unreg_re = /[Xx]-/;
@@ -1364,7 +1364,7 @@ var parse_mimetypes = function() {
MimeTypes.type_for = function(filename, platform) {
if(filename) {
platform = platform == null ? false : platform;
- var ext = chomp(filename).toLowerCase().replace(/.*\./o, '');
+ var ext = chomp(filename).toLowerCase().replace(/.*\./, '');
var list = extension_index[ext];
// Filter out entries if we have a specific platform
if(platform) {
View
5 package.json
@@ -1,8 +1,9 @@
+<<<<<<< HEAD
{ "name" : "trentm-git"
, "description" : "A node.js library for git (a fork to publish some fixes to npm)"
, "version" : "0.1.3-1"
, "author" : "Christian Amor Kvalheim <christkv@gmail.com>"
-, "contributors" : []
+, "contributors" : [ "Jan Keromnes <janx@linux.com>" ]
, "repository" : { "type" : "git"
, "url" : "git@github.com:trentm/node-git.git" }
, "bugs" : { "mail" : "node-git@googlegroups.com"
@@ -14,7 +15,7 @@
, "main": "./lib/git/index"
, "directories" : { "lib" : "./lib/git" }
, "engines" : { "node" : ">=0.4.0" }
-, "dependencies": { "compress" : ">=0.1.6" }
+, "dependencies": { }
, "devDependencies":{ "nodeunit" : ">=0.5.1" }
, "licenses" : [ { "type" : "Apache License, Version 2.0"
, "url" : "http://www.apache.org/licenses/LICENSE-2.0" } ]
Please sign in to comment.
Something went wrong with that request. Please try again.