forked from nodegit/nodegit
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathcheckout.js
More file actions
189 lines (157 loc) · 5.41 KB
/
checkout.js
File metadata and controls
189 lines (157 loc) · 5.41 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
var assert = require("assert");
var path = require("path");
var fse = require("fs-extra");
var local = path.join.bind(path, __dirname);
describe("Checkout", function() {
var NodeGit = require("../../");
var Repository = NodeGit.Repository;
var Checkout = NodeGit.Checkout;
var readMeName = "README.md";
var packageJsonName = "package.json";
var reposPath = local("../repos/workdir");
var readMePath = local("../repos/workdir/" + readMeName);
var packageJsonPath = local("../repos/workdir/" + packageJsonName);
var checkoutBranchName = "checkout-test";
beforeEach(function() {
var test = this;
return Repository.open(reposPath)
.then(function(repo) {
test.repository = repo;
});
});
it("can checkout the head", function() {
var test = this;
return Checkout.head(test.repository)
.then(function(blob) {
var packageContent = fse.readFileSync(packageJsonPath, "utf-8");
assert.ok(~packageContent.indexOf("\"ejs\": \"~1.0.0\","));
});
});
it("can force checkout a single file", function() {
var test = this;
var packageContent = fse.readFileSync(packageJsonPath, "utf-8");
var readmeContent = fse.readFileSync(readMePath, "utf-8");
assert.notEqual(packageContent, "");
assert.notEqual(readmeContent, "");
fse.outputFileSync(readMePath, "");
fse.outputFileSync(packageJsonPath, "");
var opts = {
checkoutStrategy: Checkout.STRATEGY.FORCE,
paths: packageJsonName
};
return Checkout.head(test.repository, opts)
.then(function() {
var resetPackageContent = fse.readFileSync(packageJsonPath, "utf-8");
var resetReadmeContent = fse.readFileSync(readMePath, "utf-8");
assert.equal(resetPackageContent, packageContent);
assert.equal(resetReadmeContent, "");
var resetOpts = {
checkoutStrategy: Checkout.STRATEGY.FORCE
};
return Checkout.head(test.repository, resetOpts);
}).then(function() {
var resetContent = fse.readFileSync(readMePath, "utf-8");
assert.equal(resetContent, readmeContent);
});
});
it("can checkout by tree", function() {
var test = this;
return test.repository.getTagByName("annotated-tag").then(function(tag) {
return Checkout.tree(test.repository, tag);
}).then(function() {
return test.repository.getHeadCommit();
}).then(function(commit) {
assert.equal(commit, "32789a79e71fbc9e04d3eff7425e1771eb595150");
});
});
it("can checkout a branch", function() {
var test = this;
return test.repository.checkoutBranch(checkoutBranchName)
.then(function() {
var packageContent = fse.readFileSync(packageJsonPath, "utf-8");
assert.ok(!~packageContent.indexOf("\"ejs\": \"~1.0.0\","));
})
.then(function() {
return test.repository.getStatus();
})
.then(function(statuses) {
assert.equal(statuses.length, 0);
})
.then(function() {
return test.repository.checkoutBranch("master");
})
.then(function() {
var packageContent = fse.readFileSync(packageJsonPath, "utf-8");
assert.ok(~packageContent.indexOf("\"ejs\": \"~1.0.0\","));
});
});
it("can checkout an index with conflicts", function() {
const test = this;
const testBranchName = "test";
let ourCommit;
let signature;
return test.repository.defaultSignature()
.then((signatureResult) => {
signature = signatureResult;
return test.repository.getBranchCommit(checkoutBranchName);
})
.then((commit) => {
ourCommit = commit;
return test.repository.createBranch(testBranchName, commit.id());
})
.then(() => {
return test.repository.checkoutBranch(testBranchName);
})
.then((branch) => {
fse.writeFileSync(packageJsonPath, "\n");
return test.repository.refreshIndex()
.then((index) => {
return index.addByPath(packageJsonName)
.then(() => {
return index.write();
})
.then(() => {
return index.writeTree();
});
});
})
.then((oid) => {
assert.equal(oid.toString(),
"85135ab398976a4d5be6a8704297a45f2b1e7ab2");
return test.repository.createCommit("refs/heads/" + testBranchName,
signature, signature, "we made breaking changes", oid, [ourCommit]);
})
.then((commit) => {
return Promise.all([
test.repository.getBranchCommit(testBranchName),
test.repository.getBranchCommit("master")
]);
})
.then((commits) => {
return NodeGit.Merge.commits(test.repository, commits[0], commits[1],
null);
})
.then((index) => {
assert.ok(index);
assert.ok(index.hasConflicts && index.hasConflicts());
return NodeGit.Checkout.index(test.repository, index);
})
.then(() => {
// Verify that the conflict has been written to disk
var conflictedContent = fse.readFileSync(packageJsonPath, "utf-8");
assert.ok(~conflictedContent.indexOf("<<<<<<< ours"));
assert.ok(~conflictedContent.indexOf("======="));
assert.ok(~conflictedContent.indexOf(">>>>>>> theirs"));
// Cleanup
var opts = {
checkoutStrategy: Checkout.STRATEGY.FORCE,
paths: packageJsonName
};
return Checkout.head(test.repository, opts);
})
.then(() => {
var finalContent = fse.readFileSync(packageJsonPath, "utf-8");
assert.equal(finalContent, "\n");
});
});
});