Package org.eclipse.jgit.treewalk

Examples of org.eclipse.jgit.treewalk.FileTreeIterator

163
164
165
166
167
168
169
170
171
172
173
    assertEquals(2, tree.memberCount());

    Tree tree2 = (Tree) tree.findTreeMember("dir");
    tree2.setId(insertTree(tree2));
    tree.setId(insertTree(tree));
    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, tree.getId(), iterator);
    diff.diff();
    assertEquals(2, diff.getChanged().size());
    assertTrue(diff.getChanged().contains("file2"));
    assertTrue(diff.getChanged().contains("dir/file3"));
View Full Code Here
205
206
207
208
209
210
211
212
213
214
215
    // merge side with master
    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

    assertEquals("[b]",
        new TreeSet<String>(diff.getChanged()).toString());
View Full Code Here
247
248
249
250
251
252
253
254
255
256
257
    // merge side with master
    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

    assertEquals("[]", new TreeSet<String>(diff.getChanged()).toString());
    assertEquals("[]", diff.getAdded().toString());
View Full Code Here
287
288
289
290
291
292
293
294
295
296
297
    MergeResult result = git.merge().include(secondCommit.getId())
        .setStrategy(MergeStrategy.RESOLVE).call();
    assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();

    assertEquals("[]", new TreeSet<String>(diff.getChanged()).toString());
    assertEquals("[]", diff.getAdded().toString());
View Full Code Here
321
322
323
324
325
326
327
328
329
330
331
    tree.addFile("a=c").setId(ObjectId.fromString("06022365ddbd7fb126761319633bf73517770714"));
    tree.addFile("a=d").setId(ObjectId.fromString("fa6414df3da87840700e9eeb7fc261dd77ccd5c2"));

    tree.setId(insertTree(tree));

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, tree.getId(), iterator);
    diff.diff();
    assertEquals(0, diff.getChanged().size());
    assertEquals(0, diff.getAdded().size());
    assertEquals(0, diff.getRemoved().size());
View Full Code Here
370
371
372
373
374
375
376
377
378
379
380
    tree3.setId(insertTree(tree3));
    Tree tree2 = (Tree) tree.findTreeMember("a");
    tree2.setId(insertTree(tree2));
    tree.setId(insertTree(tree));

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, tree.getId(), iterator);
    diff.diff();
    assertEquals(0, diff.getChanged().size());
    assertEquals(0, diff.getAdded().size());
    assertEquals(0, diff.getRemoved().size());
View Full Code Here
406
407
408
409
410
411
412
413
414
415
416
    String path = "file";
    writeTrashFile(path, "content");
    git.add().addFilepattern(path).call();
    git.commit().setMessage("commit").call();
    removeFromIndex(path);
    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();
    assertTrue(diff.getRemoved().contains(path));
    assertTrue(diff.getUntracked().contains(path));
    assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());
View Full Code Here
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
  @Test
  public void testUntrackedFolders() throws Exception {
    Git git = new Git(db);

    IndexDiff diff = new IndexDiff(db, Constants.HEAD,
        new FileTreeIterator(db));
    diff.diff();
    assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());

    writeTrashFile("readme", "");
    writeTrashFile("src/com/A.java", "");
    writeTrashFile("src/com/B.java", "");
    writeTrashFile("src/org/A.java", "");
    writeTrashFile("src/org/B.java", "");
    writeTrashFile("target/com/A.java", "");
    writeTrashFile("target/com/B.java", "");
    writeTrashFile("target/org/A.java", "");
    writeTrashFile("target/org/B.java", "");

    git.add().addFilepattern("src").addFilepattern("readme").call();
    git.commit().setMessage("initial").call();

    diff = new IndexDiff(db, Constants.HEAD,
        new FileTreeIterator(db));
    diff.diff();
    assertEquals(new HashSet<String>(Arrays.asList("target")),
        diff.getUntrackedFolders());

    writeTrashFile("src/tst/A.java", "");
    writeTrashFile("src/tst/B.java", "");

    diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
    diff.diff();
    assertEquals(new HashSet<String>(Arrays.asList("target", "src/tst")),
        diff.getUntrackedFolders());

    git.rm().addFilepattern("src/com/B.java").addFilepattern("src/org")
        .call();
    git.commit().setMessage("second").call();
    writeTrashFile("src/org/C.java", "");

    diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
    diff.diff();
    assertEquals(
        new HashSet<String>(Arrays.asList("src/org", "src/tst",
            "target")),
        diff.getUntrackedFolders());
View Full Code Here
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
  @Test
  public void testUntrackedNotIgnoredFolders() throws Exception {
    Git git = new Git(db);

    IndexDiff diff = new IndexDiff(db, Constants.HEAD,
        new FileTreeIterator(db));
    diff.diff();
    assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());

    writeTrashFile("readme", "");
    writeTrashFile("sr/com/X.java", "");
    writeTrashFile("src/com/A.java", "");
    writeTrashFile("src/org/B.java", "");
    writeTrashFile("srcs/org/Y.java", "");
    writeTrashFile("target/com/A.java", "");
    writeTrashFile("target/org/B.java", "");
    writeTrashFile(".gitignore", "/target\n/sr");

    git.add().addFilepattern("readme").addFilepattern(".gitignore")
        .addFilepattern("srcs/").call();
    git.commit().setMessage("initial").call();

    diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
    diff.diff();
    assertEquals(new HashSet<String>(Arrays.asList("src")),
        diff.getUntrackedFolders());

    git.add().addFilepattern("src").call();
    writeTrashFile("sr/com/X1.java", "");
    writeTrashFile("src/tst/A.java", "");
    writeTrashFile("src/tst/B.java", "");
    writeTrashFile("srcs/com/Y1.java", "");
    deleteTrashFile(".gitignore");

    diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
    diff.diff();
    assertEquals(
        new HashSet<String>(Arrays.asList("srcs/com", "sr", "src/tst",
            "target")),
        diff.getUntrackedFolders());
View Full Code Here
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
    assumeUnchanged(path2);
    assumeUnchanged(path3);
    writeTrashFile(path, "more content");
    deleteTrashFile(path3);

    FileTreeIterator iterator = new FileTreeIterator(db);
    IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();
    assertEquals(2, diff.getAssumeUnchanged().size());
    assertEquals(1, diff.getModified().size());
    assertEquals(0, diff.getChanged().size());
    assertTrue(diff.getAssumeUnchanged().contains("file2"));
    assertTrue(diff.getAssumeUnchanged().contains("file3"));
    assertTrue(diff.getModified().contains("file"));

    git.add().addFilepattern(".").call();

    iterator = new FileTreeIterator(db);
    diff = new IndexDiff(db, Constants.HEAD, iterator);
    diff.diff();
    assertEquals(2, diff.getAssumeUnchanged().size());
    assertEquals(0, diff.getModified().size());
    assertEquals(1, diff.getChanged().size());
View Full Code Here
TOP

Related Classes of org.eclipse.jgit.treewalk.FileTreeIterator

  • com.atlassian.jgitflow.core.util.GitHelper
  • com.github.koraktor.mavanagaiata.git.jgit.JGitRepository
  • com.github.koraktor.mavanagaiata.git.jgit.JGitRepositoryTest
  • com.nirima.jenkins.GitStatus$Status
  • org.eclipse.egit.core.op.BranchOperation
  • org.eclipse.egit.core.op.CreatePatchOperation
  • org.eclipse.egit.core.synchronize.GitSyncCache
  • org.eclipse.egit.core.synchronize.WorkingTreeChangeCache
  • org.eclipse.egit.ui.internal.actions.CompareIndexWithHeadActionHandler
  • org.eclipse.egit.ui.internal.merge.GitMergeEditorInput
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.