Browse Source

Merge branch 'stable-3.0'

* stable-3.0:
  Prepare post 3.0.0-rc2 builds
  JGit v3.0.0.201305281830-rc2
  Support refspecs with wildcard in middle (not only at end)
  Fix multiple bugs in RawSubStringPattern used by MessageRevFilter
  Handle short branch/tag name for setBranch in CloneCommand
  Add missing Bundle-Localization header
  Apply tree filter marks when pairing DiffEntry for renames
  Improve feature names to become understandable by end users
  Update kepler orbit version to R20130517111416
  Fix BatchRefUpdate progress-monitoring so it doesn't count twice
  Fix AnyObjectId's generic type declaration of Comparable
  Fix DiffFormatter NPEs for DiffEntry without content change
  Fix CommitCommand not to destroy repo
  Fix the parameters to an exception
  Prepare post 3.0.0 M7 builds
  JGit v3.0.0.201305080800-m7

Change-Id: Ia8441c9796f01497e0d90e672c0aaf60520a0098
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-3.1
Matthias Sohn 11 years ago
parent
commit
658401c8ef
  1. 1
      org.eclipse.jgit.java7/META-INF/MANIFEST.MF
  2. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
  3. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.properties
  4. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.properties
  5. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.properties
  6. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.properties
  7. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.properties
  8. 2
      org.eclipse.jgit.packaging/pom.xml
  9. 40
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
  10. 27
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
  11. 31
      org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java
  12. 37
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java
  13. 150
      org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RefSpecTest.java
  14. 104
      org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawSubStringPatternTest.java
  15. 1
      org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
  16. 18
      org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java
  17. 131
      org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
  18. 2
      org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java
  19. 7
      org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java
  20. 1
      org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
  21. 38
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
  22. 6
      org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java
  23. 5
      org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java
  24. 81
      org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java
  25. 10
      org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java

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

@ -4,6 +4,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="3.0.0"
Bundle-Name: %plugin_name Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.java7 Bundle-SymbolicName: org.eclipse.jgit.java7
Bundle-Version: 3.0.0.qualifier Bundle-Version: 3.0.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.jgit.util;version="3.0.0" Export-Package: org.eclipse.jgit.util;version="3.0.0"

2
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties

@ -8,7 +8,7 @@
# #
############################################################################### ###############################################################################
featureName=Eclipse JGit featureName=Java implementation of Git
providerName=Eclipse JGit providerName=Eclipse JGit
updateSiteName=Eclipse JGit Update Site updateSiteName=Eclipse JGit Update Site

2
org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/feature.properties

@ -8,7 +8,7 @@
# #
############################################################################### ###############################################################################
featureName=Eclipse JGit - Java7 fragments featureName=Java implementation of Git - optional Java 7 libraries
providerName=Eclipse JGit providerName=Eclipse JGit
updateSiteName=Eclipse JGit Update Site updateSiteName=Eclipse JGit Update Site

2
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.properties

@ -9,7 +9,7 @@
# #
############################################################################### ###############################################################################
featureName=Eclipse JGit JUnit Test Support featureName=JUnit test support for Java implementation of Git
providerName=Eclipse JGit providerName=Eclipse JGit
updateSiteName=Eclipse JGit Update Site updateSiteName=Eclipse JGit Update Site

2
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.properties

@ -8,7 +8,7 @@
# #
############################################################################### ###############################################################################
featureName=Eclipse JGit Command Line Interface featureName=Command Line Interface for Java implementation of Git
providerName=Eclipse JGit providerName=Eclipse JGit
updateSiteName=Eclipse JGit Update Site updateSiteName=Eclipse JGit Update Site

2
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.properties

@ -8,7 +8,7 @@
# #
############################################################################### ###############################################################################
featureName=Eclipse JGit Command Line Interface - Source featureName=Command Line Interface for Java implementation of Git - Source Code
providerName=Eclipse JGit providerName=Eclipse JGit
updateSiteName=Eclipse JGit Update Site updateSiteName=Eclipse JGit Update Site

2
org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.properties

@ -8,7 +8,7 @@
# #
############################################################################### ###############################################################################
featureName=Eclipse JGit - Source featureName=Java implementation of Git - Source Code
providerName=Eclipse JGit providerName=Eclipse JGit
updateSiteName=Eclipse JGit Update Site updateSiteName=Eclipse JGit Update Site

2
org.eclipse.jgit.packaging/pom.xml

@ -64,7 +64,7 @@
<args4j-version>2.0.21.v201301150030</args4j-version> <args4j-version>2.0.21.v201301150030</args4j-version>
<jsch-version>0.1.46.v201205102330</jsch-version> <jsch-version>0.1.46.v201205102330</jsch-version>
<eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site> <eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/</orbit-site> <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/</orbit-site>
</properties> </properties>
<modules> <modules>

40
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011, Chris Aniszczyk <caniszczyk@gmail.com> * Copyright (C) 2011, 2013 Chris Aniszczyk <caniszczyk@gmail.com>
* and other copyright owners as documented in the project's IP log. * and other copyright owners as documented in the project's IP log.
* *
* This program and the accompanying materials are made available * This program and the accompanying materials are made available
@ -64,7 +64,6 @@ import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevBlob; import org.eclipse.jgit.revwalk.RevBlob;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
@ -92,11 +91,10 @@ public class CloneCommandTest extends RepositoryTestCase {
writeTrashFile("Test.txt", "Hello world"); writeTrashFile("Test.txt", "Hello world");
git.add().addFilepattern("Test.txt").call(); git.add().addFilepattern("Test.txt").call();
git.commit().setMessage("Initial commit").call(); git.commit().setMessage("Initial commit").call();
git.tag().setName("tag-initial").setMessage("Tag initial").call();
// create a master branch and switch to it // create a test branch and switch to it
git.branchCreate().setName("test").call(); git.checkout().setCreateBranch(true).setName("test").call();
RefUpdate rup = db.updateRef(Constants.HEAD);
rup.link("refs/heads/test");
// commit something on the test branch // commit something on the test branch
writeTrashFile("Test.txt", "Some change"); writeTrashFile("Test.txt", "Some change");
@ -205,6 +203,36 @@ public class CloneCommandTest extends RepositoryTestCase {
.branchList().setListMode(ListMode.ALL).call())); .branchList().setListMode(ListMode.ALL).call()));
} }
@Test
public void testCloneRepositoryWithBranchShortName() throws Exception {
File directory = createTempDirectory("testCloneRepositoryWithBranch");
CloneCommand command = Git.cloneRepository();
command.setBranch("test");
command.setDirectory(directory);
command.setURI("file://" + git.getRepository().getWorkTree().getPath());
Git git2 = command.call();
addRepoToClose(git2.getRepository());
assertNotNull(git2);
assertEquals("refs/heads/test", git2.getRepository().getFullBranch());
}
@Test
public void testCloneRepositoryWithTagName() throws Exception {
File directory = createTempDirectory("testCloneRepositoryWithBranch");
CloneCommand command = Git.cloneRepository();
command.setBranch("tag-initial");
command.setDirectory(directory);
command.setURI("file://" + git.getRepository().getWorkTree().getPath());
Git git2 = command.call();
addRepoToClose(git2.getRepository());
assertNotNull(git2);
ObjectId taggedCommit = db.resolve("tag-initial^{commit}");
assertEquals(taggedCommit.name(), git2
.getRepository().getFullBranch());
}
@Test @Test
public void testCloneRepositoryOnlyOneBranch() throws IOException, public void testCloneRepositoryOnlyOneBranch() throws IOException,
JGitInternalException, GitAPIException { JGitInternalException, GitAPIException {

27
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java

@ -326,6 +326,33 @@ public class MergeCommandTest extends RepositoryTestCase {
assertEquals(RepositoryState.MERGING, db.getRepositoryState()); assertEquals(RepositoryState.MERGING, db.getRepositoryState());
} }
@Test
public void testMergeTag() throws Exception {
Git git = new Git(db);
writeTrashFile("a", "a");
git.add().addFilepattern("a").call();
RevCommit initialCommit = git.commit().setMessage("initial").call();
createBranch(initialCommit, "refs/heads/side");
checkoutBranch("refs/heads/side");
writeTrashFile("b", "b");
git.add().addFilepattern("b").call();
RevCommit secondCommit = git.commit().setMessage("side").call();
Ref tag = git.tag().setAnnotated(true).setMessage("my tag 01")
.setName("tag01").setObjectId(secondCommit).call();
checkoutBranch("refs/heads/master");
writeTrashFile("a", "a2");
git.add().addFilepattern("a").call();
git.commit().setMessage("main").call();
MergeResult result = git.merge().include(tag).setStrategy(MergeStrategy.RESOLVE).call();
assertEquals(MergeStatus.MERGED, result.getMergeStatus());
}
@Test @Test
public void testMergeMessage() throws Exception { public void testMergeMessage() throws Exception {
Git git = new Git(db); Git git = new Git(db);

31
org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010, Google Inc. * Copyright (C) 2010, 2013 Google Inc.
* and other copyright owners as documented in the project's IP log. * and other copyright owners as documented in the project's IP log.
* *
* This program and the accompanying materials are made available * This program and the accompanying materials are made available
@ -256,6 +256,35 @@ public class DiffFormatterTest extends RepositoryTestCase {
assertEquals(0, hh.toEditList().size()); assertEquals(0, hh.toEditList().size());
} }
@Test
public void testCreateFileHeaderWithoutIndexLine() throws Exception {
DiffEntry m = DiffEntry.modify(PATH_A);
m.oldMode = FileMode.REGULAR_FILE;
m.newMode = FileMode.EXECUTABLE_FILE;
FileHeader fh = df.toFileHeader(m);
String expected = DIFF + "a/src/a b/src/a\n" + //
"old mode 100644\n" + //
"new mode 100755\n";
assertEquals(expected, fh.getScriptText());
}
@Test
public void testCreateFileHeaderForRenameWithoutContentChange() throws Exception {
DiffEntry a = DiffEntry.delete(PATH_A, ObjectId.zeroId());
DiffEntry b = DiffEntry.add(PATH_B, ObjectId.zeroId());
DiffEntry m = DiffEntry.pair(ChangeType.RENAME, a, b, 100);
m.oldId = null;
m.newId = null;
FileHeader fh = df.toFileHeader(m);
String expected = DIFF + "a/src/a b/src/b\n" + //
"similarity index 100%\n" + //
"rename from src/a\n" + //
"rename to src/b\n";
assertEquals(expected, fh.getScriptText());
}
@Test @Test
public void testDiff() throws Exception { public void testDiff() throws Exception {
write(new File(db.getDirectory().getParent(), "test.txt"), "test"); write(new File(db.getDirectory().getParent(), "test.txt"), "test");

37
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010, Google Inc. * Copyright (C) 2010, 2013 Google Inc.
* and other copyright owners as documented in the project's IP log. * and other copyright owners as documented in the project's IP log.
* *
* This program and the accompanying materials are made available * This program and the accompanying materials are made available
@ -73,6 +73,7 @@ import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase;
import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.BatchRefUpdate; import org.eclipse.jgit.lib.BatchRefUpdate;
import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.NullProgressMonitor;
import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Ref.Storage; import org.eclipse.jgit.lib.Ref.Storage;
@ -1191,8 +1192,7 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
ReceiveCommand.Type.UPDATE_NONFASTFORWARD)); ReceiveCommand.Type.UPDATE_NONFASTFORWARD));
BatchRefUpdate batchUpdate = refdir.newBatchUpdate(); BatchRefUpdate batchUpdate = refdir.newBatchUpdate();
batchUpdate.addCommand(commands); batchUpdate.addCommand(commands);
batchUpdate batchUpdate.execute(new RevWalk(diskRepo), new StrictWorkMonitor());
.execute(new RevWalk(diskRepo), NullProgressMonitor.INSTANCE);
Map<String, Ref> refs = refdir.getRefs(RefDatabase.ALL); Map<String, Ref> refs = refdir.getRefs(RefDatabase.ALL);
assertEquals(ReceiveCommand.Result.OK, commands.get(0).getResult()); assertEquals(ReceiveCommand.Result.OK, commands.get(0).getResult());
assertEquals(ReceiveCommand.Result.REJECTED_NONFASTFORWARD, commands assertEquals(ReceiveCommand.Result.REJECTED_NONFASTFORWARD, commands
@ -1215,8 +1215,7 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
BatchRefUpdate batchUpdate = refdir.newBatchUpdate(); BatchRefUpdate batchUpdate = refdir.newBatchUpdate();
batchUpdate.setAllowNonFastForwards(true); batchUpdate.setAllowNonFastForwards(true);
batchUpdate.addCommand(commands); batchUpdate.addCommand(commands);
batchUpdate batchUpdate.execute(new RevWalk(diskRepo), new StrictWorkMonitor());
.execute(new RevWalk(diskRepo), NullProgressMonitor.INSTANCE);
Map<String, Ref> refs = refdir.getRefs(RefDatabase.ALL); Map<String, Ref> refs = refdir.getRefs(RefDatabase.ALL);
assertEquals(ReceiveCommand.Result.OK, commands.get(0).getResult()); assertEquals(ReceiveCommand.Result.OK, commands.get(0).getResult());
assertEquals(ReceiveCommand.Result.OK, commands.get(1).getResult()); assertEquals(ReceiveCommand.Result.OK, commands.get(1).getResult());
@ -1267,8 +1266,7 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
BatchRefUpdate batchUpdate = refdir.newBatchUpdate(); BatchRefUpdate batchUpdate = refdir.newBatchUpdate();
batchUpdate.setAllowNonFastForwards(true); batchUpdate.setAllowNonFastForwards(true);
batchUpdate.addCommand(commands); batchUpdate.addCommand(commands);
batchUpdate batchUpdate.execute(new RevWalk(diskRepo), new StrictWorkMonitor());
.execute(new RevWalk(diskRepo), NullProgressMonitor.INSTANCE);
Map<String, Ref> refs = refdir.getRefs(RefDatabase.ALL); Map<String, Ref> refs = refdir.getRefs(RefDatabase.ALL);
assertEquals(ReceiveCommand.Result.OK, commands.get(0).getResult()); assertEquals(ReceiveCommand.Result.OK, commands.get(0).getResult());
assertEquals(ReceiveCommand.Result.OK, commands.get(1).getResult()); assertEquals(ReceiveCommand.Result.OK, commands.get(1).getResult());
@ -1311,4 +1309,29 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
File path = new File(diskRepo.getDirectory(), name); File path = new File(diskRepo.getDirectory(), name);
assertTrue("deleted " + name, path.delete()); assertTrue("deleted " + name, path.delete());
} }
private static final class StrictWorkMonitor implements ProgressMonitor {
private int lastWork, totalWork;
public void start(int totalTasks) {
// empty
}
public void beginTask(String title, int totalWork) {
this.totalWork = totalWork;
lastWork = 0;
}
public void update(int completed) {
lastWork += completed;
}
public void endTask() {
assertEquals("Units of work recorded", totalWork, lastWork);
}
public boolean isCancelled() {
return false;
}
}
} }

150
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RefSpecTest.java

@ -1,6 +1,7 @@
/* /*
* Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com> * Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
* Copyright (C) 2013, Robin Stocker <robin@nibor.org>
* and other copyright owners as documented in the project's IP log. * and other copyright owners as documented in the project's IP log.
* *
* This program and the accompanying materials are made available * This program and the accompanying materials are made available
@ -46,6 +47,7 @@ package org.eclipse.jgit.transport;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;
@ -294,4 +296,152 @@ public class RefSpecTest {
assertEquals(src, r.getSource()); assertEquals(src, r.getSource());
assertEquals(dst, r.getDestination()); assertEquals(dst, r.getDestination());
} }
@Test
public void isWildcardShouldWorkForWildcardSuffixAndComponent() {
assertTrue(RefSpec.isWildcard("refs/heads/*"));
assertTrue(RefSpec.isWildcard("refs/pull/*/head"));
assertFalse(RefSpec.isWildcard("refs/heads/a"));
}
@Test
public void testWildcardInMiddleOfSource() {
RefSpec a = new RefSpec("+refs/pull/*/head:refs/remotes/origin/pr/*");
assertTrue(a.isWildcard());
assertTrue(a.matchSource("refs/pull/a/head"));
assertTrue(a.matchSource("refs/pull/foo/head"));
assertTrue(a.matchSource("refs/pull/foo/bar/head"));
assertFalse(a.matchSource("refs/pull/foo"));
assertFalse(a.matchSource("refs/pull/head"));
assertFalse(a.matchSource("refs/pull/foo/head/more"));
assertFalse(a.matchSource("refs/pullx/head"));
RefSpec b = a.expandFromSource("refs/pull/foo/head");
assertEquals("refs/remotes/origin/pr/foo", b.getDestination());
RefSpec c = a.expandFromDestination("refs/remotes/origin/pr/foo");
assertEquals("refs/pull/foo/head", c.getSource());
}
@Test
public void testWildcardInMiddleOfDestionation() {
RefSpec a = new RefSpec("+refs/heads/*:refs/remotes/origin/*/head");
assertTrue(a.isWildcard());
assertTrue(a.matchDestination("refs/remotes/origin/a/head"));
assertTrue(a.matchDestination("refs/remotes/origin/foo/head"));
assertTrue(a.matchDestination("refs/remotes/origin/foo/bar/head"));
assertFalse(a.matchDestination("refs/remotes/origin/foo"));
assertFalse(a.matchDestination("refs/remotes/origin/head"));
assertFalse(a.matchDestination("refs/remotes/origin/foo/head/more"));
assertFalse(a.matchDestination("refs/remotes/originx/head"));
RefSpec b = a.expandFromSource("refs/heads/foo");
assertEquals("refs/remotes/origin/foo/head", b.getDestination());
RefSpec c = a.expandFromDestination("refs/remotes/origin/foo/head");
assertEquals("refs/heads/foo", c.getSource());
}
@Test
public void testWildcardMirror() {
RefSpec a = new RefSpec("*:*");
assertTrue(a.isWildcard());
assertTrue(a.matchSource("a"));
assertTrue(a.matchSource("foo"));
assertTrue(a.matchSource("foo/bar"));
assertTrue(a.matchDestination("a"));
assertTrue(a.matchDestination("foo"));
assertTrue(a.matchDestination("foo/bar"));
RefSpec b = a.expandFromSource("refs/heads/foo");
assertEquals("refs/heads/foo", b.getDestination());
RefSpec c = a.expandFromDestination("refs/heads/foo");
assertEquals("refs/heads/foo", c.getSource());
}
@Test
public void testWildcardAtStart() {
RefSpec a = new RefSpec("*/head:refs/heads/*");
assertTrue(a.isWildcard());
assertTrue(a.matchSource("a/head"));
assertTrue(a.matchSource("foo/head"));
assertTrue(a.matchSource("foo/bar/head"));
assertFalse(a.matchSource("/head"));
assertFalse(a.matchSource("a/head/extra"));
RefSpec b = a.expandFromSource("foo/head");
assertEquals("refs/heads/foo", b.getDestination());
RefSpec c = a.expandFromDestination("refs/heads/foo");
assertEquals("foo/head", c.getSource());
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenSourceOnlyAndWildcard() {
assertNotNull(new RefSpec("refs/heads/*"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenDestinationOnlyAndWildcard() {
assertNotNull(new RefSpec(":refs/heads/*"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenOnlySourceWildcard() {
assertNotNull(new RefSpec("refs/heads/*:refs/heads/foo"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenOnlyDestinationWildcard() {
assertNotNull(new RefSpec("refs/heads/foo:refs/heads/*"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenMoreThanOneWildcardInSource() {
assertNotNull(new RefSpec("refs/heads/*/*:refs/heads/*"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenMoreThanOneWildcardInDestination() {
assertNotNull(new RefSpec("refs/heads/*:refs/heads/*/*"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenWildcardAfterText() {
assertNotNull(new RefSpec("refs/heads/wrong*:refs/heads/right/*"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenWildcardBeforeText() {
assertNotNull(new RefSpec("*wrong:right/*"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidWhenWildcardBeforeTextAtEnd() {
assertNotNull(new RefSpec("refs/heads/*wrong:right/*"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidSourceDoubleSlashes() {
assertNotNull(new RefSpec("refs/heads//wrong"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidSlashAtStart() {
assertNotNull(new RefSpec("/foo:/foo"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidDestinationDoubleSlashes() {
assertNotNull(new RefSpec(":refs/heads//wrong"));
}
@Test(expected = IllegalArgumentException.class)
public void invalidSetSource() {
RefSpec a = new RefSpec("refs/heads/*:refs/remotes/origin/*");
a.setSource("refs/heads/*/*");
}
@Test(expected = IllegalArgumentException.class)
public void invalidSetDestination() {
RefSpec a = new RefSpec("refs/heads/*:refs/remotes/origin/*");
a.setDestination("refs/remotes/origin/*/*");
}
} }

104
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawSubStringPatternTest.java

@ -0,0 +1,104 @@
/*
* Copyright (C) 2013, Robin Stocker <robin@nibor.org>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Distribution License v1.0 which
* accompanies this distribution, is reproduced below, and is
* available at http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.UnsupportedEncodingException;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.junit.Test;
public class RawSubStringPatternTest extends RepositoryTestCase {
@Test
public void testBoundary() {
assertMatchResult("a", "a", 0);
assertMatchResult("a", "abcd", 0);
assertMatchResult("ab", "abcd", 0);
assertMatchResult("abcd", "abcd", 0);
assertMatchResult("bc", "abcd", 1);
assertMatchResult("bcd", "abcd", 1);
assertMatchResult("cd", "abcd", 2);
assertMatchResult("d", "abcd", 3);
assertMatchResult("abab", "abaabab", 3);
}
@Test
public void testNoMatches() {
assertMatchResult("a", "", -1);
assertMatchResult("a", "b", -1);
assertMatchResult("abab", "abaaba", -1);
assertMatchResult("ab", "ddda", -1);
}
@Test
public void testCaseInsensitive() {
assertMatchResult("a", "A", 0);
assertMatchResult("A", "a", 0);
assertMatchResult("Ab", "aB", 0);
assertMatchResult("aB", "Ab", 0);
}
@Test(expected = IllegalArgumentException.class)
public void testEmptyPattern() {
assertNotNull(new RawSubStringPattern(""));
}
private static void assertMatchResult(String pattern, String input, int position) {
RawSubStringPattern p = new RawSubStringPattern(pattern);
assertEquals("Expected match result " + position + " with input "
+ input + " for pattern " + pattern,
position, p.match(raw(input)));
}
private static RawCharSequence raw(String text) {
try {
byte[] bytes = text.getBytes("UTF-8");
return new RawCharSequence(bytes, 0, bytes.length);
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
}

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

@ -274,6 +274,7 @@ invalidTagOption=Invalid tag option: {0}
invalidTimeout=Invalid timeout: {0} invalidTimeout=Invalid timeout: {0}
invalidURL=Invalid URL {0} invalidURL=Invalid URL {0}
invalidWildcards=Invalid wildcards {0} invalidWildcards=Invalid wildcards {0}
invalidRefSpec=Invalid refspec {0}
invalidWindowSize=Invalid window size invalidWindowSize=Invalid window size
isAStaticFlagAndHasNorevWalkInstance={0} is a static flag and has no RevWalk instance isAStaticFlagAndHasNorevWalkInstance={0} is a static flag and has no RevWalk instance
JRELacksMD5Implementation=JRE lacks MD5 implementation JRELacksMD5Implementation=JRE lacks MD5 implementation

18
org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011, Chris Aniszczyk <caniszczyk@gmail.com> * Copyright (C) 2011, 2013 Chris Aniszczyk <caniszczyk@gmail.com>
* and other copyright owners as documented in the project's IP log. * and other copyright owners as documented in the project's IP log.
* *
* This program and the accompanying materials are made available * This program and the accompanying materials are made available
@ -198,12 +198,19 @@ public class CloneCommand extends TransportCommand<CloneCommand, Git> {
throws MissingObjectException, IncorrectObjectTypeException, throws MissingObjectException, IncorrectObjectTypeException,
IOException, GitAPIException { IOException, GitAPIException {
Ref head = result.getAdvertisedRef(branch); Ref head = null;
if (branch.equals(Constants.HEAD)) { if (branch.equals(Constants.HEAD)) {
Ref foundBranch = findBranchToCheckout(result); Ref foundBranch = findBranchToCheckout(result);
if (foundBranch != null) if (foundBranch != null)
head = foundBranch; head = foundBranch;
} }
if (head == null) {
head = result.getAdvertisedRef(branch);
if (head == null)
head = result.getAdvertisedRef(Constants.R_HEADS + branch);
if (head == null)
head = result.getAdvertisedRef(Constants.R_TAGS + branch);
}
if (head == null || head.getObjectId() == null) if (head == null || head.getObjectId() == null)
return; // throw exception? return; // throw exception?
@ -362,7 +369,9 @@ public class CloneCommand extends TransportCommand<CloneCommand, Git> {
/** /**
* @param branch * @param branch
* the initial branch to check out when cloning the repository * the initial branch to check out when cloning the repository.
* Can be specified as ref name (<code>refs/heads/master</code>),
* branch name (<code>master</code>) or tag name (<code>v1.2.3</code>).
* @return this instance * @return this instance
*/ */
public CloneCommand setBranch(String branch) { public CloneCommand setBranch(String branch) {
@ -409,7 +418,8 @@ public class CloneCommand extends TransportCommand<CloneCommand, Git> {
/** /**
* @param branchesToClone * @param branchesToClone
* collection of branches to clone. Ignored when allSelected is * collection of branches to clone. Ignored when allSelected is
* true. * true. Must be specified as full ref names (e.g.
* <code>refs/heads/master</code>).
* @return {@code this} * @return {@code this}
*/ */
public CloneCommand setBranchesToClone(Collection<String> branchesToClone) { public CloneCommand setBranchesToClone(Collection<String> branchesToClone) {

131
org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java

@ -77,6 +77,8 @@ import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryState; import org.eclipse.jgit.lib.RepositoryState;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
import org.eclipse.jgit.revwalk.RevTag;
import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.CanonicalTreeParser; import org.eclipse.jgit.treewalk.CanonicalTreeParser;
import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.treewalk.FileTreeIterator;
@ -150,13 +152,16 @@ public class CommitCommand extends GitCommand<RevCommit> {
checkCallable(); checkCallable();
Collections.sort(only); Collections.sort(only);
RepositoryState state = repo.getRepositoryState(); RevWalk rw = new RevWalk(repo);
if (!state.canCommit())
throw new WrongRepositoryStateException(MessageFormat.format(
JGitText.get().cannotCommitOnARepoWithState, state.name()));
processOptions(state);
try { try {
RepositoryState state = repo.getRepositoryState();
if (!state.canCommit())
throw new WrongRepositoryStateException(MessageFormat.format(
JGitText.get().cannotCommitOnARepoWithState,
state.name()));
processOptions(state, rw);
if (all && !repo.isBare() && repo.getWorkTree() != null) { if (all && !repo.isBare() && repo.getWorkTree() != null) {
Git git = new Git(repo); Git git = new Git(repo);
try { try {
@ -182,8 +187,7 @@ public class CommitCommand extends GitCommand<RevCommit> {
if (headId != null) if (headId != null)
if (amend) { if (amend) {
RevCommit previousCommit = new RevWalk(repo) RevCommit previousCommit = rw.parseCommit(headId);
.parseCommit(headId);
for (RevCommit p : previousCommit.getParents()) for (RevCommit p : previousCommit.getParents())
parents.add(p.getId()); parents.add(p.getId());
if (author == null) if (author == null)
@ -196,7 +200,7 @@ public class CommitCommand extends GitCommand<RevCommit> {
DirCache index = repo.lockDirCache(); DirCache index = repo.lockDirCache();
try { try {
if (!only.isEmpty()) if (!only.isEmpty())
index = createTemporaryIndex(headId, index); index = createTemporaryIndex(headId, index, rw);
ObjectInserter odi = repo.newObjectInserter(); ObjectInserter odi = repo.newObjectInserter();
try { try {
@ -219,56 +223,51 @@ public class CommitCommand extends GitCommand<RevCommit> {
ObjectId commitId = odi.insert(commit); ObjectId commitId = odi.insert(commit);
odi.flush(); odi.flush();
RevWalk revWalk = new RevWalk(repo); RevCommit revCommit = rw.parseCommit(commitId);
try { RefUpdate ru = repo.updateRef(Constants.HEAD);
RevCommit revCommit = revWalk.parseCommit(commitId); ru.setNewObjectId(commitId);
RefUpdate ru = repo.updateRef(Constants.HEAD); if (reflogComment != null) {
ru.setNewObjectId(commitId); ru.setRefLogMessage(reflogComment, false);
if (reflogComment != null) { } else {
ru.setRefLogMessage(reflogComment, false); String prefix = amend ? "commit (amend): " //$NON-NLS-1$
} else { : parents.size() == 0 ? "commit (initial): "
String prefix = amend ? "commit (amend): " //$NON-NLS-1$ : "commit: ";
: parents.size() == 0 ? "commit (initial): " ru.setRefLogMessage(
: "commit: "; prefix + revCommit.getShortMessage(), false);
ru.setRefLogMessage( }
prefix + revCommit.getShortMessage(), false); if (headId != null)
} ru.setExpectedOldObjectId(headId);
if (headId != null) else
ru.setExpectedOldObjectId(headId); ru.setExpectedOldObjectId(ObjectId.zeroId());
else Result rc = ru.forceUpdate();
ru.setExpectedOldObjectId(ObjectId.zeroId()); switch (rc) {
Result rc = ru.forceUpdate(); case NEW:
switch (rc) { case FORCED:
case NEW: case FAST_FORWARD: {
case FORCED: setCallable(false);
case FAST_FORWARD: { if (state == RepositoryState.MERGING_RESOLVED) {
setCallable(false); // Commit was successful. Now delete the files
if (state == RepositoryState.MERGING_RESOLVED) { // used for merge commits
// Commit was successful. Now delete the files repo.writeMergeCommitMsg(null);
// used for merge commits repo.writeMergeHeads(null);
repo.writeMergeCommitMsg(null); } else if (state == RepositoryState.CHERRY_PICKING_RESOLVED) {
repo.writeMergeHeads(null); repo.writeMergeCommitMsg(null);
} else if (state == RepositoryState.CHERRY_PICKING_RESOLVED) { repo.writeCherryPickHead(null);
repo.writeMergeCommitMsg(null); } else if (state == RepositoryState.REVERTING_RESOLVED) {
repo.writeCherryPickHead(null); repo.writeMergeCommitMsg(null);
} else if (state == RepositoryState.REVERTING_RESOLVED) { repo.writeRevertHead(null);
repo.writeMergeCommitMsg(null);
repo.writeRevertHead(null);
}
return revCommit;
}
case REJECTED:
case LOCK_FAILURE:
throw new ConcurrentRefUpdateException(JGitText
.get().couldNotLockHEAD, ru.getRef(), rc);
default:
throw new JGitInternalException(MessageFormat
.format(JGitText.get().updatingRefFailed,
Constants.HEAD,
commitId.toString(), rc));
} }
} finally { return revCommit;
revWalk.release(); }
case REJECTED:
case LOCK_FAILURE:
throw new ConcurrentRefUpdateException(
JGitText.get().couldNotLockHEAD, ru.getRef(),
rc);
default:
throw new JGitInternalException(MessageFormat.format(
JGitText.get().updatingRefFailed,
Constants.HEAD, commitId.toString(), rc));
} }
} finally { } finally {
odi.release(); odi.release();
@ -281,6 +280,8 @@ public class CommitCommand extends GitCommand<RevCommit> {
} catch (IOException e) { } catch (IOException e) {
throw new JGitInternalException( throw new JGitInternalException(
JGitText.get().exceptionCaughtDuringExecutionOfCommitCommand, e); JGitText.get().exceptionCaughtDuringExecutionOfCommitCommand, e);
} finally {
rw.dispose();
} }
} }
@ -297,7 +298,8 @@ public class CommitCommand extends GitCommand<RevCommit> {
+ changeId.getName() + "\n"); //$NON-NLS-1$ + changeId.getName() + "\n"); //$NON-NLS-1$
} }
private DirCache createTemporaryIndex(ObjectId headId, DirCache index) private DirCache createTemporaryIndex(ObjectId headId, DirCache index,
RevWalk rw)
throws IOException { throws IOException {
ObjectInserter inserter = null; ObjectInserter inserter = null;
@ -317,7 +319,7 @@ public class CommitCommand extends GitCommand<RevCommit> {
int fIdx = treeWalk.addTree(new FileTreeIterator(repo)); int fIdx = treeWalk.addTree(new FileTreeIterator(repo));
int hIdx = -1; int hIdx = -1;
if (headId != null) if (headId != null)
hIdx = treeWalk.addTree(new RevWalk(repo).parseTree(headId)); hIdx = treeWalk.addTree(rw.parseTree(headId));
treeWalk.setRecursive(true); treeWalk.setRecursive(true);
String lastAddedFile = null; String lastAddedFile = null;
@ -473,11 +475,14 @@ public class CommitCommand extends GitCommand<RevCommit> {
* *
* @param state * @param state
* the state of the repository we are working on * the state of the repository we are working on
* @param rw
* the RevWalk to use
* *
* @throws NoMessageException * @throws NoMessageException
* if the commit message has not been specified * if the commit message has not been specified
*/ */
private void processOptions(RepositoryState state) throws NoMessageException { private void processOptions(RepositoryState state, RevWalk rw)
throws NoMessageException {
if (committer == null) if (committer == null)
committer = new PersonIdent(repo); committer = new PersonIdent(repo);
if (author == null && !amend) if (author == null && !amend)
@ -487,6 +492,12 @@ public class CommitCommand extends GitCommand<RevCommit> {
if (state == RepositoryState.MERGING_RESOLVED) { if (state == RepositoryState.MERGING_RESOLVED) {
try { try {
parents = repo.readMergeHeads(); parents = repo.readMergeHeads();
if (parents != null)
for (int i = 0; i < parents.size(); i++) {
RevObject ro = rw.parseAny(parents.get(i));
if (ro instanceof RevTag)
parents.set(i, rw.peel(ro));
}
} catch (IOException e) { } catch (IOException e) {
throw new JGitInternalException(MessageFormat.format( throw new JGitInternalException(MessageFormat.format(
JGitText.get().exceptionOccurredDuringReadingOfGIT_DIR, JGitText.get().exceptionOccurredDuringReadingOfGIT_DIR,

2
org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffEntry.java

@ -308,6 +308,8 @@ public class DiffEntry {
r.changeType = changeType; r.changeType = changeType;
r.score = score; r.score = score;
r.treeFilterMarks = src.treeFilterMarks | dst.treeFilterMarks;
return r; return r;
} }

7
org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java

@ -912,6 +912,11 @@ public class DiffFormatter {
editList = new EditList(); editList = new EditList();
type = PatchType.UNIFIED; type = PatchType.UNIFIED;
} else if (ent.getOldId() == null || ent.getNewId() == null) {
// Content not changed (e.g. only mode, pure rename)
editList = new EditList();
type = PatchType.UNIFIED;
} else { } else {
assertHaveRepository(); assertHaveRepository();
@ -1106,7 +1111,7 @@ public class DiffFormatter {
o.write('\n'); o.write('\n');
} }
if (!ent.getOldId().equals(ent.getNewId())) { if (ent.getOldId() != null && !ent.getOldId().equals(ent.getNewId())) {
formatIndexLine(o, ent); formatIndexLine(o, ent);
} }
} }

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

@ -336,6 +336,7 @@ public class JGitText extends TranslationBundle {
/***/ public String invalidTimeout; /***/ public String invalidTimeout;
/***/ public String invalidURL; /***/ public String invalidURL;
/***/ public String invalidWildcards; /***/ public String invalidWildcards;
/***/ public String invalidRefSpec;
/***/ public String invalidWindowSize; /***/ public String invalidWindowSize;
/***/ public String isAStaticFlagAndHasNorevWalkInstance; /***/ public String isAStaticFlagAndHasNorevWalkInstance;
/***/ public String JRELacksMD5Implementation; /***/ public String JRELacksMD5Implementation;

38
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java

@ -615,26 +615,25 @@ public class GC {
while (treeWalk.next()) { while (treeWalk.next()) {
ObjectId objectId = treeWalk.getObjectId(0); ObjectId objectId = treeWalk.getObjectId(0);
switch (treeWalk.getRawMode(0) & FileMode.TYPE_MASK) { switch (treeWalk.getRawMode(0) & FileMode.TYPE_MASK) {
case FileMode.TYPE_MISSING: case FileMode.TYPE_MISSING:
case FileMode.TYPE_GITLINK: case FileMode.TYPE_GITLINK:
continue; continue;
case FileMode.TYPE_TREE: case FileMode.TYPE_TREE:
case FileMode.TYPE_FILE: case FileMode.TYPE_FILE:
case FileMode.TYPE_SYMLINK: case FileMode.TYPE_SYMLINK:
ret.add(objectId); ret.add(objectId);
continue; continue;
default: default:
throw new IOException(MessageFormat.format( throw new IOException(MessageFormat.format(
JGitText.get().corruptObjectInvalidMode3, String JGitText.get().corruptObjectInvalidMode3,
.format("%o", Integer.valueOf(treeWalk //$NON-NLS-1$ String.format("%o", //$NON-NLS-1$
.getRawMode(0)), Integer.valueOf(treeWalk.getRawMode(0))),
(objectId == null) ? "null" //$NON-NLS-1$ (objectId == null) ? "null" : objectId.name(), //$NON-NLS-1$
: objectId.name(), treeWalk treeWalk.getPathString(), //
.getPathString(), repo repo.getIndexFile()));
.getIndexFile()))); }
} }
}
return ret; return ret;
} finally { } finally {
if (revWalk != null) if (revWalk != null)
@ -703,7 +702,6 @@ public class GC {
} }
// write the packindex // write the packindex
@SuppressWarnings("resource")
FileChannel idxChannel = new FileOutputStream(tmpIdx).getChannel(); FileChannel idxChannel = new FileOutputStream(tmpIdx).getChannel();
OutputStream idxStream = Channels.newOutputStream(idxChannel); OutputStream idxStream = Channels.newOutputStream(idxChannel);
try { try {

6
org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java

@ -57,7 +57,7 @@ import org.eclipse.jgit.util.NB;
* with this instance can alter at any time, if this instance is modified to * with this instance can alter at any time, if this instance is modified to
* represent a different object name. * represent a different object name.
*/ */
public abstract class AnyObjectId implements Comparable<Object> { public abstract class AnyObjectId implements Comparable<AnyObjectId> {
/** /**
* Compare to object identifier byte sequences for equality. * Compare to object identifier byte sequences for equality.
@ -184,10 +184,6 @@ public abstract class AnyObjectId implements Comparable<Object> {
return NB.compareUInt32(w5, other.w5); return NB.compareUInt32(w5, other.w5);
} }
public final int compareTo(final Object other) {
return compareTo(((AnyObjectId) other));
}
/** /**
* Compare this ObjectId to a network-byte-order ObjectId. * Compare this ObjectId to a network-byte-order ObjectId.
* *

5
org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java

@ -294,8 +294,6 @@ public class BatchRefUpdate {
// Now to the update that may require more room in the name space // Now to the update that may require more room in the name space
for (ReceiveCommand cmd : commands2) { for (ReceiveCommand cmd : commands2) {
try { try {
monitor.update(1);
if (cmd.getResult() == NOT_ATTEMPTED) { if (cmd.getResult() == NOT_ATTEMPTED) {
cmd.updateType(walk); cmd.updateType(walk);
RefUpdate ru = newUpdate(cmd); RefUpdate ru = newUpdate(cmd);
@ -305,7 +303,6 @@ public class BatchRefUpdate {
break; break;
case UPDATE: case UPDATE:
case UPDATE_NONFASTFORWARD: case UPDATE_NONFASTFORWARD:
monitor.update(1);
RefUpdate ruu = newUpdate(cmd); RefUpdate ruu = newUpdate(cmd);
cmd.setResult(ruu.update(walk)); cmd.setResult(ruu.update(walk));
break; break;
@ -329,6 +326,8 @@ public class BatchRefUpdate {
} catch (IOException err) { } catch (IOException err) {
cmd.setResult(REJECTED_OTHER_REASON, MessageFormat.format( cmd.setResult(REJECTED_OTHER_REASON, MessageFormat.format(
JGitText.get().lockError, err.getMessage())); JGitText.get().lockError, err.getMessage()));
} finally {
monitor.update(1);
} }
} }
} }

81
org.eclipse.jgit/src/org/eclipse/jgit/transport/RefSpec.java

@ -43,8 +43,8 @@
package org.eclipse.jgit.transport; package org.eclipse.jgit.transport;
import java.text.MessageFormat;
import java.io.Serializable; import java.io.Serializable;
import java.text.MessageFormat;
import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Constants;
@ -59,7 +59,7 @@ import org.eclipse.jgit.lib.Ref;
public class RefSpec implements Serializable { public class RefSpec implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* Suffix for wildcard ref spec component, that indicate matching all refs * Suffix for wildcard ref spec component, that indicate matching all refs
* with specified prefix. * with specified prefix.
*/ */
@ -73,7 +73,7 @@ public class RefSpec implements Serializable {
* @return true if provided string is a wildcard ref spec component. * @return true if provided string is a wildcard ref spec component.
*/ */
public static boolean isWildcard(final String s) { public static boolean isWildcard(final String s) {
return s != null && s.endsWith(WILDCARD_SUFFIX); return s != null && s.contains("*"); //$NON-NLS-1$
} }
/** Does this specification ask for forced updated (rewind/reset)? */ /** Does this specification ask for forced updated (rewind/reset)? */
@ -112,6 +112,7 @@ public class RefSpec implements Serializable {
* <li><code>+refs/heads/master</code></li> * <li><code>+refs/heads/master</code></li>
* <li><code>+refs/heads/master:refs/remotes/origin/master</code></li> * <li><code>+refs/heads/master:refs/remotes/origin/master</code></li>
* <li><code>+refs/heads/*:refs/remotes/origin/*</code></li> * <li><code>+refs/heads/*:refs/remotes/origin/*</code></li>
* <li><code>+refs/pull/&#42;/head:refs/remotes/origin/pr/*</code></li>
* <li><code>:refs/heads/master</code></li> * <li><code>:refs/heads/master</code></li>
* </ul> * </ul>
* *
@ -132,18 +133,24 @@ public class RefSpec implements Serializable {
s = s.substring(1); s = s.substring(1);
if (isWildcard(s)) if (isWildcard(s))
throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec)); throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec));
dstName = s; dstName = checkValid(s);
} else if (c > 0) { } else if (c > 0) {
srcName = s.substring(0, c); String src = s.substring(0, c);
dstName = s.substring(c + 1); String dst = s.substring(c + 1);
if (isWildcard(srcName) && isWildcard(dstName)) if (isWildcard(src) && isWildcard(dst)) {
// Both contain wildcard
wildcard = true; wildcard = true;
else if (isWildcard(srcName) || isWildcard(dstName)) } else if (isWildcard(src) || isWildcard(dst)) {
// If either source or destination has wildcard, the other one
// must have as well.
throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec)); throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec));
}
srcName = checkValid(src);
dstName = checkValid(dst);
} else { } else {
if (isWildcard(s)) if (isWildcard(s))
throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec)); throw new IllegalArgumentException(MessageFormat.format(JGitText.get().invalidWildcards, spec));
srcName = s; srcName = checkValid(s);
} }
} }
@ -215,7 +222,7 @@ public class RefSpec implements Serializable {
*/ */
public RefSpec setSource(final String source) { public RefSpec setSource(final String source) {
final RefSpec r = new RefSpec(this); final RefSpec r = new RefSpec(this);
r.srcName = source; r.srcName = checkValid(source);
if (isWildcard(r.srcName) && r.dstName == null) if (isWildcard(r.srcName) && r.dstName == null)
throw new IllegalStateException(JGitText.get().destinationIsNotAWildcard); throw new IllegalStateException(JGitText.get().destinationIsNotAWildcard);
if (isWildcard(r.srcName) != isWildcard(r.dstName)) if (isWildcard(r.srcName) != isWildcard(r.dstName))
@ -254,7 +261,7 @@ public class RefSpec implements Serializable {
*/ */
public RefSpec setDestination(final String destination) { public RefSpec setDestination(final String destination) {
final RefSpec r = new RefSpec(this); final RefSpec r = new RefSpec(this);
r.dstName = destination; r.dstName = checkValid(destination);
if (isWildcard(r.dstName) && r.srcName == null) if (isWildcard(r.dstName) && r.srcName == null)
throw new IllegalStateException(JGitText.get().sourceIsNotAWildcard); throw new IllegalStateException(JGitText.get().sourceIsNotAWildcard);
if (isWildcard(r.srcName) != isWildcard(r.dstName)) if (isWildcard(r.srcName) != isWildcard(r.dstName))
@ -350,8 +357,7 @@ public class RefSpec implements Serializable {
final String psrc = srcName, pdst = dstName; final String psrc = srcName, pdst = dstName;
wildcard = false; wildcard = false;
srcName = name; srcName = name;
dstName = pdst.substring(0, pdst.length() - 1) dstName = expandWildcard(name, psrc, pdst);
+ name.substring(psrc.length() - 1);
return this; return this;
} }
@ -392,8 +398,7 @@ public class RefSpec implements Serializable {
private RefSpec expandFromDstImp(final String name) { private RefSpec expandFromDstImp(final String name) {
final String psrc = srcName, pdst = dstName; final String psrc = srcName, pdst = dstName;
wildcard = false; wildcard = false;
srcName = psrc.substring(0, psrc.length() - 1) srcName = expandWildcard(name, pdst, psrc);
+ name.substring(pdst.length() - 1);
dstName = name; dstName = name;
return this; return this;
} }
@ -414,12 +419,50 @@ public class RefSpec implements Serializable {
return expandFromDestination(r.getName()); return expandFromDestination(r.getName());
} }
private boolean match(final String refName, final String s) { private boolean match(final String name, final String s) {
if (s == null) if (s == null)
return false; return false;
if (isWildcard()) if (isWildcard()) {
return refName.startsWith(s.substring(0, s.length() - 1)); int wildcardIndex = s.indexOf('*');
return refName.equals(s); String prefix = s.substring(0, wildcardIndex);
String suffix = s.substring(wildcardIndex + 1);
return name.length() > prefix.length() + suffix.length()
&& name.startsWith(prefix) && name.endsWith(suffix);
}
return name.equals(s);
}
private static String expandWildcard(String name, String patternA,
String patternB) {
int a = patternA.indexOf('*');
int trailingA = patternA.length() - (a + 1);
int b = patternB.indexOf('*');
String match = name.substring(a, name.length() - trailingA);
return patternB.substring(0, b) + match + patternB.substring(b + 1);
}
private static String checkValid(String spec) {
if (spec != null && !isValid(spec))
throw new IllegalArgumentException(MessageFormat.format(
JGitText.get().invalidRefSpec, spec));
return spec;
}
private static boolean isValid(final String s) {
if (s.startsWith("/")) //$NON-NLS-1$
return false;
if (s.contains("//")) //$NON-NLS-1$
return false;
int i = s.indexOf('*');
if (i != -1) {
if (s.indexOf('*', i + 1) > i)
return false;
if (i > 0 && s.charAt(i - 1) != '/')
return false;
if (i < s.length() - 1 && s.charAt(i + 1) != '/')
return false;
}
return true;
} }
public int hashCode() { public int hashCode() {

10
org.eclipse.jgit/src/org/eclipse/jgit/util/RawSubStringPattern.java

@ -95,21 +95,21 @@ public class RawSubStringPattern {
int matchPos = rcs.startPtr; int matchPos = rcs.startPtr;
final int maxPos = rcs.endPtr - needleLen; final int maxPos = rcs.endPtr - needleLen;
OUTER: for (; matchPos < maxPos; matchPos++) { OUTER: for (; matchPos <= maxPos; matchPos++) {
if (neq(first, text[matchPos])) { if (neq(first, text[matchPos])) {
while (++matchPos < maxPos && neq(first, text[matchPos])) { while (++matchPos <= maxPos && neq(first, text[matchPos])) {
/* skip */ /* skip */
} }
if (matchPos == maxPos) if (matchPos > maxPos)
return -1; return -1;
} }
int si = ++matchPos; int si = matchPos + 1;
for (int j = 1; j < needleLen; j++, si++) { for (int j = 1; j < needleLen; j++, si++) {
if (neq(needle[j], text[si])) if (neq(needle[j], text[si]))
continue OUTER; continue OUTER;
} }
return matchPos - 1; return matchPos;
} }
return -1; return -1;
} }

Loading…
Cancel
Save