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
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
|
//
// GitUtilsTests.cs
//
// Author:
// IBBoard <dev@ibboard.co.uk>
//
// Copyright (c) 2011 IBBoard
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
using System.Linq;
using NUnit.Framework;
using NGit.Storage.File;
using NGit.Revwalk;
using NGit;
using UnitTests;
using System.IO;
using System.Collections.Generic;
namespace MonoDevelop.VersionControl.Git
{
[TestFixture()]
public class GitUtilsTests : TestBase
{
private readonly string PROJECT_ROOT = "../../../";
private Dictionary<string, RevCommit[]> blames = new Dictionary<string, RevCommit[]>();
private FileRepository repo;
private RevWalk walker;
[SetUp()]
public override void Setup() {
base.Setup();
DirectoryInfo gitDir = new DirectoryInfo (PROJECT_ROOT + ".git");
repo = new FileRepository (gitDir.FullName);
walker = new RevWalk (repo);
}
[Test()]
public void TestBlameLineCountWithMultipleCommits ()
{
RevCommit[] blameCommits = GetBlameForFixedFile ("c5f4319ee3e077436e3950c8a764959d50bf57c0");
Assert.That (blameCommits.Length, Is.EqualTo (72));
}
[Test()]
[Ignore ("This fails with NGit, probably because the diff algorithm is different")]
public void TestBlameRevisionsWithMultipleCommits ()
{
RevCommit[] blameCommits = GetBlameForFixedFile ("c5f4319ee3e077436e3950c8a764959d50bf57c0");
List<BlameFragment> blames = new List<BlameFragment> ();
blames.Add (new BlameFragment (1, 27, "b6e41ee2"));
blames.Add (new BlameFragment (28, 1, "15ed2793"));
blames.Add (new BlameFragment (29, 1, "a78c32a5"));
blames.Add (new BlameFragment (30, 5, "b6e41ee2"));
blames.Add(new BlameFragment(35, 2, "a78c32a5"));
blames.Add(new BlameFragment(37, 2, "927ca9cd"));
blames.Add(new BlameFragment(39, 2, "a78c32a5"));
blames.Add(new BlameFragment(41, 6, "b6e41ee2"));
blames.Add(new BlameFragment(47, 1, "927ca9cd"));
blames.Add(new BlameFragment(48, 3, "b6e41ee2"));
blames.Add(new BlameFragment(51, 2, "15ed2793"));
blames.Add(new BlameFragment(53, 1, "39f9d8e3"));
blames.Add(new BlameFragment(54, 7, "15ed2793"));
blames.Add(new BlameFragment(61, 2, "b6e41ee2"));
blames.Add(new BlameFragment(63, 1, "15ed2793"));
blames.Add(new BlameFragment(64, 2, "b6e41ee2"));
blames.Add(new BlameFragment(66, 1, "c5f4319e"));
blames.Add(new BlameFragment(67, 1, "b6e41ee2"));
blames.Add(new BlameFragment(68, 1, "c5f4319e"));
blames.Add(new BlameFragment(69, 4, "b6e41ee2"));
CompareBlames (blameCommits, blames);
}
[Test()]
[Ignore ("This fails with NGit, probably because the diff algorithm is different")]
public void TestBlameRevisionsWithTwoCommits ()
{
string commit1 = "b6e41ee2dd00e8744abc4835567e06667891b2cf";
string commit2 = "15ed279";
RevCommit[] blameCommits = GetBlameForFixedFile (commit2);
List<BlameFragment> blames = new List<BlameFragment> ();
blames.Add (new BlameFragment (1, 27, commit1));
blames.Add (new BlameFragment (28, 1, commit2));
blames.Add (new BlameFragment (29, 5, commit1));
blames.Add (new BlameFragment (34, 1, commit2));
blames.Add (new BlameFragment (35, 7, commit1));
blames.Add (new BlameFragment (42, 1, commit2));
blames.Add (new BlameFragment (43, 3, commit1));
blames.Add (new BlameFragment (46, 10, commit2));
blames.Add (new BlameFragment (56, 2, commit1));
blames.Add (new BlameFragment (58, 1, commit2));
blames.Add (new BlameFragment (59, 4, commit1));
blames.Add (new BlameFragment (63, 1, commit2));
blames.Add (new BlameFragment (64, 4, commit1));
CompareBlames (blameCommits, blames);
}
[Test()]
public void TestBlameLineCountWithTwoCommits ()
{
RevCommit[] blameCommits = GetBlameForFixedFile ("15ed279");
Assert.That (blameCommits.Length, Is.EqualTo (67));
}
[Test()]
public void TestBlameRevisionsWithOneCommit ()
{
string commit = "b6e41ee2dd00e8744abc4835567e06667891b2cf";
RevCommit[] blameCommits = GetBlameForFixedFile (commit);
List<BlameFragment> blames = new List<BlameFragment> ();
blames.Add (new BlameFragment (1, 56, commit));
CompareBlames (blameCommits, blames);
}
[Test()]
public void TestBlameLineCountWithOneCommit ()
{
RevCommit[] blameCommits = GetBlameForFixedFile ("b6e41ee2dd00e8744abc4835567e06667891b2cf");
Assert.That (blameCommits.Length, Is.EqualTo (56));
}
[Test()]
public void TestBlameLineCountWithNoCommits ()
{
RevCommit[] blameCommits = GetBlameForFixedFile ("39fe1158de8da8b82822e299958d35c51d493298");
Assert.That (blameCommits, Is.Null);
}
[Test()]
public void TestBlameForProjectDom ()
{
RevCommit[] blameCommits = GetBlameForFile ("6469602e3c0ba6953fd3ef0ae01d77abe1d9ab70", "main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/ProjectDom.cs");
List<BlameFragment> blames = new List<BlameFragment> ();
blames.Add(new BlameFragment(1, 59, "3352c438"));
blames.Add(new BlameFragment(60, 5, "85dfe8a5"));
blames.Add(new BlameFragment(65, 3, "3352c438"));
blames.Add(new BlameFragment(68, 3, "c45c8708"));
blames.Add(new BlameFragment(71, 112, "3352c438"));
blames.Add(new BlameFragment(183, 1, "c7da699"));
blames.Add(new BlameFragment(184, 1, "3352c438"));
blames.Add(new BlameFragment(185, 1, "c7da699"));
blames.Add(new BlameFragment(186, 1, "3352c438"));
blames.Add(new BlameFragment(187, 9, "e2ddc3e3"));
blames.Add(new BlameFragment(196, 14, "3352c438"));
blames.Add(new BlameFragment(210, 1, "3352c438"));
blames.Add(new BlameFragment(211, 2, "4d06ef70"));
blames.Add(new BlameFragment(213, 18, "3352c438"));
blames.Add(new BlameFragment(231, 1, "d802c4d2"));
blames.Add(new BlameFragment(232, 5, "3352c438"));
blames.Add(new BlameFragment(237, 1, "d802c4d2"));
blames.Add(new BlameFragment(238, 9, "3352c438"));
blames.Add(new BlameFragment(247, 1, "d802c4d2"));
blames.Add(new BlameFragment(248, 5, "3352c438"));
blames.Add(new BlameFragment(253, 1, "d802c4d2"));
blames.Add(new BlameFragment(254, 10, "3352c438"));
blames.Add(new BlameFragment(264, 1, "0095b4ad"));
blames.Add(new BlameFragment(265, 22, "3352c438"));
blames.Add(new BlameFragment(287, 2, "0095b4ad"));
blames.Add(new BlameFragment(289, 4, "3352c438"));
blames.Add(new BlameFragment(293, 1, "0095b4ad"));
blames.Add(new BlameFragment(294, 19, "3352c438"));
blames.Add(new BlameFragment(313, 11, "0095b4ad"));
blames.Add(new BlameFragment(324, 13, "3352c438"));
blames.Add(new BlameFragment(337, 2, "7c9a428e"));
blames.Add(new BlameFragment(339, 119, "3352c438"));
blames.Add(new BlameFragment(458, 1, "165e9be7"));
blames.Add(new BlameFragment(459, 1, "3352c438"));
blames.Add(new BlameFragment(460, 1, "165e9be7"));
blames.Add(new BlameFragment(461, 43, "3352c438"));
blames.Add(new BlameFragment(504, 1, "37041bcf"));
blames.Add(new BlameFragment(505, 3, "1ee2429c"));
blames.Add(new BlameFragment(508, 11, "37041bcf"));
blames.Add(new BlameFragment(519, 1, "1ee2429c"));
blames.Add(new BlameFragment(520, 5, "37041bcf"));
blames.Add(new BlameFragment(525, 1, "1ee2429c"));
blames.Add(new BlameFragment(526, 1, "37041bcf"));
blames.Add(new BlameFragment(527, 1, "1ee2429c"));
blames.Add(new BlameFragment(528, 1, "37041bcf"));
blames.Add(new BlameFragment(529, 1, "1ee2429c"));
blames.Add(new BlameFragment(530, 1, "37041bcf"));
blames.Add(new BlameFragment(531, 11, "1ee2429c"));
blames.Add(new BlameFragment(542, 1, "37041bcf"));
//Another minor discrepancy from "git blame" on a blank line that matches what is found by "git diff"
blames.Add(new BlameFragment(543, 1, "1ee2429c"));
blames.Add(new BlameFragment(544, 2, "3352c438"));
blames.Add(new BlameFragment(546, 3, "37041bcf"));
blames.Add(new BlameFragment(549, 59, "3352c438"));
blames.Add(new BlameFragment(608, 1, "08a25d26"));
blames.Add(new BlameFragment(609, 162, "3352c438"));
blames.Add(new BlameFragment(771, 1, "c7da699f"));
blames.Add(new BlameFragment(772, 16, "3352c438"));
blames.Add(new BlameFragment(788, 13, "4d06ef70"));
blames.Add(new BlameFragment(801, 37, "c3609340"));
blames.Add(new BlameFragment(838, 2, "4d06ef70"));
blames.Add(new BlameFragment(840, 1, "0f6822a9"));
blames.Add(new BlameFragment(841, 1, "4d06ef70"));
blames.Add(new BlameFragment(842, 1, "e262ac50"));
blames.Add(new BlameFragment(843, 1, "4d06ef70"));
blames.Add(new BlameFragment(844, 2, "daabc6e1"));
blames.Add(new BlameFragment(846, 7, "e262ac50"));
blames.Add(new BlameFragment(853, 3, "4d06ef70"));
blames.Add(new BlameFragment(856, 37, "3352c438"));
blames.Add(new BlameFragment(893, 1, "cc279afd"));
blames.Add(new BlameFragment(894, 121, "3352c438"));
blames.Add(new BlameFragment(1015, 10, "85dfe8a5"));
blames.Add(new BlameFragment(1025, 43, "3352c438"));
CompareBlames(blameCommits, blames);
}
[Test]
public void GetCommitChanges_AddedRemoved ()
{
var commit = "9ed729ee";
var changes = GitUtil.CompareCommits (repo, repo.Resolve (commit), repo.Resolve (commit + "^")).ToArray ();
var add = changes.Where (c => c.GetNewPath ().EndsWith ("DocumentLine.cs")).First ();
var remove = changes.Where (c => c.GetOldPath ().EndsWith ("LineSegment.cs")).First ();
Assert.AreEqual (NGit.Diff.DiffEntry.ChangeType.ADD, add.GetChangeType (), "#1");
Assert.AreEqual ("/dev/null", add.GetOldPath (), "#2");
Assert.AreEqual (NGit.Diff.DiffEntry.ChangeType.DELETE, remove.GetChangeType (), "#3");
Assert.AreEqual ("/dev/null", remove.GetNewPath (), "#4");
}
[Test]
public void GetCommitChanges_Modifications ()
{
var commit = "c6798c34577";
var changedFiles = new [] {
"EditActions.cs",
"SourceEditorView.cs",
"SourceEditorWidget.cs",
"DeleteActions.cs",
"DocumentUpdateRequest.cs",
"FoldMarkerMargin.cs",
"HeightTree.cs",
"LineSplitter.cs",
"TextDocument.cs",
"TextEditor.cs",
"TextViewMargin.cs",
};
var changes = GitUtil.CompareCommits (repo, repo.Resolve (commit), repo.Resolve (commit + "^")).ToArray ();
Assert.AreEqual (11, changes.Length, "#1");
foreach (var file in changedFiles)
Assert.IsTrue (changes.Any (f => f.GetNewPath ().EndsWith (".cs")), "#2." + file);
}
private RevCommit[] GetBlameForFixedFile (string revision)
{
string filePath = "main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs";
return GetBlameForFile (revision, filePath);
}
RevCommit[] GetBlameForFile (string revision, string filePath)
{
RevCommit[] blame = null;
string path = PROJECT_ROOT + filePath;
string key = path + revision;
blames.TryGetValue(key, out blame);
if (blame == null)
{
var git = new NGit.Api.Git (repo);
var commit = git.GetRepository ().Resolve (revision);
var result = git.Blame ().SetFilePath (filePath).SetStartCommit (commit).Call ();
if (result == null)
return null;
blame = new RevCommit [result.GetResultContents ().Size ()];
for (int i = 0; i < result.GetResultContents ().Size (); i ++)
blame [i] = result.GetSourceCommit (i);
blames.Add(key, blame);
}
return blame;
}
void CompareBlames (RevCommit[] blameCommits,List<BlameFragment> blames)
{
foreach (BlameFragment blame in blames) {
int zeroBasedStartLine = blame.startLine - 1;
for (int i = 0; i < blame.lineCount; i++) {
Assert.That (blameCommits [zeroBasedStartLine + i].Id.Name, Text.StartsWith(blame.revID), "Error at line {0}", blame.startLine + i);
}
}
}
}
struct BlameFragment
{
public int startLine;
public int lineCount;
public string revID;
public BlameFragment (int start,int count, string revision)
{
startLine = start;
lineCount = count;
revID = revision;
}
}
}
|
