Skip to content
This repository has been archived by the owner on Sep 25, 2020. It is now read-only.

Commit

Permalink
[fix] Changed require('sys') to require('util') for compatibility wit…
Browse files Browse the repository at this point in the history
…h node v0.8
  • Loading branch information
blakmatrix committed Jun 23, 2012
1 parent 7070d8b commit 0fc4c2f
Show file tree
Hide file tree
Showing 28 changed files with 90 additions and 90 deletions.
10 changes: 5 additions & 5 deletions benchmarks/benchmark.js
@@ -1,6 +1,6 @@

var Repo = require('git/repo').Repo,
sys = require('sys'),
util = require('util'),
fs = require('fs'),
exec = require('child_process').exec;

Expand All @@ -14,7 +14,7 @@ var create_tmp_directory = function(clone_path, callback) {
// Copy the old directory to the new one
var child = exec('cp -R ' + clone_path + ' ' + tmp_path, function (error, stdout, stderr) {
if (error !== null) {
sys.puts('exec error: ' + error);
util.puts('exec error: ' + error);
return callback(error, null);
}
return callback(null, tmp_path);
Expand All @@ -25,7 +25,7 @@ var destroy_directory = function(directory, callback) {
// Copy the old directory to the new one
var child = exec('rm -rf ' + directory, function (error, stdout, stderr) {
if (error !== null) {
sys.puts('exec error: ' + error);
util.puts('exec error: ' + error);
return callback(error, null);
}
return callback(null, null);
Expand Down Expand Up @@ -125,7 +125,7 @@ var execute_process = function(type) {

var end_time = new Date();
var total_miliseconds = end_time.getTime() - start_time.getTime();
sys.puts("[" + type + "]::executed in: " + (total_miliseconds/1000) + " seconds");
util.puts("[" + type + "]::executed in: " + (total_miliseconds/1000) + " seconds");
// Delete the directory
destroy_directory(target_path, function(err, result) {});
});
Expand All @@ -144,7 +144,7 @@ if(process.argv.length > 2 && process.argv[2].match(/packobj|commits1|commits2|b
execute_process(process.argv[2]);
}
} else {
sys.puts("Please provide the benchmark you wish to run in the form <node benchmarks [packobj|commits1|commits2|big_revlist|log|diff|commit_diff|heads|all]>")
util.puts("Please provide the benchmark you wish to run in the form <node benchmarks [packobj|commits1|commits2|big_revlist|log|diff|commit_diff|heads|all]>")
}


4 changes: 2 additions & 2 deletions lib/diff/diff.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
SequenceCallbacks = require('./callbacks').SequenceCallbacks,
ContextChange = require('./change').ContextChange,
Change = require('./change').Change,
Expand Down Expand Up @@ -762,7 +762,7 @@ Difference.LCS.__normalize_patchset = function(patchset) {
});
}
} else {
throw "Cannot normalize the hunk: " + sys.inspect(hunk);
throw "Cannot normalize the hunk: " + util.inspect(hunk);
}
}));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/git/actor.js
@@ -1,4 +1,4 @@
var sys = require('sys');
var util = require('util');

Actor = exports.Actor = function(name, email) {
var _name = name, _email = email;
Expand Down
14 changes: 7 additions & 7 deletions lib/git/binary_parser.js
Expand Up @@ -222,25 +222,25 @@ p.encode_utf8 = function(s) {
};

p.pprint = function(s) {
var sys = require('sys');
var util = require('util');

for (var i=0; i<s.length; i++) {
if (s.charCodeAt(i)<32) {sys.puts(s.charCodeAt(i)+' : ');}
else {sys.puts(s.charCodeAt(i)+' : '+ s.charAt(i));}
if (s.charCodeAt(i)<32) {util.puts(s.charCodeAt(i)+' : ');}
else {util.puts(s.charCodeAt(i)+' : '+ s.charAt(i));}
}
};

p.hprint = function(s) {
var sys = require('sys');
var util = require('util');

for (var i=0; i<s.length; i++) {
if (s.charCodeAt(i)<32) {sys.puts(s.charCodeAt(i)+' : ');}
else {sys.puts(s.charCodeAt(i).toString(16)+' : '+ s.charAt(i));}
if (s.charCodeAt(i)<32) {util.puts(s.charCodeAt(i)+' : ');}
else {util.puts(s.charCodeAt(i).toString(16)+' : '+ s.charAt(i));}
}
};

p.hex = function(s) {
var sys = require('sys');
var util = require('util');
var string = ''

for (var i=0; i<s.length; i++) {
Expand Down
2 changes: 1 addition & 1 deletion lib/git/commit.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
Actor = require('./actor').Actor,
Diff = require('./diff').Diff;
Tree = require('./tree').Tree;
Expand Down
2 changes: 1 addition & 1 deletion lib/git/file_index.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
fs = require('fs');

var FileIndex = exports.FileIndex = function(repo_path, callback) {
Expand Down
4 changes: 2 additions & 2 deletions lib/git/file_window.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
fs = require('fs'),
Buffer = require('buffer').Buffer;

Expand Down Expand Up @@ -32,7 +32,7 @@ FileWindow.prototype.index = function(idx) {
offset = idx[0];
len = idx[1]
} else {
throw "invalid index param: " + sys.inspect(idx);
throw "invalid index param: " + util.inspect(idx);
}

// Seek position equivalent using a position in the read
Expand Down
2 changes: 1 addition & 1 deletion lib/git/git.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
fs = require('fs'),
GitFileOperations = require('./git_file_operations').GitFileOperations,
exec = require('child_process').exec,
Expand Down
4 changes: 2 additions & 2 deletions lib/git/git_file_operations.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
fs = require('fs'),
exec = require('child_process').exec;

Expand Down Expand Up @@ -117,7 +117,7 @@ GitFileOperations.fs_rmdir_r = function(dir, callback) {
// Copy the old directory to the new one
var child = exec('rm -rf ' + dir, function (error, stdout, stderr) {
if (error !== null) {
sys.puts('exec error: ' + error);
util.puts('exec error: ' + error);
return callback(error, null);
}
return callback(null, null);
Expand Down
2 changes: 1 addition & 1 deletion lib/git/git_index.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
Tree = require('./tree').Tree,
Config = require('./config').Config;

Expand Down
2 changes: 1 addition & 1 deletion lib/git/head.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
Commit = require('./commit').Commit;

var Head = exports.Head = function(name, commit) {
Expand Down
2 changes: 1 addition & 1 deletion lib/git/internal/git_blob.js
@@ -1,4 +1,4 @@
var sys = require('sys');
var util = require('util');

var GitBlob = exports.GitBlob = function(content, repository) {
var _content = content, _repository = repository;
Expand Down
4 changes: 2 additions & 2 deletions lib/git/internal/git_commit.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
UserInfo = require('../user_info').UserInfo;

var GitCommit = exports.GitCommit = function(tree, parent, author, committer, message, headers, repository) {
Expand Down Expand Up @@ -51,7 +51,7 @@ GitCommit.from_raw = function(raw_object, repository) {
committer = new UserInfo(value);
} else {
// Unknow header
sys.puts("unknow header '" + key + "' in commit " + raw_object.sha_hex())
util.puts("unknow header '" + key + "' in commit " + raw_object.sha_hex())
}
})

Expand Down
4 changes: 2 additions & 2 deletions lib/git/internal/git_tag.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
UserInfo = require('../user_info').UserInfo;

var GitTag = exports.GitTag = function(object, type, tag, tagger, message, repository) {
Expand Down Expand Up @@ -48,7 +48,7 @@ GitTag.from_raw = function(raw_object, repository) {
} else if(key == 'tagger') {
tagger = new UserInfo(value);
} else {
sys.puts("unknown header '" + key);
util.puts("unknown header '" + key);
}
});

Expand Down
2 changes: 1 addition & 1 deletion lib/git/internal/git_tree.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
BinaryParser = require('../binary_parser').BinaryParser,
DirectoryEntry = require('../internal/directory_entry').DirectoryEntry;

Expand Down
2 changes: 1 addition & 1 deletion lib/git/loose_storage.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
fs = require('fs'),
BinaryParser = require('./binary_parser').BinaryParser,
Zlib = require('../zlib/zlib').Zlib,
Expand Down
2 changes: 1 addition & 1 deletion lib/git/mime/mime_types.js
@@ -1,4 +1,4 @@
var sys = require('sys');
var util = require('util');

// All the mime types
var mime_definition = " # application/*\n\
Expand Down
2 changes: 1 addition & 1 deletion lib/git/pack_storage.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
fs = require('fs'),
Buffer = require('buffer').Buffer,
BinaryParser = require('./binary_parser').BinaryParser,
Expand Down
2 changes: 1 addition & 1 deletion lib/git/raw_object.js
@@ -1,5 +1,5 @@
var crypto = require('crypto'),
sys = require('sys'),
util = require('util'),
Buffer = require('buffer').Buffer,
BinaryParser = require('./binary_parser').BinaryParser;

Expand Down
2 changes: 1 addition & 1 deletion lib/git/repo.js
Expand Up @@ -2,7 +2,7 @@ var Head = require('./head').Head,
Git = require('./git').Git,
Commit = require('./commit').Commit,
fs = require('fs'),
sys = require('sys'),
util = require('util'),
Tree = require('./tree').Tree,
Blob = require('./blob').Blob,
Head = require('./head').Head,
Expand Down
2 changes: 1 addition & 1 deletion lib/git/repository.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
GitObject = require('./git_object').GitObject,
fs = require('fs'),
LooseStorage = require('./loose_storage').LooseStorage,
Expand Down
2 changes: 1 addition & 1 deletion lib/git/status.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
GitFileOperations = require('./git_file_operations').GitFileOperations,
StatusFile = require('./status_file').StatusFile;

Expand Down
2 changes: 1 addition & 1 deletion lib/git/status_file.js
@@ -1,4 +1,4 @@
var sys = require('sys');
var util = require('util');

var StatusFile = exports.StatusFile = function(repo , hash) {
var _repo = repo;
Expand Down
2 changes: 1 addition & 1 deletion lib/git/sub_module.js
@@ -1,4 +1,4 @@
var sys = require('sys');
var util = require('util');

var Submodule = exports.Submodule = function(repo, id, mode, name) {
var _repo = repo, _id = id, _mode = mode, _name = name;
Expand Down
2 changes: 1 addition & 1 deletion lib/git/tree.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
Submodule = require('./sub_module').Submodule,
Blob = require('./blob').Blob;

Expand Down
2 changes: 1 addition & 1 deletion lib/git/user_info.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
StringUtil = require('../sprintf/sprintf').StringUtil;

var UserInfo = exports.UserInfo = function(string) {
Expand Down

0 comments on commit 0fc4c2f

Please sign in to comment.