Package | Description |
---|---|
org.eclipse.jgit.attributes |
Support for reading .gitattributes.
|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
org.eclipse.jgit.treewalk |
Walking and comparing directory/file trees (of commits, file system).
|
org.eclipse.jgit.util |
Utility classes.
|
org.eclipse.jgit.util.io |
Utility classes for IO (streams).
|
Modifier and Type | Method and Description |
---|---|
Attributes |
AttributesHandler.getAttributes()
|
Attributes |
AttributesProvider.getAttributes()
Get attributes
|
Modifier and Type | Method and Description |
---|---|
protected void |
AttributesHandler.expandMacro(Attribute attr,
Attributes result)
Expand a macro
|
protected void |
AttributesHandler.mergeAttributes(AttributesNode node,
java.lang.String entryPath,
boolean isDirectory,
Attributes result)
Merges the matching node attributes for an entry path.
|
private void |
AttributesHandler.mergeGlobalAttributes(java.lang.String entryPath,
boolean isDirectory,
Attributes result)
Merges the matching GLOBAL attributes for an entry path.
|
private void |
AttributesHandler.mergeInfoAttributes(java.lang.String entryPath,
boolean isDirectory,
Attributes result)
Merges the matching INFO attributes for an entry path.
|
private void |
AttributesHandler.mergePerDirectoryEntryAttributes(java.lang.String entryPath,
int nameRoot,
boolean isDirectory,
WorkingTreeIterator workingTreeIterator,
DirCacheIterator dirCacheIterator,
CanonicalTreeParser otherTree,
Attributes result)
Merges the matching working directory attributes for an entry path.
|
Modifier and Type | Field and Description |
---|---|
private static Attributes |
ResolveMerger.NO_ATTRIBUTES |
Modifier and Type | Method and Description |
---|---|
protected void |
ResolveMerger.addCheckoutMetadata(java.lang.String path,
Attributes attributes)
Remembers the
DirCacheCheckout.CheckoutMetadata for the given path; it may be
needed in ResolveMerger.checkout() or in ResolveMerger.cleanUp() . |
protected void |
ResolveMerger.addDeletion(java.lang.String path,
boolean isFile,
Attributes attributes)
Remember a path for deletion, and remember its
DirCacheCheckout.CheckoutMetadata
in case it has to be restored in ResolveMerger.cleanUp() . |
protected void |
ResolveMerger.addToCheckout(java.lang.String path,
DirCacheEntry entry,
Attributes attributes)
Adds a
DirCacheEntry for direct checkout and remembers its
DirCacheCheckout.CheckoutMetadata . |
private MergeResult<RawText> |
ResolveMerger.contentMerge(CanonicalTreeParser base,
CanonicalTreeParser ours,
CanonicalTreeParser theirs,
Attributes attributes)
Does the content merge.
|
private RawText |
ResolveMerger.getRawText(ObjectId id,
Attributes attributes) |
private ObjectId |
ResolveMerger.insertMergeResult(TemporaryBuffer buf,
Attributes attributes) |
protected boolean |
ResolveMerger.processEntry(CanonicalTreeParser base,
CanonicalTreeParser ours,
CanonicalTreeParser theirs,
DirCacheBuildIterator index,
WorkingTreeIterator work,
boolean ignoreConflicts,
Attributes attributes)
Processes one path and tries to merge taking git attributes in account.
|
private void |
ResolveMerger.updateIndex(CanonicalTreeParser base,
CanonicalTreeParser ours,
CanonicalTreeParser theirs,
MergeResult<RawText> result,
Attributes attributes)
Updates the index after a content merge has happened.
|
private java.io.File |
ResolveMerger.writeMergedFile(TemporaryBuffer rawMerged,
Attributes attributes)
Writes merged file content to the working tree.
|
Modifier and Type | Field and Description |
---|---|
private Attributes |
TreeWalk.attrs
Cached attribute for the current entry
|
Modifier and Type | Method and Description |
---|---|
Attributes |
TreeWalk.getAttributes()
Get attributes
|
Modifier and Type | Method and Description |
---|---|
static Attributes |
LfsFactory.getAttributesForPath(Repository db,
java.lang.String path) |
static Attributes |
LfsFactory.getAttributesForPath(Repository db,
java.lang.String path,
RevCommit commit)
Get attributes for given path and commit
|
Modifier and Type | Method and Description |
---|---|
private static CoreConfig.EolStreamType |
EolStreamTypeUtil.checkInStreamType(WorkingTreeOptions options,
Attributes attrs) |
private static CoreConfig.EolStreamType |
EolStreamTypeUtil.checkOutStreamType(WorkingTreeOptions options,
Attributes attrs) |
static CoreConfig.EolStreamType |
EolStreamTypeUtil.detectStreamType(TreeWalk.OperationType op,
WorkingTreeOptions options,
Attributes attrs)
Convenience method used to detect if CRLF conversion has been configured
using the
global repo options
global attributes
info attributes
working tree .gitattributes
|