Browse Source

Merge changes I8445070d,I38f10d62,I2af0bf68

* changes:
  Fix plugin provider names to conform with release train requirement
  Add missing @since tags for new API methods
  DfsReaderOptions are options for a DFS stored repository
stable-3.0
Matthias Sohn 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
0182e8152e
  1. 2
      org.eclipse.jgit.console/plugin.properties
  2. 2
      org.eclipse.jgit.http.server/plugin.properties
  3. 2
      org.eclipse.jgit.http.test/plugin.properties
  4. 2
      org.eclipse.jgit.junit.http/plugin.properties
  5. 2
      org.eclipse.jgit.junit/plugin.properties
  6. 2
      org.eclipse.jgit.pgm.test/plugin.properties
  7. 2
      org.eclipse.jgit.pgm/plugin.properties
  8. 2
      org.eclipse.jgit.test/plugin.properties
  9. 2
      org.eclipse.jgit.ui/plugin.properties
  10. 2
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java
  11. 1
      org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
  12. 2
      org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java

2
org.eclipse.jgit.console/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit Console User Interface
provider_name=Eclipse.org
provider_name=Eclipse JGit

2
org.eclipse.jgit.http.server/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit HTTP Server
provider_name=Eclipse.org
provider_name=Eclipse JGit

2
org.eclipse.jgit.http.test/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit HTTP Tests
provider_name=Eclipse.org
provider_name=Eclipse JGit

2
org.eclipse.jgit.junit.http/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit JUnit Http Utility Classes
provider_name=Eclipse.org
provider_name=Eclipse JGit

2
org.eclipse.jgit.junit/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit JUnit Utility Classes
provider_name=Eclipse.org
provider_name=Eclipse JGit

2
org.eclipse.jgit.pgm.test/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit Command Line Interface Tests
provider_name=Eclipse.org
provider_name=Eclipse JGit

2
org.eclipse.jgit.pgm/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit Command Line Interface
provider_name=Eclipse.org
provider_name=Eclipse JGit

2
org.eclipse.jgit.test/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit Core Tests
provider_name=Eclipse.org
provider_name=Eclipse JGit

2
org.eclipse.jgit.ui/plugin.properties

@ -1,2 +1,2 @@
plugin_name=JGit AWT User Interface
provider_name=Eclipse.org
provider_name=Eclipse JGit

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

@ -51,7 +51,7 @@ import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_TRESHO
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.storage.pack.PackConfig;
/** Options controlling how objects are read from a DHT stored repository. */
/** Options controlling how objects are read from a DFS stored repository. */
public class DfsReaderOptions {
/** 1024 (number of bytes in one kibibyte/kilobyte) */
public static final int KiB = 1024;

1
org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java

@ -638,6 +638,7 @@ public abstract class RefUpdate {
* are checked explicitly.
*
* @param check
* @since 3.0
*/
public void setCheckConflicting(boolean check) {
checkConflicting = check;

2
org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java

@ -379,6 +379,7 @@ public class PackConfig {
* @return true if existing delta chains should be cut at
* {@link #getMaxDeltaDepth()}. Default is false, allowing existing
* chains to be of any length.
* @since 3.0
*/
public boolean getCutDeltaChains() {
return cutDeltaChains;
@ -395,6 +396,7 @@ public class PackConfig {
*
* @param cut
* true to cut existing chains.
* @since 3.0
*/
public void setCutDeltaChains(boolean cut) {
cutDeltaChains = cut;

Loading…
Cancel
Save