|
|||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | ||||||||
java.lang.Objectorg.eclipse.jgit.lib.WorkDirCheckout
public class WorkDirCheckout
This class handles checking out one or two trees merging
with the index (actually a tree too).
Three-way merges are no performed. See setFailOnConflict(boolean).
| Constructor Summary | |
|---|---|
WorkDirCheckout(Repository repo,
java.io.File root,
GitIndex index,
Tree merge)
Create a checkout class for checking out one tree, merging with the index |
|
WorkDirCheckout(Repository repo,
java.io.File root,
Tree head,
GitIndex index,
Tree merge)
Create a checkout class for merging and checking our two trees and the index. |
|
| Method Summary | |
|---|---|
void |
checkout()
Execute this checkout |
java.util.ArrayList<java.lang.String> |
getConflicts()
|
java.util.ArrayList<java.lang.String> |
getRemoved()
|
void |
setFailOnConflict(boolean failOnConflict)
If true, will scan first to see if it's possible to check out,
otherwise throw CheckoutConflictException. |
| Methods inherited from class java.lang.Object |
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
| Constructor Detail |
|---|
public WorkDirCheckout(Repository repo,
java.io.File root,
GitIndex index,
Tree merge)
repo - root - workdirindex - current indexmerge - tree to check out
public WorkDirCheckout(Repository repo,
java.io.File root,
Tree head,
GitIndex index,
Tree merge)
repo - root - workdirhead - index - merge - | Method Detail |
|---|
public void setFailOnConflict(boolean failOnConflict)
true, will scan first to see if it's possible to check out,
otherwise throw CheckoutConflictException. If false,
it will silently deal with the problem.
failOnConflict -
public void checkout()
throws java.io.IOException
java.io.IOExceptionpublic java.util.ArrayList<java.lang.String> getConflicts()
public java.util.ArrayList<java.lang.String> getRemoved()
|
|||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | ||||||||