]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.0' into stable-5.1 06/148806/2
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 3 Sep 2019 14:02:44 +0000 (16:02 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 3 Sep 2019 15:40:19 +0000 (17:40 +0200)
* stable-5.0:
  Prepare 4.11.10-SNAPSHOT builds
  JGit v4.11.9.201909030838-r
  Bazel: Update bazlets to the latest master revision
  Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file
  BatchRefUpdate: repro racy atomic update, and fix it
  Delete unused FileTreeIteratorWithTimeControl
  Fix RacyGitTests#testRacyGitDetection
  Change RacyGitTests to create a racy git situation in a stable way
  Silence API warnings

Change-Id: I172136a031ff0730e575327cafb3527c9650a71d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
WORKSPACE
org.eclipse.jgit.lfs.server/.settings/.api_filters
org.eclipse.jgit/.settings/.api_filters

diff --cc WORKSPACE
Simple merge
index adf3b1762a3e028b0d5e4c485a741f7dfca843b0,0000000000000000000000000000000000000000..6609c3d40d0f887f7fa4d2dcd2c7bc32f21c4c0b
mode 100644,000000..100644
--- /dev/null
@@@ -1,27 -1,0 +1,19 @@@
-     <resource path="META-INF/MANIFEST.MF">
-         <filter id="924844039">
-             <message_arguments>
-                 <message_argument value="5.1.11"/>
-                 <message_argument value="5.1.0"/>
-             </message_arguments>
-         </filter>
-     </resource>
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<component id="org.eclipse.jgit.lfs.server" version="2">
 +    <resource path="src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java" type="org.eclipse.jgit.lfs.server.fs.ObjectUploadListener">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.7"/>
 +                <message_argument value="setCallback(ObjectUploadListener.Callback)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/lfs/server/fs/ObjectUploadListener.java" type="org.eclipse.jgit.lfs.server.fs.ObjectUploadListener$Callback">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.7"/>
 +                <message_argument value="Callback"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +</component>
index 238dcc7210ea719e5324fd698f4e6058087a2478,404b45d152267037a369d61baf58a97f3a84ad01..c62afb31edee202b53931da3ca8e675f54698ba2
@@@ -1,33 -1,5 +1,25 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <component id="org.eclipse.jgit" version="2">
-     <resource path="META-INF/MANIFEST.MF">
-         <filter id="924844039">
-             <message_arguments>
-                 <message_argument value="5.1.11"/>
-                 <message_argument value="5.1.0"/>
-             </message_arguments>
-         </filter>
-     </resource>
 +    <resource path="src/org/eclipse/jgit/dircache/DirCacheEntry.java" type="org.eclipse.jgit.dircache.DirCacheEntry">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="getLastModifiedInstant()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="mightBeRacilyClean(Instant)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="setLastModified(Instant)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
      <resource path="src/org/eclipse/jgit/errors/PackInvalidException.java" type="org.eclipse.jgit.errors.PackInvalidException">
          <filter id="1142947843">
              <message_arguments>
              </message_arguments>
          </filter>
      </resource>
 -    <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
 -        <filter id="1141899266">
 +    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
++        <filter id="337768515">
+             <message_arguments>
 -                <message_argument value="4.7"/>
 -                <message_argument value="5.0"/>
 -                <message_argument value="LOCK_SUFFIX"/>
++                <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
++            </message_arguments>
++        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="CONFIG_FILESYSTEM_SECTION"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="CONFIG_KEY_MIN_RACY_THRESHOLD"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="CONFIG_KEY_TIMESTAMP_RESOLUTION"/>
              </message_arguments>
          </filter>
      </resource>
              </message_arguments>
          </filter>
      </resource>
 -    <resource path="src/org/eclipse/jgit/lib/ObjectIdSerializer.java" type="org.eclipse.jgit.lib.ObjectIdSerializer">
 -        <filter id="1141899266">
 +    <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
 +        <filter id="336658481">
              <message_arguments>
 -                <message_argument value="4.11"/>
 -                <message_argument value="5.0"/>
 -                <message_argument value="readWithoutMarker(InputStream)"/>
 +                <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
 +                <message_argument value="DEFAULT_MINSIZE_PREVENT_RACY_PACK"/>
              </message_arguments>
          </filter>
 -        <filter id="1141899266">
 +        <filter id="336658481">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
 +                <message_argument value="DEFAULT_WAIT_PREVENT_RACY_PACK"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.8"/>
 +                <message_argument value="DEFAULT_MINSIZE_PREVENT_RACY_PACK"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.8"/>
 +                <message_argument value="DEFAULT_WAIT_PREVENT_RACY_PACK"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.8"/>
 +                <message_argument value="doWaitPreventRacyPack(long)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.8"/>
 +                <message_argument value="getMinSizePreventRacyPack()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.8"/>
 +                <message_argument value="isWaitPreventRacyPack()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.8"/>
 +                <message_argument value="setMinSizePreventRacyPack(long)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.8"/>
 +                <message_argument value="setWaitPreventRacyPack(boolean)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
++    <resource path="src/org/eclipse/jgit/transport/GitProtocolConstants.java" type="org.eclipse.jgit.transport.GitProtocolConstants">
++        <filter id="337768515">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.GitProtocolConstants"/>
++            </message_arguments>
++        </filter>
++    </resource>
 +    <resource path="src/org/eclipse/jgit/transport/TransferConfig.java" type="org.eclipse.jgit.transport.TransferConfig">
 +        <filter id="1159725059">
 +            <message_arguments>
 +                <message_argument value="5.1.4"/>
 +                <message_argument value="TransferConfig(Config)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1159725059">
              <message_arguments>
 -                <message_argument value="4.11"/>
 -                <message_argument value="5.0"/>
 -                <message_argument value="writeWithoutMarker(OutputStream, AnyObjectId)"/>
 +                <message_argument value="5.1.4"/>
 +                <message_argument value="TransferConfig(Repository)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="getEntryLastModifiedInstant()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator$Entry">
 +        <filter id="336695337">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.treewalk.WorkingTreeIterator.Entry"/>
 +                <message_argument value="getLastModifiedInstant()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="getLastModifiedInstant()"/>
              </message_arguments>
          </filter>
      </resource>
      <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
 -                <message_argument value="5.0"/>
+         <filter id="1141899266">
+             <message_arguments>
+                 <message_argument value="4.7"/>
++                <message_argument value="5.1"/>
+                 <message_argument value="createNewFileAtomic(File)"/>
+             </message_arguments>
+         </filter>
          <filter id="1142947843">
              <message_arguments>
                  <message_argument value="4.5.6"/>
                  <message_argument value="fileAttributes(File)"/>
              </message_arguments>
          </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="getFileStoreAttributes(Path)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="lastModifiedInstant(File)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="lastModifiedInstant(Path)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="setAsyncFileStoreAttributes(boolean)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="setLastModified(Path, Instant)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$Attributes">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="getLastModifiedInstant()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$FileStoreAttributes">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="FileStoreAttributes"/>
 +            </message_arguments>
 +        </filter>
      </resource>
 -                <message_argument value="5.0"/>
+     <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$LockToken">
+         <filter id="1141899266">
+             <message_arguments>
+                 <message_argument value="4.7"/>
++                <message_argument value="5.1"/>
+                 <message_argument value="LockToken"/>
+             </message_arguments>
+         </filter>
+     </resource>
 +    <resource path="src/org/eclipse/jgit/util/FileUtils.java" type="org.eclipse.jgit.util.FileUtils">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.8"/>
 +                <message_argument value="touch(Path)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/util/SimpleLruCache.java" type="org.eclipse.jgit.util.SimpleLruCache">
 +        <filter id="1109393411">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="org.eclipse.jgit.util.SimpleLruCache"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/util/Stats.java" type="org.eclipse.jgit.util.Stats">
 +        <filter id="1109393411">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="org.eclipse.jgit.util.Stats"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/util/SystemReader.java" type="org.eclipse.jgit.util.SystemReader">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="getSystemConfig()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.1.9"/>
 +                <message_argument value="getUserConfig()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
  </component>