Browse Source

Merge branch 'stable-3.7'

* stable-3.7:
  Prepare 3.7.1-SNAPSHOT builds
  JGit v3.7.0.201502260915-r
  Read user.name and email from environment first
  Provide more details in exceptions thrown when packfile is invalid

Change-Id: I427f861c6bc94da5e3e05dbbebbf0ad15719a323
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.0
Matthias Sohn 10 years ago
parent
commit
1350f7ea1d
  1. 2
      org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java
  2. 2
      org.eclipse.jgit.java7/META-INF/MANIFEST.MF
  3. 17
      org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
  4. 7
      org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
  5. 1
      org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
  6. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
  7. 6
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java
  8. 10
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
  9. 8
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java
  10. 17
      org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java
  11. 3
      org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java

2
org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/ProtocolErrorTest.java

@ -162,7 +162,7 @@ public class ProtocolErrorTest extends HttpTestCase {
try {
PacketLineIn pckin = new PacketLineIn(rawin);
assertEquals("unpack error "
+ JGitText.get().packfileIsTruncated,
+ JGitText.get().packfileIsTruncatedNoParam,
pckin.readString());
assertEquals("ng refs/objects/A n/a (unpacker error)",
pckin.readString());

2
org.eclipse.jgit.java7/META-INF/MANIFEST.MF

@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Fragment-Host: org.eclipse.jgit;bundle-version="3.1.1"
Fragment-Host: org.eclipse.jgit;bundle-version="4.0.0"
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.java7
Bundle-Version: 4.0.0.qualifier

17
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java

@ -186,6 +186,9 @@ public class ConfigTest {
assertFalse(localConfig.get(UserConfig.KEY).isAuthorEmailImplicit());
// the values are defined in the global configuration
// first clear environment variables since they would override
// configuration files
mockSystemReader.clearProperties();
userGitConfig.setString("user", null, "name", "global username");
userGitConfig.setString("user", null, "email", "author@globalemail");
authorName = localConfig.get(UserConfig.KEY).getAuthorName();
@ -211,6 +214,20 @@ public class ConfigTest {
assertEquals("author@localemail", authorEmail);
assertFalse(localConfig.get(UserConfig.KEY).isCommitterNameImplicit());
assertFalse(localConfig.get(UserConfig.KEY).isCommitterEmailImplicit());
// also git environment variables are defined
mockSystemReader.setProperty(Constants.GIT_AUTHOR_NAME_KEY,
"git author name");
mockSystemReader.setProperty(Constants.GIT_AUTHOR_EMAIL_KEY,
"author@email");
localConfig.setString("user", null, "name", "local username");
localConfig.setString("user", null, "email", "author@localemail");
authorName = localConfig.get(UserConfig.KEY).getAuthorName();
authorEmail = localConfig.get(UserConfig.KEY).getAuthorEmail();
assertEquals("git author name", authorName);
assertEquals("author@email", authorEmail);
assertFalse(localConfig.get(UserConfig.KEY).isAuthorNameImplicit());
assertFalse(localConfig.get(UserConfig.KEY).isAuthorEmailImplicit());
}
@Test

7
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties

@ -146,7 +146,7 @@ couldNotRenameTemporaryIndexFileToIndex=Could not rename temporary index file to
couldNotURLEncodeToUTF8=Could not URL encode to UTF-8
couldNotWriteFile=Could not write file {0}
countingObjects=Counting objects
corruptPack=Pack file {0} is corrupt
corruptPack=Pack file {0} is corrupt, removing it from pack list
createBranchFailedUnknownReason=Create branch failed for unknown reason
createBranchUnexpectedResult=Create branch returned unexpected result {0}
createNewFileFailed=Could not create new file {0}
@ -382,14 +382,15 @@ openFilesMustBeAtLeast1=Open files must be >= 1
openingConnection=Opening connection
operationCanceled=Operation {0} was canceled
outputHasAlreadyBeenStarted=Output has already been started.
packChecksumMismatch=Pack checksum mismatch
packChecksumMismatch=Pack checksum mismatch detected for pack file {0}
packCorruptedWhileWritingToFilesystem=Pack corrupted while writing to filesystem
packDoesNotMatchIndex=Pack {0} does not match index
packetSizeMustBeAtLeast=packet size {0} must be >= {1}
packetSizeMustBeAtMost=packet size {0} must be <= {1}
packfileCorruptionDetected=Packfile corruption detected: {0}
packFileInvalid=Pack file invalid: {0}
packfileIsTruncated=Packfile is truncated.
packfileIsTruncated=Packfile {0} is truncated.
packfileIsTruncatedNoParam=Packfile is truncated.
packHasUnresolvedDeltas=pack has unresolved deltas
packingCancelledDuringObjectsWriting=Packing cancelled during objects writing
packObjectCountMismatch=Pack object count mismatch: pack {0} index {1}: {2}

1
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java

@ -449,6 +449,7 @@ public class JGitText extends TranslationBundle {
/***/ public String packfileCorruptionDetected;
/***/ public String packFileInvalid;
/***/ public String packfileIsTruncated;
/***/ public String packfileIsTruncatedNoParam;
/***/ public String packHasUnresolvedDeltas;
/***/ public String packingCancelledDuringObjectsWriting;
/***/ public String packObjectCountMismatch;

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java

@ -199,7 +199,7 @@ public final class DfsPackFile implements AutoCloseable {
return key.cachedSize.get();
}
private String getPackName() {
String getPackName() {
return packDesc.getFileName(PACK);
}

6
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java

@ -556,7 +556,8 @@ public final class DfsReader extends ObjectReader implements ObjectReuseAsIs {
pin(pack, 0);
if (block.copy(0, buf, 0, 12) != 12) {
pack.setInvalid();
throw new IOException(JGitText.get().packfileIsTruncated);
throw new IOException(MessageFormat.format(
JGitText.get().packfileIsTruncated, pack.getPackName()));
}
md.update(buf, 0, 12);
}
@ -580,7 +581,8 @@ public final class DfsReader extends ObjectReader implements ObjectReuseAsIs {
pin(pack, position);
if (block.copy(position, buf, 0, 20) != 20) {
pack.setInvalid();
throw new IOException(JGitText.get().packfileIsTruncated);
throw new IOException(MessageFormat.format(
JGitText.get().packfileIsTruncated, pack.getPackName()));
}
if (!Arrays.equals(actHash, buf)) {
pack.setInvalid();

10
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java

@ -170,11 +170,13 @@ public class PackFile implements Iterable<PackIndex.MutableEntry>,
try {
final PackIndex idx = PackIndex.open(extFile(INDEX));
if (packChecksum == null)
if (packChecksum == null) {
packChecksum = idx.packChecksum;
else if (!Arrays.equals(packChecksum, idx.packChecksum))
throw new PackMismatchException(JGitText.get().packChecksumMismatch);
} else if (!Arrays.equals(packChecksum, idx.packChecksum)) {
throw new PackMismatchException(MessageFormat.format(
JGitText.get().packChecksumMismatch,
packFile.getPath()));
}
loadedIdx = idx;
} catch (IOException e) {
invalid = true;

8
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java

@ -246,7 +246,9 @@ final class WindowCursor extends ObjectReader implements ObjectReuseAsIs {
pin(pack, 0);
if (window.copy(0, buf, 0, 12) != 12) {
pack.setInvalid();
throw new IOException(JGitText.get().packfileIsTruncated);
throw new IOException(MessageFormat.format(
JGitText.get().packfileIsTruncated, pack.getPackFile()
.getPath()));
}
md.update(buf, 0, 12);
}
@ -270,7 +272,9 @@ final class WindowCursor extends ObjectReader implements ObjectReuseAsIs {
pin(pack, position);
if (window.copy(position, buf, 0, 20) != 20) {
pack.setInvalid();
throw new IOException(JGitText.get().packfileIsTruncated);
throw new IOException(MessageFormat.format(
JGitText.get().packfileIsTruncated, pack.getPackFile()
.getPath()));
}
if (!Arrays.equals(actHash, buf)) {
pack.setInvalid();

17
org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java

@ -172,12 +172,13 @@ public class UserConfig {
}
private static String getNameInternal(Config rc, String envKey) {
// try to get the user name from the local and global configurations.
String username = rc.getString("user", null, "name"); //$NON-NLS-1$ //$NON-NLS-2$
// try to get the user name for the system property GIT_XXX_NAME
String username = system().getenv(envKey);
if (username == null) {
// try to get the user name for the system property GIT_XXX_NAME
username = system().getenv(envKey);
// try to get the user name from the local and global
// configurations.
username = rc.getString("user", null, "name"); //$NON-NLS-1$ //$NON-NLS-2$
}
return stripInvalidCharacters(username);
@ -196,12 +197,12 @@ public class UserConfig {
}
private static String getEmailInternal(Config rc, String envKey) {
// try to get the email from the local and global configurations.
String email = rc.getString("user", null, "email"); //$NON-NLS-1$ //$NON-NLS-2$
// try to get the email for the system property GIT_XXX_EMAIL
String email = system().getenv(envKey);
if (email == null) {
// try to get the email for the system property GIT_XXX_EMAIL
email = system().getenv(envKey);
// try to get the email from the local and global configurations.
email = rc.getString("user", null, "email"); //$NON-NLS-1$ //$NON-NLS-2$
}
return stripInvalidCharacters(email);

3
org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java

@ -1135,7 +1135,8 @@ public abstract class PackParser {
break;
}
if (next <= 0)
throw new EOFException(JGitText.get().packfileIsTruncated);
throw new EOFException(
JGitText.get().packfileIsTruncatedNoParam);
bAvail += next;
}
return bOffset;

Loading…
Cancel
Save