Example usage for org.eclipse.jgit.api Git Git

Introduction

In this page you can find the example usage for org.eclipse.jgit.api Git Git.

Prototype

public Git(Repository repo) 

Source Link

Document

Construct a new org.eclipse.jgit.api.Git object which can interact with the specified git repository.

Usage

From source file:org.eclipse.egit.core.synchronize.ThreeWayDiffEntryTest.java

License:Open Source License

@Test
public void shouldListIncomingDelete() throws Exception {
    // given/*w w w .j  a v  a2s.  c om*/
    writeTrashFile("a.txt", "content");
    Git git = new Git(db);
    git.add().addFilepattern("a.txt").call();
    RevCommit c = git.commit().setMessage("initial commit").call();

    // when
    TreeWalk walk = new TreeWalk(db);
    walk.addTree(c.getTree());
    walk.addTree(c.getTree());
    walk.addTree(new EmptyTreeIterator());
    List<ThreeWayDiffEntry> result = ThreeWayDiffEntry.scan(walk);

    // then
    assertThat(result, notNullValue());
    assertThat(Integer.valueOf(result.size()), is(Integer.valueOf(1)));

    ThreeWayDiffEntry entry = result.get(0);
    assertThat(entry.getDirection(), is(Direction.INCOMING));
    assertThat(entry.getChangeType(), is(ChangeType.DELETE));
    assertThat(entry.getPath(), is("a.txt"));
}

---

From source file:org.eclipse.egit.core.synchronize.ThreeWayDiffEntryTest.java

License:Open Source License

@Test
public void shouldListConflictingChange() throws Exception {
    // given//from   w  ww. j a  v a 2s.  c  o m
    writeTrashFile("a.txt", "content");
    Git git = new Git(db);
    git.add().addFilepattern("a.txt").call();
    RevCommit c = git.commit().setMessage("initial commit").call();

    // when
    TreeWalk walk = new TreeWalk(db);
    walk.addTree(new EmptyTreeIterator());
    walk.addTree(c.getTree());
    walk.addTree(new EmptyTreeIterator());
    List<ThreeWayDiffEntry> result = ThreeWayDiffEntry.scan(walk);

    // then
    assertThat(result, notNullValue());
    assertThat(Integer.valueOf(result.size()), is(Integer.valueOf(1)));

    ThreeWayDiffEntry entry = result.get(0);
    assertThat(entry.getDirection(), is(Direction.CONFLICTING));
    assertThat(entry.getChangeType(), is(ChangeType.MODIFY));
    // assertThat(entry.getNewPath(), is("a.txt"));
    // assertThat(entry.getOldPath(), is(DEV_NULL));
}

---

From source file:org.eclipse.egit.core.synchronize.ThreeWayDiffEntryTest.java

License:Open Source License

@Test
public void shouldListConflictingChange2() throws Exception {
    // given/*from   w w  w  . j a  v  a2  s. co m*/
    writeTrashFile("a.txt", "content");
    Git git = new Git(db);
    git.add().addFilepattern("a.txt").call();
    RevCommit c = git.commit().setMessage("initial commit").call();

    // when
    TreeWalk walk = new TreeWalk(db);
    walk.addTree(c.getTree());
    walk.addTree(new EmptyTreeIterator());
    walk.addTree(c.getTree());
    List<ThreeWayDiffEntry> result = ThreeWayDiffEntry.scan(walk);

    // then
    assertThat(result, notNullValue());
    assertThat(Integer.valueOf(result.size()), is(Integer.valueOf(1)));

    ThreeWayDiffEntry entry = result.get(0);
    assertThat(entry.getDirection(), is(Direction.CONFLICTING));
    assertThat(entry.getChangeType(), is(ChangeType.MODIFY));
    assertThat(entry.getPath(), is("a.txt"));
}

---

From source file:org.eclipse.egit.core.synchronize.ThreeWayDiffEntryTest.java

License:Open Source License

@Test
public void shouldListIncomingModify() throws Exception {
    // given//from w w w . ja  va 2 s . com
    writeTrashFile("a.txt", "content");
    Git git = new Git(db);
    git.add().addFilepattern("a.txt").call();
    RevCommit c = git.commit().setMessage("initial commit").call();
    writeTrashFile("a.txt", "new line");
    RevCommit c1 = git.commit().setAll(true).setMessage("second commit").call();

    // when
    TreeWalk walk = new TreeWalk(db);
    walk.addTree(c.getTree());
    walk.addTree(c.getTree());
    walk.addTree(c1.getTree());
    List<ThreeWayDiffEntry> result = ThreeWayDiffEntry.scan(walk);

    // then
    assertThat(result, notNullValue());
    assertThat(Integer.valueOf(result.size()), is(Integer.valueOf(1)));

    ThreeWayDiffEntry entry = result.get(0);
    assertThat(entry.getDirection(), is(Direction.INCOMING));
    assertThat(entry.getChangeType(), is(ChangeType.MODIFY));
    assertThat(entry.getPath(), is("a.txt"));
}

---

From source file:org.eclipse.egit.core.synchronize.ThreeWayDiffEntryTest.java

License:Open Source License

@Test
public void shouldListOutgoingModify() throws Exception {
    // given/* ww w. j  a  v  a  2 s. co  m*/
    writeTrashFile("a.txt", "content");
    Git git = new Git(db);
    git.add().addFilepattern("a.txt").call();
    RevCommit c = git.commit().setMessage("initial commit").call();
    writeTrashFile("a.txt", "newe line");
    RevCommit c1 = git.commit().setAll(true).setMessage("second commit").call();

    // when
    TreeWalk walk = new TreeWalk(db);
    walk.addTree(c1.getTree());
    walk.addTree(c.getTree());
    walk.addTree(c.getTree());
    List<ThreeWayDiffEntry> result = ThreeWayDiffEntry.scan(walk);

    // then
    assertThat(result, notNullValue());
    assertThat(Integer.valueOf(result.size()), is(Integer.valueOf(1)));

    ThreeWayDiffEntry entry = result.get(0);
    assertThat(entry.getDirection(), is(Direction.OUTGOING));
    assertThat(entry.getChangeType(), is(ChangeType.MODIFY));
    assertThat(entry.getPath(), is("a.txt"));
}

---

From source file:org.eclipse.egit.core.synchronize.ThreeWayDiffEntryTest.java

License:Open Source License

@Test
public void shouldListConflictingModify() throws Exception {
    // given/*from  w w  w  .j  a v a 2  s .c o m*/
    writeTrashFile("a.txt", "content");
    Git git = new Git(db);
    git.add().addFilepattern("a.txt").call();
    RevCommit c = git.commit().setMessage("initial commit").call();
    writeTrashFile("a.txt", "new line");
    RevCommit c1 = git.commit().setAll(true).setMessage("second commit").call();

    // when
    TreeWalk walk = new TreeWalk(db);
    walk.addTree(c1.getTree());
    walk.addTree(c.getTree());
    walk.addTree(c1.getTree());
    List<ThreeWayDiffEntry> result = ThreeWayDiffEntry.scan(walk);

    // then
    assertThat(result, notNullValue());
    assertThat(Integer.valueOf(result.size()), is(Integer.valueOf(1)));

    ThreeWayDiffEntry entry = result.get(0);
    assertThat(entry.getDirection(), is(Direction.CONFLICTING));
    assertThat(entry.getChangeType(), is(ChangeType.MODIFY));
    assertThat(entry.getPath(), is("a.txt"));
}

---

From source file:org.eclipse.egit.core.synchronize.WorkingTreeChangeCacheTest.java

License:Open Source License

@Test
public void shouldListSingleWorkspaceDeletion() throws Exception {
    // given//www . j av a 2 s . co  m
    writeTrashFile(db, "a.txt", "trash");
    new Git(db).add().addFilepattern("a.txt").call();
    deleteTrashFile(db, "a.txt");

    // when
    Map<String, Change> result = WorkingTreeChangeCache.build(db);

    // then
    assertThat(result.size(), is(1));
    assertFileDeletion(result, "a.txt", "a.txt");
}

---

From source file:org.eclipse.egit.core.synchronize.WorkingTreeChangeCacheTest.java

License:Open Source License

@Test
public void shouldListTwoWorkspaceDeletions() throws Exception {
    // given/*w ww. jav a  2 s . co  m*/
    writeTrashFile(db, "a.txt", "trash");
    writeTrashFile(db, "b.txt", "trash");
    new Git(db).add().addFilepattern("a.txt").addFilepattern("b.txt").call();
    deleteTrashFile(db, "a.txt");
    deleteTrashFile(db, "b.txt");

    // when
    Map<String, Change> result = WorkingTreeChangeCache.build(db);

    // then
    assertThat(result.size(), is(2));
    assertFileDeletion(result, "a.txt", "a.txt");
    assertFileDeletion(result, "b.txt", "b.txt");
}

---

From source file:org.eclipse.egit.core.synchronize.WorkingTreeChangeCacheTest.java

License:Open Source License

@Test
public void shouldListSingleWorkspaceDeletionInFolder() throws Exception {
    // given//from   w ww. ja v a 2  s  .  c o m
    writeTrashFile(db, "folder/a.txt", "trash");
    new Git(db).add().addFilepattern("folder/a.txt").call();
    deleteTrashFile(db, "folder/a.txt");

    // when
    Map<String, Change> result = WorkingTreeChangeCache.build(db);

    // then
    assertThat(result.size(), is(1));
    assertFileDeletion(result, "folder/a.txt", "a.txt");
}

---

From source file:org.eclipse.egit.core.synchronize.WorkingTreeChangeCacheTest.java

License:Open Source License

@Test
public void shouldListTwoWorkspaceDeletionsInFolder() throws Exception {
    // given//from   w  w w.j  av a  2s . com
    writeTrashFile(db, "folder/a.txt", "trash");
    writeTrashFile(db, "folder/b.txt", "trash");
    new Git(db).add().addFilepattern("folder/a.txt").addFilepattern("folder/b.txt").call();
    deleteTrashFile(db, "folder/a.txt");
    deleteTrashFile(db, "folder/b.txt");

    // when
    Map<String, Change> result = WorkingTreeChangeCache.build(db);

    // then
    assertThat(result.size(), is(2));
    assertFileDeletion(result, "folder/a.txt", "a.txt");
    assertFileDeletion(result, "folder/b.txt", "b.txt");
}

---

• «
• 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
• »