Merge branch 'stable-4.4'
* stable-4.4: Prepare 4.4.1-SNAPSHOT builds JGit v4.4.0.201606070830-r Prepare 4.4.0-SNAPSHOT builds JGit v4.4.0.201606011500-rc2 Prepare 4.4.0-SNAPSHOT builds JGit v4.4.0.201605250940-rc1 Update Orbit repository for Neon to R20160520211859 Fix computation of id in WorkingTreeIterator with autocrlf and smudging Prepare 4.3.2-SNAPSHOT builds JGit v4.3.1.201605051710-r Prepare 4.4.0-SNAPSHOT builds JGit v4.4.0.201605041135-m1 Run Maven build in release.sh concurrently to speedup release Change-Id: I25ef0497a4455b8229b453e1023abb4631d4b6d3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
48cb5ffba6
|
@ -51,6 +51,7 @@
|
||||||
import org.eclipse.jgit.api.errors.NoFilepatternException;
|
import org.eclipse.jgit.api.errors.NoFilepatternException;
|
||||||
import org.eclipse.jgit.attributes.Attribute;
|
import org.eclipse.jgit.attributes.Attribute;
|
||||||
import org.eclipse.jgit.dircache.DirCache;
|
import org.eclipse.jgit.dircache.DirCache;
|
||||||
|
import org.eclipse.jgit.dircache.DirCacheEditor;
|
||||||
import org.eclipse.jgit.dircache.DirCacheEntry;
|
import org.eclipse.jgit.dircache.DirCacheEntry;
|
||||||
import org.eclipse.jgit.dircache.DirCacheIterator;
|
import org.eclipse.jgit.dircache.DirCacheIterator;
|
||||||
import org.eclipse.jgit.errors.RevisionSyntaxException;
|
import org.eclipse.jgit.errors.RevisionSyntaxException;
|
||||||
|
@ -61,9 +62,11 @@
|
||||||
import org.eclipse.jgit.lib.CoreConfig.EOL;
|
import org.eclipse.jgit.lib.CoreConfig.EOL;
|
||||||
import org.eclipse.jgit.lib.FileMode;
|
import org.eclipse.jgit.lib.FileMode;
|
||||||
import org.eclipse.jgit.lib.ObjectLoader;
|
import org.eclipse.jgit.lib.ObjectLoader;
|
||||||
|
import org.eclipse.jgit.revwalk.RevCommit;
|
||||||
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
||||||
import org.eclipse.jgit.treewalk.FileTreeIterator;
|
import org.eclipse.jgit.treewalk.FileTreeIterator;
|
||||||
import org.eclipse.jgit.treewalk.TreeWalk;
|
import org.eclipse.jgit.treewalk.TreeWalk;
|
||||||
|
import org.eclipse.jgit.util.FS;
|
||||||
import org.eclipse.jgit.util.IO;
|
import org.eclipse.jgit.util.IO;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
@ -82,6 +85,14 @@ public class EolRepositoryTest extends RepositoryTestCase {
|
||||||
|
|
||||||
private static final FileMode F = FileMode.REGULAR_FILE;
|
private static final FileMode F = FileMode.REGULAR_FILE;
|
||||||
|
|
||||||
|
@DataPoint
|
||||||
|
public static boolean doSmudgeEntries = true;
|
||||||
|
|
||||||
|
@DataPoint
|
||||||
|
public static boolean dontSmudgeEntries = false;
|
||||||
|
|
||||||
|
private boolean smudge;
|
||||||
|
|
||||||
@DataPoint
|
@DataPoint
|
||||||
public static String smallContents[] = {
|
public static String smallContents[] = {
|
||||||
generateTestData(3, 1, true, false),
|
generateTestData(3, 1, true, false),
|
||||||
|
@ -117,10 +128,11 @@ static String generateTestData(int size, int lineSize, boolean withCRLF,
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public EolRepositoryTest(String[] testContent) {
|
public EolRepositoryTest(String[] testContent, boolean smudgeEntries) {
|
||||||
CONTENT_CRLF = testContent[0];
|
CONTENT_CRLF = testContent[0];
|
||||||
CONTENT_LF = testContent[1];
|
CONTENT_LF = testContent[1];
|
||||||
CONTENT_MIXED = testContent[2];
|
CONTENT_MIXED = testContent[2];
|
||||||
|
this.smudge = smudgeEntries;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected String CONTENT_CRLF;
|
protected String CONTENT_CRLF;
|
||||||
|
@ -160,7 +172,7 @@ private static class ActualEntry {
|
||||||
|
|
||||||
private ActualEntry entryMixed = new ActualEntry();
|
private ActualEntry entryMixed = new ActualEntry();
|
||||||
|
|
||||||
private DirCache dc;
|
private DirCache dirCache;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testDefaultSetup() throws Exception {
|
public void testDefaultSetup() throws Exception {
|
||||||
|
@ -177,7 +189,9 @@ public void checkEntryContent(ActualEntry entry, String fileContent,
|
||||||
String indexContent) {
|
String indexContent) {
|
||||||
assertEquals(fileContent, entry.file);
|
assertEquals(fileContent, entry.file);
|
||||||
assertEquals(indexContent, entry.index);
|
assertEquals(indexContent, entry.index);
|
||||||
assertEquals(fileContent.length(), entry.indexContentLength);
|
if (entry.indexContentLength != 0) {
|
||||||
|
assertEquals(fileContent.length(), entry.indexContentLength);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -584,6 +598,14 @@ private void setupGitAndDoHardReset(AutoCRLF autoCRLF, EOL eol,
|
||||||
dotGitattributes = null;
|
dotGitattributes = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fileCRLF = createAndAddFile(git, "file1.txt", "a");
|
||||||
|
|
||||||
|
fileLF = createAndAddFile(git, "file2.txt", "a");
|
||||||
|
|
||||||
|
fileMixed = createAndAddFile(git, "file3.txt", "a");
|
||||||
|
|
||||||
|
RevCommit c = gitCommit(git, "create files");
|
||||||
|
|
||||||
fileCRLF = createAndAddFile(git, "file1.txt", CONTENT_CRLF);
|
fileCRLF = createAndAddFile(git, "file1.txt", CONTENT_CRLF);
|
||||||
|
|
||||||
fileLF = createAndAddFile(git, "file2.txt", CONTENT_LF);
|
fileLF = createAndAddFile(git, "file2.txt", CONTENT_LF);
|
||||||
|
@ -593,6 +615,26 @@ private void setupGitAndDoHardReset(AutoCRLF autoCRLF, EOL eol,
|
||||||
gitCommit(git, "addFiles");
|
gitCommit(git, "addFiles");
|
||||||
|
|
||||||
recreateWorktree(git);
|
recreateWorktree(git);
|
||||||
|
|
||||||
|
if (smudge) {
|
||||||
|
DirCache dc = DirCache.lock(git.getRepository().getIndexFile(),
|
||||||
|
FS.detect());
|
||||||
|
DirCacheEditor editor = dc.editor();
|
||||||
|
for (int i = 0; i < dc.getEntryCount(); i++) {
|
||||||
|
editor.add(new DirCacheEditor.PathEdit(
|
||||||
|
dc.getEntry(i).getPathString()) {
|
||||||
|
public void apply(DirCacheEntry ent) {
|
||||||
|
ent.smudgeRacilyClean();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
editor.commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
// @TODO: find out why the following assertion would break the tests
|
||||||
|
// assertTrue(git.status().call().isClean());
|
||||||
|
git.checkout().setName(c.getName()).call();
|
||||||
|
git.checkout().setName("master").call();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void recreateWorktree(Git git)
|
private void recreateWorktree(Git git)
|
||||||
|
@ -610,8 +652,8 @@ private void recreateWorktree(Git git)
|
||||||
gitAdd(git, ".");
|
gitAdd(git, ".");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void gitCommit(Git git, String msg) throws GitAPIException {
|
protected RevCommit gitCommit(Git git, String msg) throws GitAPIException {
|
||||||
git.commit().setMessage(msg).call();
|
return git.commit().setMessage(msg).call();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void gitAdd(Git git, String path) throws GitAPIException {
|
protected void gitAdd(Git git, String path) throws GitAPIException {
|
||||||
|
@ -644,7 +686,7 @@ private File createAndAddFile(Git git, String path, String content)
|
||||||
}
|
}
|
||||||
|
|
||||||
private void collectRepositoryState() throws Exception {
|
private void collectRepositoryState() throws Exception {
|
||||||
dc = db.readDirCache();
|
dirCache = db.readDirCache();
|
||||||
walk = beginWalk();
|
walk = beginWalk();
|
||||||
if (dotGitattributes != null)
|
if (dotGitattributes != null)
|
||||||
collectEntryContentAndAttributes(F, ".gitattributes", null);
|
collectEntryContentAndAttributes(F, ".gitattributes", null);
|
||||||
|
@ -680,7 +722,7 @@ private void collectEntryContentAndAttributes(FileMode type, String pathName,
|
||||||
e.attrs = e.attrs.trim();
|
e.attrs = e.attrs.trim();
|
||||||
e.file = new String(
|
e.file = new String(
|
||||||
IO.readFully(new File(db.getWorkTree(), pathName)));
|
IO.readFully(new File(db.getWorkTree(), pathName)));
|
||||||
DirCacheEntry dce = dc.getEntry(pathName);
|
DirCacheEntry dce = dirCache.getEntry(pathName);
|
||||||
ObjectLoader open = walk.getObjectReader().open(dce.getObjectId());
|
ObjectLoader open = walk.getObjectReader().open(dce.getObjectId());
|
||||||
e.index = new String(open.getBytes());
|
e.index = new String(open.getBytes());
|
||||||
e.indexContentLength = dce.getLength();
|
e.indexContentLength = dce.getLength();
|
||||||
|
|
|
@ -579,17 +579,31 @@ public Attributes getAttributes() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param opType
|
||||||
|
* the operationtype (checkin/checkout) which should be used
|
||||||
|
* @return the EOL stream type of the current entry using the config and
|
||||||
|
* {@link #getAttributes()} Note that this method may return null if
|
||||||
|
* the {@link TreeWalk} is not based on a working tree
|
||||||
|
*/
|
||||||
|
// TODO(msohn) make this method public in 4.4
|
||||||
|
@Nullable
|
||||||
|
EolStreamType getEolStreamType(OperationType opType) {
|
||||||
|
if (attributesNodeProvider == null || config == null)
|
||||||
|
return null;
|
||||||
|
return EolStreamTypeUtil.detectStreamType(opType,
|
||||||
|
config.get(WorkingTreeOptions.KEY), getAttributes());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the EOL stream type of the current entry using the config and
|
* @return the EOL stream type of the current entry using the config and
|
||||||
* {@link #getAttributes()} Note that this method may return null if
|
* {@link #getAttributes()} Note that this method may return null if
|
||||||
* the {@link TreeWalk} is not based on a working tree
|
* the {@link TreeWalk} is not based on a working tree
|
||||||
* @since 4.3
|
* @since 4.3
|
||||||
*/
|
*/
|
||||||
|
// TODO(msohn) deprecate this method in 4.4
|
||||||
public @Nullable EolStreamType getEolStreamType() {
|
public @Nullable EolStreamType getEolStreamType() {
|
||||||
if (attributesNodeProvider == null || config == null)
|
return (getEolStreamType(operationType));
|
||||||
return null;
|
|
||||||
return EolStreamTypeUtil.detectStreamType(operationType,
|
|
||||||
config.get(WorkingTreeOptions.KEY), getAttributes());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Reset this walker so new tree iterators can be added to it. */
|
/** Reset this walker so new tree iterators can be added to it. */
|
||||||
|
|
|
@ -86,6 +86,7 @@
|
||||||
import org.eclipse.jgit.lib.ObjectReader;
|
import org.eclipse.jgit.lib.ObjectReader;
|
||||||
import org.eclipse.jgit.lib.Repository;
|
import org.eclipse.jgit.lib.Repository;
|
||||||
import org.eclipse.jgit.submodule.SubmoduleWalk;
|
import org.eclipse.jgit.submodule.SubmoduleWalk;
|
||||||
|
import org.eclipse.jgit.treewalk.TreeWalk.OperationType;
|
||||||
import org.eclipse.jgit.util.FS;
|
import org.eclipse.jgit.util.FS;
|
||||||
import org.eclipse.jgit.util.FS.ExecutionResult;
|
import org.eclipse.jgit.util.FS.ExecutionResult;
|
||||||
import org.eclipse.jgit.util.Holder;
|
import org.eclipse.jgit.util.Holder;
|
||||||
|
@ -361,7 +362,8 @@ private byte[] idBufferBlob(final Entry e) {
|
||||||
state.initializeDigestAndReadBuffer();
|
state.initializeDigestAndReadBuffer();
|
||||||
|
|
||||||
final long len = e.getLength();
|
final long len = e.getLength();
|
||||||
InputStream filteredIs = possiblyFilteredInputStream(e, is, len);
|
InputStream filteredIs = possiblyFilteredInputStream(e, is, len,
|
||||||
|
OperationType.CHECKIN_OP);
|
||||||
return computeHash(filteredIs, canonLen);
|
return computeHash(filteredIs, canonLen);
|
||||||
} finally {
|
} finally {
|
||||||
safeClose(is);
|
safeClose(is);
|
||||||
|
@ -374,8 +376,15 @@ private byte[] idBufferBlob(final Entry e) {
|
||||||
|
|
||||||
private InputStream possiblyFilteredInputStream(final Entry e,
|
private InputStream possiblyFilteredInputStream(final Entry e,
|
||||||
final InputStream is, final long len) throws IOException {
|
final InputStream is, final long len) throws IOException {
|
||||||
|
return possiblyFilteredInputStream(e, is, len, null);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private InputStream possiblyFilteredInputStream(final Entry e,
|
||||||
|
final InputStream is, final long len, OperationType opType)
|
||||||
|
throws IOException {
|
||||||
if (getCleanFilterCommand() == null
|
if (getCleanFilterCommand() == null
|
||||||
&& getEolStreamType() == EolStreamType.DIRECT) {
|
&& getEolStreamType(opType) == EolStreamType.DIRECT) {
|
||||||
canonLen = len;
|
canonLen = len;
|
||||||
return is;
|
return is;
|
||||||
}
|
}
|
||||||
|
@ -385,7 +394,7 @@ && getEolStreamType() == EolStreamType.DIRECT) {
|
||||||
byte[] raw = rawbuf.array();
|
byte[] raw = rawbuf.array();
|
||||||
int n = rawbuf.limit();
|
int n = rawbuf.limit();
|
||||||
if (!isBinary(raw, n)) {
|
if (!isBinary(raw, n)) {
|
||||||
rawbuf = filterClean(raw, n);
|
rawbuf = filterClean(raw, n, opType);
|
||||||
raw = rawbuf.array();
|
raw = rawbuf.array();
|
||||||
n = rawbuf.limit();
|
n = rawbuf.limit();
|
||||||
}
|
}
|
||||||
|
@ -398,13 +407,14 @@ && getEolStreamType() == EolStreamType.DIRECT) {
|
||||||
return is;
|
return is;
|
||||||
}
|
}
|
||||||
|
|
||||||
final InputStream lenIs = filterClean(e.openInputStream());
|
final InputStream lenIs = filterClean(e.openInputStream(),
|
||||||
|
opType);
|
||||||
try {
|
try {
|
||||||
canonLen = computeLength(lenIs);
|
canonLen = computeLength(lenIs);
|
||||||
} finally {
|
} finally {
|
||||||
safeClose(lenIs);
|
safeClose(lenIs);
|
||||||
}
|
}
|
||||||
return filterClean(is);
|
return filterClean(is, opType);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void safeClose(final InputStream in) {
|
private static void safeClose(final InputStream in) {
|
||||||
|
@ -430,17 +440,23 @@ private static boolean isBinary(Entry entry) throws IOException {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private ByteBuffer filterClean(byte[] src, int n) throws IOException {
|
private ByteBuffer filterClean(byte[] src, int n, OperationType opType)
|
||||||
|
throws IOException {
|
||||||
InputStream in = new ByteArrayInputStream(src);
|
InputStream in = new ByteArrayInputStream(src);
|
||||||
try {
|
try {
|
||||||
return IO.readWholeStream(filterClean(in), n);
|
return IO.readWholeStream(filterClean(in, opType), n);
|
||||||
} finally {
|
} finally {
|
||||||
safeClose(in);
|
safeClose(in);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private InputStream filterClean(InputStream in) throws IOException {
|
private InputStream filterClean(InputStream in) throws IOException {
|
||||||
in = handleAutoCRLF(in);
|
return filterClean(in, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private InputStream filterClean(InputStream in, OperationType opType)
|
||||||
|
throws IOException {
|
||||||
|
in = handleAutoCRLF(in, opType);
|
||||||
String filterCommand = getCleanFilterCommand();
|
String filterCommand = getCleanFilterCommand();
|
||||||
if (filterCommand != null) {
|
if (filterCommand != null) {
|
||||||
FS fs = repository.getFS();
|
FS fs = repository.getFS();
|
||||||
|
@ -469,8 +485,9 @@ filterCommand, getEntryPathString(),
|
||||||
return in;
|
return in;
|
||||||
}
|
}
|
||||||
|
|
||||||
private InputStream handleAutoCRLF(InputStream in) throws IOException {
|
private InputStream handleAutoCRLF(InputStream in, OperationType opType)
|
||||||
return EolStreamTypeUtil.wrapInputStream(in, getEolStreamType());
|
throws IOException {
|
||||||
|
return EolStreamTypeUtil.wrapInputStream(in, getEolStreamType(opType));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1332,10 +1349,28 @@ public String getCleanFilterCommand() throws IOException {
|
||||||
* @since 4.3
|
* @since 4.3
|
||||||
*/
|
*/
|
||||||
public EolStreamType getEolStreamType() throws IOException {
|
public EolStreamType getEolStreamType() throws IOException {
|
||||||
|
return getEolStreamType(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param opType
|
||||||
|
* The operationtype (checkin/checkout) which should be used
|
||||||
|
* @return the eol stream type for the current entry or <code>null</code> if
|
||||||
|
* it cannot be determined. When state or state.walk is null or the
|
||||||
|
* {@link TreeWalk} is not based on a {@link Repository} then null
|
||||||
|
* is returned.
|
||||||
|
* @throws IOException
|
||||||
|
*/
|
||||||
|
private EolStreamType getEolStreamType(OperationType opType)
|
||||||
|
throws IOException {
|
||||||
if (eolStreamTypeHolder == null) {
|
if (eolStreamTypeHolder == null) {
|
||||||
EolStreamType type=null;
|
EolStreamType type=null;
|
||||||
if (state.walk != null) {
|
if (state.walk != null) {
|
||||||
type=state.walk.getEolStreamType();
|
if (opType != null) {
|
||||||
|
type = state.walk.getEolStreamType(opType);
|
||||||
|
} else {
|
||||||
|
type=state.walk.getEolStreamType();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (getOptions().getAutoCRLF()) {
|
switch (getOptions().getAutoCRLF()) {
|
||||||
case FALSE:
|
case FALSE:
|
||||||
|
|
|
@ -47,6 +47,5 @@ git commit -a -s -m "$MSG"
|
||||||
git tag -sf -m "$MSG" $1
|
git tag -sf -m "$MSG" $1
|
||||||
|
|
||||||
# run the build
|
# run the build
|
||||||
mvn clean install
|
mvn clean install -T 1C
|
||||||
mvn clean install -f org.eclipse.jgit.packaging/pom.xml
|
mvn clean install -f org.eclipse.jgit.packaging/pom.xml
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue