-
Notifications
You must be signed in to change notification settings - Fork 696
Expand file tree
/
Copy pathstash.js
More file actions
246 lines (227 loc) · 7.5 KB
/
stash.js
File metadata and controls
246 lines (227 loc) · 7.5 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
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
var assert = require("assert");
var path = require("path");
var promisify = require("promisify-node");
var fse = promisify(require("fs-extra"));
var local = path.join.bind(path, __dirname);
describe("Stash", function() {
var NodeGit = require("../../");
var Repository = NodeGit.Repository;
var Stash = NodeGit.Stash;
var reposPath = local("../repos/workdir");
before(function() {
var test = this;
return Repository.open(reposPath)
.then(function(repository) {
test.repository = repository;
});
});
it("gets no stashes on clean working directory", function() {
var stashes = [];
var stashCb = function(index, message, oid) {
stashes.push({index: index, message: message, oid: oid});
};
return Stash.foreach(this.repository, stashCb)
.then(function() {
assert.equal(stashes.length, 0);
});
});
it("can save and drop a stash", function() {
var fileName = "README.md";
var fileContent = "Cha-cha-cha-chaaaaaangessssss";
var repo = this.repository;
var filePath = path.join(repo.workdir(), fileName);
var oldContent;
var stashes = [];
var stashOid;
var stashMessage = "stash test";
return fse.readFile(filePath)
.then(function(content) {
oldContent = content;
return fse.writeFile(filePath, fileContent);
})
.then(function() {
return Stash.save(repo, repo.defaultSignature(), stashMessage, 0);
})
.then(function(oid) {
stashOid = oid;
var stashCb = function(index, message, oid) {
stashes.push({index: index, message: message, oid: oid});
};
return Stash.foreach(repo, stashCb);
})
.then(function() {
assert.equal(stashes.length, 1);
assert.equal(stashes[0].index, 0);
assert.equal(stashes[0].message, "On master: " + stashMessage);
assert.equal(stashes[0].oid.toString(), stashOid.toString());
return Stash.drop(repo, 0);
})
.then(function () {
stashes = [];
var stashCb = function(index, message, oid) {
stashes.push({index: index, message: message, oid: oid});
};
return Stash.foreach(repo, stashCb);
})
.then(function() {
assert.equal(stashes.length, 0);
})
.catch(function(e) {
return fse.writeFile(filePath, oldContent)
.then(function() {
return Promise.reject(e);
});
});
});
it("can save and pop a stash", function() {
var fileNameA = "README.md";
var fileNameB = "install.js";
var oldContentA;
var oldContentB;
var fileContent = "Cha-cha-cha-chaaaaaangessssss";
var repo = this.repository;
var filePathA = path.join(repo.workdir(), fileNameA);
var filePathB = path.join(repo.workdir(), fileNameB);
var stashMessage = "stash test";
return fse.readFile(filePathA, "utf-8")
.then(function(content) {
oldContentA = content;
return fse.writeFile(filePathA, fileContent);
})
.then(function() {
return fse.readFile(filePathB, "utf-8");
})
.then(function(content) {
oldContentB = content;
return fse.writeFile(filePathB, fileContent);
})
.then(function() {
return Stash.save(repo, repo.defaultSignature(), stashMessage, 0);
})
.then(function() {
return fse.readFile(filePathA, "utf-8");
})
.then(function(content) {
assert.equal(oldContentA, content);
return fse.readFile(filePathB, "utf-8");
})
.then(function(content) {
assert.equal(oldContentB, content);
return Stash.pop(repo, 0);
})
.then(function() {
return fse.readFile(filePathA, "utf-8");
})
.then(function(content) {
assert.equal(fileContent, content);
return fse.readFile(filePathB, "utf-8");
})
.then(function(content) {
assert.equal(fileContent, content);
});
});
it("can save a stash, change files, and fail to pop stash", function() {
var fileName = "README.md";
var fileContent = "Cha-cha-cha-chaaaaaangessssss";
var fileContent2 = "Somewhere over the repo, changes were made.";
var repo = this.repository;
var filePath = path.join(repo.workdir(), fileName);
var oldContent;
var stashMessage = "stash test";
return fse.readFile(filePath)
.then(function(content) {
oldContent = content;
return fse.writeFile(filePath, fileContent);
})
.then(function() {
return Stash.save(repo, repo.defaultSignature(), stashMessage, 0);
})
.then(function() {
return fse.writeFile(filePath, fileContent2);
})
.then(function() {
return Stash.pop(repo, 0);
})
.catch(function(reason) {
if (reason.message !== "1 conflict prevents checkout") {
throw reason;
} else {
return Promise.resolve();
}
});
});
it("can save, apply, then drop the stash", function() {
var fileName = "README.md";
var fileContent = "Cha-cha-cha-chaaaaaangessssss";
var repo = this.repository;
var filePath = path.join(repo.workdir(), fileName);
var oldContent;
var stashMessage = "stash test";
return fse.readFile(filePath)
.then(function(content) {
oldContent = content;
return fse.writeFile(filePath, fileContent);
})
.then(function() {
return Stash.save(repo, repo.defaultSignature(), stashMessage, 0);
})
.then(function() {
return Stash.apply(repo, 0);
})
.then(function() {
return Stash.drop(repo, 0);
}, function() {
throw new Error("Unable to drop stash after apply.");
})
.then(function() {
return Stash.drop(repo, 0);
})
.catch(function(reason) {
if (reason.message !== "Reference 'refs/stash' not found") {
Promise.reject();
}
});
});
it("can save multiple stashes and pop an arbitrary stash", function() {
var fileName = "README.md";
var fileContentA = "Hi. It's me. I'm the dog. My name is the dog.";
var fileContentB = "Everyone likes me. I'm cute.";
var fileContentC = "I think I will bark at nothing now. Ba. Ba. Baba Baba.";
var repo = this.repository;
var filePath = path.join(repo.workdir(), fileName);
var oldContent;
var stashMessageA = "stash test A";
var stashMessageB = "stash test B";
var stashMessageC = "stash test C";
function writeAndStash(path, content, message) {
return fse.writeFile(path, content)
.then(function() {
return Stash.save(repo, repo.defaultSignature(), message, 0);
});
}
return fse.readFile(filePath, "utf-8")
.then(function (content) {
oldContent = content;
return writeAndStash(filePath, fileContentA, stashMessageA);
})
.then(function() {
return writeAndStash(filePath, fileContentB, stashMessageB);
})
.then(function() {
return writeAndStash(filePath, fileContentC, stashMessageC);
})
.then(function() {
return fse.readFile(filePath, "utf-8");
})
.then(function(content) {
assert.equal(oldContent, content);
return Stash.pop(repo, 1);
})
.then(function() {
return fse.readFile(filePath, "utf-8");
})
.then(function(content) {
assert.equal(fileContentB, content);
});
});
});