motiejus
/
jgit
1
Fork 0
Code Releases Activity

Make jgit diff obey core.autocrlf 

Change-Id: I0a756943d95ee20f189c154b27cd2972a116f550
This commit is contained in:
Robin Rosenberg 2012-08-19 20:14:45 +02:00 committed by Gerrit Code Review @ Eclipse.org
parent f71944ec76
commit 7314b6c2c0
1 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
org.eclipse.jgit/src/org/eclipse/jgit/diff/ContentSource.java
View File

@ -44,8 +44,6 @@
package org.eclipse.jgit.diff;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@ -93,10 +91,6 @@ public static ContentSource create(ObjectReader reader) {
* @return a content source wrapping the iterator.
*/
public static ContentSource create(WorkingTreeIterator iterator) {
if (iterator instanceof FileTreeIterator) {
FileTreeIterator i = (FileTreeIterator) iterator;
return new FileSource(i.getDirectory());
}
return new WorkingTreeSource(iterator);
}
@ -158,6 +152,7 @@ private static class WorkingTreeSource extends ContentSource {
WorkingTreeSource(WorkingTreeIterator iterator) {
this.tw = new TreeWalk((ObjectReader) null);
this.tw.setRecursive(true);
this.iterator = iterator;
}
@ -218,57 +213,6 @@ private void seek(String path) throws IOException {
}
}
private static class FileSource extends ContentSource {
private final File root;
FileSource(File root) {
this.root = root;
}
@Override
public long size(String path, ObjectId id) throws IOException {
return new File(root, path).length();
}
@Override
public ObjectLoader open(String path, ObjectId id) throws IOException {
final File p = new File(root, path);
if (!p.isFile())
throw new FileNotFoundException(path);
return new ObjectLoader() {
@Override
public long getSize() {
return p.length();
}
@Override
public int getType() {
return Constants.OBJ_BLOB;
}
@Override
public ObjectStream openStream() throws MissingObjectException,
IOException {
final FileInputStream in = new FileInputStream(p);
final long sz = in.getChannel().size();
final int type = getType();
final BufferedInputStream b = new BufferedInputStream(in);
return new ObjectStream.Filter(type, sz, b);
}
@Override
public boolean isLarge() {
return true;
}
@Override
public byte[] getCachedBytes() throws LargeObjectException {
throw new LargeObjectException();
}
};
}
}
/** A pair of sources to access the old and new sides of a DiffEntry. */
public static final class Pair {
private final ContentSource oldSource;