Skip to content

Commit be111f0

Browse files
committed
Fix all lint errors
1 parent 4538e6d commit be111f0

File tree

5 files changed

+50
-42
lines changed

5 files changed

+50
-42
lines changed

lib/repository.js

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
11
var git = require("../");
2-
var util = require("./util");
3-
var Refs = require("./reference");
42
var normalizeOid = require("./util/normalize_oid");
53

4+
var TreeBuilder = git.Treebuilder;
65
var Commit = git.Commit;
76
var Revwalk = git.Revwalk;
8-
var Repo = git.Repository;
7+
var Repository = git.Repository;
98
var Blob = git.Blob;
109
var Tree = git.Tree;
1110
var Reference = git.Reference;
1211

13-
// Backwards compatibility.
14-
Object.defineProperty(git, "Repo", {
15-
value: Repo,
16-
enumerable: false
17-
});
18-
1912
/**
2013
* Look up a branch"s most recent commit.
2114
*
2215
* @param {String} name Branch name, e.g. "master"
2316
* @param {Function} callback
2417
* @return {Branch}
2518
*/
26-
Repo.prototype.getBranch = function(name, callback) {
19+
Repository.prototype.getBranch = function(name, callback) {
2720
var repository = this;
2821

2922
return this.getReference("refs/heads/" + name).then(function(reference) {
@@ -44,14 +37,18 @@ Repo.prototype.getBranch = function(name, callback) {
4437
* @param {Function} callback
4538
* @return {Reference}
4639
*/
47-
Repo.prototype.getReference = function(name, callback) {
40+
Repository.prototype.getReference = function(name, callback) {
4841
var repository = this;
4942

5043
return Reference.lookup(this, name).then(function(reference) {
5144
if (reference.type() == Reference.Type.Symbolic) {
5245
return reference.resolve(function (error, reference) {
53-
if (error) return callback(error);
46+
if (error) {
47+
return callback(error);
48+
}
49+
5450
reference.repo = repository;
51+
5552
if (callback) {
5653
callback(null, reference);
5754
}
@@ -74,7 +71,7 @@ Repo.prototype.getReference = function(name, callback) {
7471
* @param {Function} callback
7572
* @return {Commit}
7673
*/
77-
Repo.prototype.getCommit = function(oid, callback) {
74+
Repository.prototype.getCommit = function(oid, callback) {
7875
oid = normalizeOid(oid);
7976

8077
var repository = this;
@@ -97,7 +94,7 @@ Repo.prototype.getCommit = function(oid, callback) {
9794
* @param {Function} callback
9895
* @return {Blob}
9996
*/
100-
Repo.prototype.getBlob = function(oid, callback) {
97+
Repository.prototype.getBlob = function(oid, callback) {
10198
oid = normalizeOid(oid);
10299

103100
var repository = this;
@@ -120,7 +117,7 @@ Repo.prototype.getBlob = function(oid, callback) {
120117
* @param {Function} callback
121118
* @return {Tree}
122119
*/
123-
Repo.prototype.getTree = function(oid, callback) {
120+
Repository.prototype.getTree = function(oid, callback) {
124121
oid = normalizeOid(oid);
125122

126123
var repository = this;
@@ -144,7 +141,7 @@ Repo.prototype.getTree = function(oid, callback) {
144141
* @param {Function} callback
145142
* @return {Tag}
146143
*/
147-
Repo.prototype.getTag = function(oid, callback) {
144+
Repository.prototype.getTag = function(oid, callback) {
148145
oid = normalizeOid(oid);
149146

150147
var repository = this;
@@ -161,14 +158,14 @@ Repo.prototype.getTag = function(oid, callback) {
161158
};
162159

163160
/**
164-
* Instantiate a new revision walker for browsing the Repo"s history.
161+
* Instantiate a new revision walker for browsing the Repository"s history.
165162
* See also `Commit.prototype.history()`
166163
*
167164
* @param {String|Oid} String sha or Oid
168165
* @param {Function} callback
169166
* @return {RevWalk}
170167
*/
171-
Repo.prototype.createRevWalk = function() {
168+
Repository.prototype.createRevWalk = function() {
172169
var revWalk = Revwalk.createRevwalk(this);
173170
revWalk.repo = this;
174171
return revWalk;
@@ -180,7 +177,7 @@ Repo.prototype.createRevWalk = function() {
180177
* @param {Function} callback
181178
* @return {Branch}
182179
*/
183-
Repo.prototype.getMaster = function(callback) {
180+
Repository.prototype.getMaster = function(callback) {
184181
this.getBranch("master", callback);
185182
};
186183

@@ -196,7 +193,9 @@ Repo.prototype.getMaster = function(callback) {
196193
* @param {Function} callback
197194
* @return {Oid} The oid of the commit
198195
*/
199-
Repo.prototype.createCommit = function(updateRef, author, committer, message, tree, parents, callback) {
196+
Repository.prototype.createCommit = function(
197+
// FIXME
198+
updateRef, author, committer, message, tree, parents, callback) {
200199
if (tree instanceof Tree) {
201200
Commit.createCommit.call(
202201
this,
@@ -211,7 +210,10 @@ Repo.prototype.createCommit = function(updateRef, author, committer, message, tr
211210
} else {
212211
var self = this;
213212
this.getTree(tree, function(error, tree) {
214-
if (error) return callback(error);
213+
if (error) {
214+
return callback(error);
215+
}
216+
215217
Commit.createCommit.call(
216218
self,
217219
updateRef,
@@ -233,7 +235,7 @@ Repo.prototype.createCommit = function(updateRef, author, committer, message, tr
233235
* @param {Function} callback
234236
* @return {Blob}
235237
*/
236-
Repo.prototype.createBlobFromBuffer = function(buffer, callback) {
238+
Repository.prototype.createBlobFromBuffer = function(buffer, callback) {
237239
Blob.createFrombuffer.call(this, buffer, buffer.length, callback);
238240
};
239241

@@ -243,11 +245,11 @@ Repo.prototype.createBlobFromBuffer = function(buffer, callback) {
243245
* @param {Tree} tree
244246
* @param {Function} callback
245247
*/
246-
Repo.prototype.treeBuilder = function(callback) {
248+
Repository.prototype.treeBuilder = function(callback) {
247249
var builder = TreeBuilder.create(null);
248250
builder.root = builder;
249251
builder.repo = this;
250252
return builder;
251253
};
252254

253-
module.exports = Repo;
255+
module.exports = Repository;

lib/revwalk.js

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ Revwalk.Sort = {
2828
*/
2929
Revwalk.prototype.sorting = function() {
3030
var sort = 0;
31-
for (var i = 0; i < arguments.length; i++)
31+
32+
for (var i = 0; i < arguments.length; i++) {
3233
sort |= arguments[i];
34+
}
35+
3336
oldSorting.call(this, sort);
3437
};
3538

@@ -48,11 +51,18 @@ Revwalk.prototype.walk = function(oid, callback) {
4851

4952
function walk() {
5053
self.next(function revWalkNext(error, oid) {
51-
if (error) return callback(error);
52-
if (!oid) return callback();
54+
if (error) {
55+
return callback(error);
56+
}
57+
58+
if (!oid) {
59+
return callback();
60+
}
5361

5462
self.repo.getCommit(oid, function revWalkCommitLookup(error, commit) {
55-
if (error) return callback(error);
63+
if (error) {
64+
return callback(error);
65+
}
5666

5767
callback(null, commit);
5868
walk();

lib/tree.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ var git = require("../");
22
var Tree = git.Tree;
33
var TreeBuilder = git.Treebuilder;
44
var Diff = git.Diff;
5-
var DiffOptions = git.DiffOptions;
6-
var TreeEntry = require("./tree_entry");
75
var events = require("events");
8-
var path = require("path");
96

107
var oldBuilder = TreeBuilder.create;
118
var oldEntryByIndex = Tree.prototype.entryByindex;
@@ -66,7 +63,9 @@ Tree.prototype.getEntry = function(path, callback) {
6663
// rely on oldGetEntry, in order to ensure that `parent` pointers are direct.
6764
var self = this;
6865
oldGetEntry.call(this, path, function(error, entry) {
69-
if (error) return callback(error);
66+
if (error) {
67+
return callback(error);
68+
}
7069

7170
entry.parent = self;
7271
entry.path = function() { return path; };
@@ -88,22 +87,23 @@ Tree.prototype.entries = function() {
8887
};
8988

9089
/**
91-
* Recursively walk the tree in breadth-first order. Fires an event for each entry.
90+
* Recursively walk the tree in breadth-first order. Fires an event for each
91+
* entry.
9292
*
9393
* @fires Tree#entry
9494
* @fires Tree#end
9595
*
96-
* @param {Boolean} [blobsOnly = true] True to emit only blob & blob executable entries.
96+
* @param {Boolean} [blobsOnly = true] True to emit only blob & blob executable
97+
* entries.
9798
*
9899
* @return {EventEmitter}
99100
*/
100101
Tree.prototype.walk = function(blobsOnly) {
101102
blobsOnly = typeof blobsOnly === "boolean" ? blobsOnly : true;
102103

103-
var self = this,
104-
event = new events.EventEmitter(),
105-
entries = [],
106-
errors = [];
104+
var self = this;
105+
var event = new events.EventEmitter();
106+
var entries = [];
107107

108108
var total = 1;
109109

test/tests/blob.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
var assert = require("assert");
22
var path = require("path");
33

4-
var NodeGit = require("../../");
5-
64
describe("Blob", function() {
75
var reposPath = path.resolve("test/repos/workdir/.git");
86
var oid = "111dd657329797f6165f52f5085f61ac976dcf04";

test/tests/commit.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ describe("Commit", function() {
88
var reposPath = path.resolve("test/repos/workdir/.git");
99
var oid = "fce88902e66c72b5b93e75bdb5ae717038b221f6";
1010

11-
var Commit = require("../../lib/commit");
12-
1311
beforeEach(function() {
1412
var test = this;
1513

0 commit comments

Comments
 (0)