]> source.dussan.org Git - jgit.git/commitdiff
Fix @since tags in JGit, version 2.4 never existed 53/11353/4
authorTomasz Zarna <tzarna@gmail.com>
Wed, 20 Mar 2013 22:48:34 +0000 (23:48 +0100)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Thu, 21 Mar 2013 22:03:20 +0000 (18:03 -0400)
Change-Id: Iaca88ec28b412e6b58e7b39a0762ba54b25f9471
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
19 files changed:
org.eclipse.jgit.pgm/.settings/.api_filters [new file with mode: 0644]
org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java
org.eclipse.jgit/src/org/eclipse/jgit/api/NameRevCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/errors/NoMergeBaseException.java
org.eclipse.jgit/src/org/eclipse/jgit/errors/StoredObjectRepresentationNotAvailableException.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/BitmapIndex.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/BitmapObject.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectReader.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyRecursive.java
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevFlag.java
org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileRepositoryBuilder.java
org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheConfig.java
org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPackLogger.java
org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java
org.eclipse.jgit/src/org/eclipse/jgit/util/NB.java

diff --git a/org.eclipse.jgit.pgm/.settings/.api_filters b/org.eclipse.jgit.pgm/.settings/.api_filters
new file mode 100644 (file)
index 0000000..5e044ee
--- /dev/null
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jgit.pgm" version="2">
+    <resource path="src/org/eclipse/jgit/pgm/CLIText.java" type="org.eclipse.jgit.pgm.CLIText">
+        <filter id="1143996420">
+            <message_arguments>
+                <message_argument value="noSuchRemoteRef"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
index d36b9bede4e3eded0833826a3f07f978e254f2d7..4b8378aead3b7a6d4aadf2b788fdd9b9d2e5cc78 100644 (file)
@@ -636,7 +636,7 @@ public class Git {
         * Returns a command object to find human-readable names of revisions.
         *
         * @return a {@link NameRevCommand}.
-        * @since 2.3
+        * @since 3.0
         */
        public NameRevCommand nameRev() {
                return new NameRevCommand(repo);
index fcc02c7fef198b910763cb29740c0267cbd319f2..4789fbe93fab294fce36e2ef05651471f3a07f33 100644 (file)
@@ -68,8 +68,10 @@ import org.eclipse.jgit.revwalk.RevWalk;
 /**
  * Command to find human-readable names of revisions.
  *
- * @see <a href="http://www.kernel.org/pub/software/scm/git/docs/git-name-rev.html"
+ * @see <a
+ *      href="http://www.kernel.org/pub/software/scm/git/docs/git-name-rev.html"
  *      >Git documentation about name-rev</a>
+ * @since 3.0
  */
 public class NameRevCommand extends GitCommand<Map<ObjectId, String>> {
        /** Amount of slop to allow walking past the earliest requested commit. */
index df90e69009a181f7f17d1d5e8c2f0cd6afa5950f..0c419d759a7f7f54739f41277af75a0cc3d7e529 100644 (file)
@@ -51,6 +51,8 @@ import org.eclipse.jgit.merge.RecursiveMerger;
 
 /**
  * Exception thrown if a merge fails because no merge base could be determined.
+ *
+ * @since 3.0
  */
 public class NoMergeBaseException extends IOException {
        private static final long serialVersionUID = 1L;
index 395578ef2aed0d7be50ea9bcd4688afdc57c9040..0bd035b5dd831a384a6b043f12d72057e74a491d 100644 (file)
@@ -54,6 +54,7 @@ public class StoredObjectRepresentationNotAvailableException extends Exception {
         *
         * @param otp
         *            the object whose current representation is no longer present.
+        * @since 3.0
         */
        public StoredObjectRepresentationNotAvailableException(ObjectToPack otp) {
                // Do nothing.
index 9b6f0a3033ced79753fa156b937bfdb7745ba860..3c0e2c128e77c424f1674f84dd19e8c3bc470871 100644 (file)
@@ -47,7 +47,11 @@ import java.util.Iterator;
 
 import org.eclipse.jgit.internal.storage.file.PackBitmapIndex;
 
-/** A compressed bitmap representation of the entire object graph. */
+/**
+ * A compressed bitmap representation of the entire object graph.
+ *
+ * @since 3.0
+ */
 public interface BitmapIndex {
        /**
         * Get the bitmap for the id. The returned bitmap is immutable and the
index ba7ed648ddaf0ecb8f8cb31fa5d61b5cc0f07ddb..345016c17d83f895b5055dea3b6f2f75808e5519 100644 (file)
 
 package org.eclipse.jgit.lib;
 
-/** Base object type accessed during bitmap expansion. */
+/**
+ * Base object type accessed during bitmap expansion.
+ *
+ * @since 3.0
+ */
 public abstract class BitmapObject {
        /**
         * Get Git object type. See {@link Constants}.
index 88d274147f3b9574195c321b8cd53df4905a404d..2c2cef3f507e6060d9a371f4cb689295130b3bb0 100644 (file)
@@ -196,6 +196,9 @@ public class ConfigConstants {
        /** The "ff" key */
        public static final String CONFIG_KEY_FF = "ff";
 
-       /** The "checkstat" key */
+       /**
+        * The "checkstat" key
+        * @since 3.0
+        */
        public static final String CONFIG_KEY_CHECKSTAT = "checkstat";
 }
index 982cbc84e1fedbdc11776bcdd0ddb93d310652d5..0fc3d4ad0e2904de16e379e952c132912e6afd63 100644 (file)
@@ -77,7 +77,7 @@ public class CoreConfig {
        /**
         * Permissible values for {@code core.checkstat}
         *
-        * @since 2.3
+        * @since 3.0
         */
        public static enum CheckStat {
                /**
index fae92fe143f06a17b4cdbf4f3fe6ee00ffb6ab99..3bd02500cca4203a74a7a44a834ab23a90fb1262 100644 (file)
@@ -444,6 +444,7 @@ public abstract class ObjectReader {
         *
         * @param avoid
         *            true to avoid unreachable objects.
+        * @since 3.0
         */
        public void setAvoidUnreachableObjects(boolean avoid) {
                // Do nothing by default.
@@ -455,6 +456,7 @@ public abstract class ObjectReader {
         * @return the index or null if one does not exist.
         * @throws IOException
         *             when the index fails to load
+        * @since 3.0
         */
        public BitmapIndex getBitmapIndex() throws IOException {
                return null;
index 233856d74589aa857f25d247684c48cd980648f2..4fac2ebed5224a5189881af85294bd39d4ff7b9c 100644 (file)
@@ -400,7 +400,7 @@ public enum RepositoryState {
 
        /**
         * @return true if the repository is currently in a rebase
-        * @since 2.4
+        * @since 3.0
         */
        public abstract boolean isRebasing();
 
index 11c8bca5dd6f6dc32e0cfb0bde1942c2ec8a2bcc..58c1ed22d8bb4157a535d5d867b6c4b7370617ab 100644 (file)
@@ -47,6 +47,8 @@ import org.eclipse.jgit.lib.Repository;
 
 /**
  * A three-way merge strategy performing a content-merge if necessary
+ *
+ * @since 3.0
  */
 public class StrategyRecursive extends StrategyResolve {
 
index c767c033e579ebf8c20c26c11d9cfab59fb5f46b..8068ba6e1e2e8cfe6dc200eb7eaa8bf7a6288aa8 100644 (file)
@@ -73,6 +73,8 @@ public class RevFlag {
         * queue, especially if we reached it by more than one path.
         * <p>
         * This is a static flag. Its RevWalk is not available.
+        *
+        * @since 3.0
         */
        public static final RevFlag SEEN = new StaticRevFlag("SEEN", RevWalk.SEEN);
 
index 60c916ebccace0fdb94caa4af7e20e9ab3bbdfd4..5efa2507a80769ebf789d7c13c5bf26bd29c0bd4 100644 (file)
@@ -85,6 +85,7 @@ public class FileRepositoryBuilder extends
         * @throws IOException
         *             the repository could not be accessed to configure the rest of
         *             the builder's parameters.
+        * @since 3.0
         */
        @Override
        public Repository build() throws IOException {
index 8ed2af11716b1306b2a95f1eb7495600f2311d14..69abd0d976435aaab209eab096a9b4318e317164 100644 (file)
@@ -189,6 +189,7 @@ public class WindowCacheConfig {
         * @param rc
         *            configuration to read properties from.
         * @return {@code this}.
+        * @since 3.0
         */
        public WindowCacheConfig fromConfig(final Config rc) {
                setPackedGitOpenFiles(rc.getInt(
@@ -217,6 +218,8 @@ public class WindowCacheConfig {
         * The new configuration is applied immediately. If the new limits are
         * smaller than what what is currently cached, older entries will be purged
         * as soon as possible to allow the cache to meet the new limit.
+        *
+        * @since 3.0
         */
        public void install() {
                WindowCache.reconfigure(this);
index 7559e907ef151c133f5d3e291227dd6c6bf80b69..562b2c0a2cbde51485d8c391ad3d9907834bfa56 100644 (file)
@@ -53,7 +53,7 @@ import org.eclipse.jgit.lib.Repository;
 
 /**
  * Configuration used by a pack writer when constructing the stream.
- * 
+ *
  * A configuration may be modified once created, but should not be modified
  * while it is being used by a PackWriter. If a configuration is not modified it
  * is safe to share the same configuration instance between multiple concurrent
@@ -134,6 +134,7 @@ public class PackConfig {
         * Default value of the build bitmaps option: {@value}
         *
         * @see #setBuildBitmaps(boolean)
+        * @since 3.0
         */
        public static final boolean DEFAULT_BUILD_BITMAPS = true;
 
@@ -631,6 +632,7 @@ public class PackConfig {
         *
         * @return true if delta base is the writer can choose to output an index
         *         with bitmaps.
+        * @since 3.0
         */
        public boolean isBuildBitmaps() {
                return buildBitmaps;
@@ -646,6 +648,7 @@ public class PackConfig {
         * @param buildBitmaps
         *            boolean indicating whether bitmaps may be included in the
         *            index.
+        * @since 3.0
         */
        public void setBuildBitmaps(boolean buildBitmaps) {
                this.buildBitmaps = buildBitmaps;
index 74dfa6ce508caea38622a13d26695b94540f2adf..99fa6e02bd43e25b077827471d47fad721946de2 100644 (file)
@@ -66,6 +66,7 @@ public interface UploadPackLogger {
         *
         * @param stats
         *            the statistics after sending a pack to the client.
+        * @since 3.0
         */
        public void onPackStatistics(PackWriter.Statistics stats);
 }
index acc1a2c31c0be5b13e211ecfb8fe81e38f2ac901..dc0bbcb380fcc64cdd81af8b8145fb5f786a8d53 100644 (file)
@@ -87,7 +87,7 @@ public class FileUtils {
         * Option to only delete empty directories. This option can be combined with
         * {@link #RECURSIVE}
         *
-        * @since 2.4
+        * @since 3.0
         */
        public static final int EMPTY_DIRECTORIES_ONLY = 16;
 
@@ -180,6 +180,7 @@ public class FileUtils {
         *            the new {@code File}
         * @throws IOException
         *             if the rename has failed
+        * @since 3.0
         */
        public static void rename(final File src, final File dst)
                        throws IOException {
index 5a56a0621e18da338ce4a97fd74036278fe8c97a..e110c11427b5233658e29d2dd2f5fc760fe39323 100644 (file)
@@ -112,6 +112,7 @@ public final class NB {
         *            position and the next 7 bytes after it (for a total of 8
         *            bytes) will be read.
         * @return signed integer value that matches the 64 bits read.
+        * @since 3.0
         */
        public static long decodeInt64(final byte[] intbuf, final int offset) {
                long r = intbuf[offset] << 8;