← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to external/ngit/NGit.Test/NGit.Merge/SimpleMergeTest.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
external/ngit/NGit.Test/NGit.Merge/SimpleMergeTest.cs
133
133
                                DirCacheBuilder b = treeB.Builder();
134
134
                                DirCacheBuilder o = treeO.Builder();
135
135
                                DirCacheBuilder t = treeT.Builder();
136
 
                                b.Add(MakeEntry("libelf-po/a", FileMode.REGULAR_FILE));
137
 
                                b.Add(MakeEntry("libelf/c", FileMode.REGULAR_FILE));
138
 
                                o.Add(MakeEntry("Makefile", FileMode.REGULAR_FILE));
139
 
                                o.Add(MakeEntry("libelf-po/a", FileMode.REGULAR_FILE));
140
 
                                o.Add(MakeEntry("libelf/c", FileMode.REGULAR_FILE));
141
 
                                t.Add(MakeEntry("libelf-po/a", FileMode.REGULAR_FILE));
142
 
                                t.Add(MakeEntry("libelf/c", FileMode.REGULAR_FILE, "blah"));
 
136
                                b.Add(CreateEntry("libelf-po/a", FileMode.REGULAR_FILE));
 
137
                                b.Add(CreateEntry("libelf/c", FileMode.REGULAR_FILE));
 
138
                                o.Add(CreateEntry("Makefile", FileMode.REGULAR_FILE));
 
139
                                o.Add(CreateEntry("libelf-po/a", FileMode.REGULAR_FILE));
 
140
                                o.Add(CreateEntry("libelf/c", FileMode.REGULAR_FILE));
 
141
                                t.Add(CreateEntry("libelf-po/a", FileMode.REGULAR_FILE));
 
142
                                t.Add(CreateEntry("libelf/c", FileMode.REGULAR_FILE, "blah"));
143
143
                                b.Finish();
144
144
                                o.Finish();
145
145
                                t.Finish();
178
178
                                DirCacheBuilder b = treeB.Builder();
179
179
                                DirCacheBuilder o = treeO.Builder();
180
180
                                DirCacheBuilder t = treeT.Builder();
181
 
                                b.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
182
 
                                b.Add(MakeEntry("d/t", FileMode.REGULAR_FILE));
183
 
                                o.Add(MakeEntry("d/o", FileMode.REGULAR_FILE, "o !"));
184
 
                                o.Add(MakeEntry("d/t", FileMode.REGULAR_FILE));
185
 
                                t.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
186
 
                                t.Add(MakeEntry("d/t", FileMode.REGULAR_FILE, "t !"));
 
181
                                b.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
182
                                b.Add(CreateEntry("d/t", FileMode.REGULAR_FILE));
 
183
                                o.Add(CreateEntry("d/o", FileMode.REGULAR_FILE, "o !"));
 
184
                                o.Add(CreateEntry("d/t", FileMode.REGULAR_FILE));
 
185
                                t.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
186
                                t.Add(CreateEntry("d/t", FileMode.REGULAR_FILE, "t !"));
187
187
                                b.Finish();
188
188
                                o.Finish();
189
189
                                t.Finish();
219
219
                                DirCacheBuilder b = treeB.Builder();
220
220
                                DirCacheBuilder o = treeO.Builder();
221
221
                                DirCacheBuilder t = treeT.Builder();
222
 
                                b.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
223
 
                                b.Add(MakeEntry("d/t", FileMode.REGULAR_FILE));
224
 
                                o.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
225
 
                                o.Add(MakeEntry("d/t", FileMode.REGULAR_FILE, "o !"));
226
 
                                t.Add(MakeEntry("d/o", FileMode.REGULAR_FILE, "t !"));
227
 
                                t.Add(MakeEntry("d/t", FileMode.REGULAR_FILE, "t !"));
 
222
                                b.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
223
                                b.Add(CreateEntry("d/t", FileMode.REGULAR_FILE));
 
224
                                o.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
225
                                o.Add(CreateEntry("d/t", FileMode.REGULAR_FILE, "o !"));
 
226
                                t.Add(CreateEntry("d/o", FileMode.REGULAR_FILE, "t !"));
 
227
                                t.Add(CreateEntry("d/t", FileMode.REGULAR_FILE, "t !"));
228
228
                                b.Finish();
229
229
                                o.Finish();
230
230
                                t.Finish();
250
250
                                DirCacheBuilder b = treeB.Builder();
251
251
                                DirCacheBuilder o = treeO.Builder();
252
252
                                DirCacheBuilder t = treeT.Builder();
253
 
                                b.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
254
 
                                b.Add(MakeEntry("d/t", FileMode.REGULAR_FILE));
255
 
                                o.Add(MakeEntry("d", FileMode.REGULAR_FILE));
256
 
                                t.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
257
 
                                t.Add(MakeEntry("d/t", FileMode.REGULAR_FILE, "t !"));
 
253
                                b.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
254
                                b.Add(CreateEntry("d/t", FileMode.REGULAR_FILE));
 
255
                                o.Add(CreateEntry("d", FileMode.REGULAR_FILE));
 
256
                                t.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
257
                                t.Add(CreateEntry("d/t", FileMode.REGULAR_FILE, "t !"));
258
258
                                b.Finish();
259
259
                                o.Finish();
260
260
                                t.Finish();
280
280
                                DirCacheBuilder b = treeB.Builder();
281
281
                                DirCacheBuilder o = treeO.Builder();
282
282
                                DirCacheBuilder t = treeT.Builder();
283
 
                                b.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
284
 
                                b.Add(MakeEntry("d/t", FileMode.REGULAR_FILE));
285
 
                                o.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
286
 
                                o.Add(MakeEntry("d/t", FileMode.REGULAR_FILE, "o !"));
287
 
                                t.Add(MakeEntry("d", FileMode.REGULAR_FILE));
 
283
                                b.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
284
                                b.Add(CreateEntry("d/t", FileMode.REGULAR_FILE));
 
285
                                o.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
286
                                o.Add(CreateEntry("d/t", FileMode.REGULAR_FILE, "o !"));
 
287
                                t.Add(CreateEntry("d", FileMode.REGULAR_FILE));
288
288
                                b.Finish();
289
289
                                o.Finish();
290
290
                                t.Finish();
310
310
                                DirCacheBuilder b = treeB.Builder();
311
311
                                DirCacheBuilder o = treeO.Builder();
312
312
                                DirCacheBuilder t = treeT.Builder();
313
 
                                b.Add(MakeEntry("d", FileMode.REGULAR_FILE));
314
 
                                o.Add(MakeEntry("d", FileMode.REGULAR_FILE, "o !"));
315
 
                                t.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
 
313
                                b.Add(CreateEntry("d", FileMode.REGULAR_FILE));
 
314
                                o.Add(CreateEntry("d", FileMode.REGULAR_FILE, "o !"));
 
315
                                t.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
316
316
                                b.Finish();
317
317
                                o.Finish();
318
318
                                t.Finish();
338
338
                                DirCacheBuilder b = treeB.Builder();
339
339
                                DirCacheBuilder o = treeO.Builder();
340
340
                                DirCacheBuilder t = treeT.Builder();
341
 
                                b.Add(MakeEntry("d", FileMode.REGULAR_FILE));
342
 
                                o.Add(MakeEntry("d/o", FileMode.REGULAR_FILE));
343
 
                                t.Add(MakeEntry("d", FileMode.REGULAR_FILE, "t !"));
 
341
                                b.Add(CreateEntry("d", FileMode.REGULAR_FILE));
 
342
                                o.Add(CreateEntry("d/o", FileMode.REGULAR_FILE));
 
343
                                t.Add(CreateEntry("d", FileMode.REGULAR_FILE, "t !"));
344
344
                                b.Finish();
345
345
                                o.Finish();
346
346
                                t.Finish();
374
374
                        odi.Flush();
375
375
                        return id;
376
376
                }
377
 
 
378
 
                /// <exception cref="System.Exception"></exception>
379
 
                private DirCacheEntry MakeEntry(string path, FileMode mode)
380
 
                {
381
 
                        return MakeEntry(path, mode, path);
382
 
                }
383
 
 
384
 
                /// <exception cref="System.Exception"></exception>
385
 
                private DirCacheEntry MakeEntry(string path, FileMode mode, string content)
386
 
                {
387
 
                        DirCacheEntry ent = new DirCacheEntry(path);
388
 
                        ent.FileMode = mode;
389
 
                        ent.SetObjectId(new ObjectInserter.Formatter().IdFor(Constants.OBJ_BLOB, Constants
390
 
                                .Encode(content)));
391
 
                        return ent;
392
 
                }
393
377
        }
394
378
}