This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-jgit.
commit eaa89d3ca091f2266d89612d503b32ad7b2efe9e Merge: ffe42b4 6a9ae3d Author: Jakub Adam <[email protected]> Date: Thu Mar 6 17:27:41 2014 +0100 Merge tag 'upstream/3.3.0' Upstream version 3.3.0 org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 12 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 9 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- .../jgit/archive/internal/ArchiveText.properties | 2 + .../org/eclipse/jgit/archive/ArchiveFormats.java | 10 +- .../src/org/eclipse/jgit/archive/TarFormat.java | 30 +- .../src/org/eclipse/jgit/archive/Tbz2Format.java | 5 +- .../src/org/eclipse/jgit/archive/TgzFormat.java | 5 +- .../src/org/eclipse/jgit/archive/TxzFormat.java | 5 +- .../src/org/eclipse/jgit/archive/ZipFormat.java | 24 +- .../eclipse/jgit/archive/internal/ArchiveText.java | 39 +- org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +- org.eclipse.jgit.console/pom.xml | 2 +- org.eclipse.jgit.http.apache/.classpath | 7 + org.eclipse.jgit.http.apache/.project | 34 ++ .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.jdt.core.prefs | 393 +++++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 61 ++++ .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 + .../.settings/org.eclipse.mylyn.team.ui.prefs | 3 + .../.settings/org.eclipse.pde.api.tools.prefs | 94 +++++ .../.settings/org.eclipse.pde.core.prefs | 3 + org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 29 ++ org.eclipse.jgit.http.apache/about.html | 59 ++++ org.eclipse.jgit.http.apache/build.properties | 7 + org.eclipse.jgit.http.apache/plugin.properties | 3 + .../pom.xml | 16 +- .../http/apache/internal/HttpApacheText.properties | 1 + .../http/apache/HttpClientConnection.java | 366 +++++++++++++++++++ .../http/apache/HttpClientConnectionFactory.java | 44 +-- .../http/apache/TemporaryBufferEntity.java | 79 +++-- .../http/apache/internal/HttpApacheText.java | 38 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 24 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 38 +- org.eclipse.jgit.http.test/pom.xml | 9 +- .../jgit/http/test/DumbClientDumbServerTest.java | 21 ++ .../jgit/http/test/DumbClientSmartServerTest.java | 21 ++ .../jgit/http/test/MeasurePackSizeTest.java | 165 +++++++++ .../jgit/http/test/SmartClientSmartServerTest.java | 21 ++ org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF | 19 +- ...eclipse.jgit.java7 -- Java7 feature test.launch | 20 ++ org.eclipse.jgit.java7.test/pom.xml | 2 +- .../org/eclipse/jgit/symlinks/SymlinksTest.java | 263 ++++++++++++++ .../jgit/treewalk/FileTreeIteratorJava7Test.java | 202 +++++++++++ .../eclipse/jgit/treewalk/TreeWalkJava7Test.java | 55 ++- .../src/org/eclipse/jgit/util/FSJava7Test.java | 10 +- .../src/org/eclipse/jgit/util/FileUtils7Test.java | 60 ++-- org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 4 +- org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.java7/pom.xml | 2 +- .../src/org/eclipse/jgit/util/FS_POSIX_Java7.java | 31 +- .../src/org/eclipse/jgit/util/FS_Win32_Java7.java | 39 +- .../eclipse/jgit/util/FS_Win32_Java7Cygwin.java | 13 + .../src/org/eclipse/jgit/util/FileUtil.java | 107 +++++- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 21 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 30 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/.project | 17 + .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 + .../.settings/org.eclipse.mylyn.team.ui.prefs | 3 + .../build.properties | 4 + .../edl-v10.html | 59 ++++ .../feature.properties | 160 +++++++++ .../feature.xml | 12 +- .../license.html | 108 ++++++ .../pom.xml | 10 +- .../org.eclipse.jgit.java7.feature/feature.xml | 2 +- .../org.eclipse.jgit.java7.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 9 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 4 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/category.xml | 3 + .../org.eclipse.jgit.repository/pom.xml | 9 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/jgit-4.3.target | 20 +- .../org.eclipse.jgit.target/jgit-4.4.target | 16 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 3 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 28 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- .../tst/org/eclipse/jgit/pgm/ArchiveTest.java | 169 ++++++++- .../tst/org/eclipse/jgit/pgm/ConfigTest.java | 22 ++ org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 60 ++-- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../eclipse/jgit/pgm/internal/CLIText.properties | 3 + .../src/org/eclipse/jgit/pgm/Archive.java | 4 + .../src/org/eclipse/jgit/pgm/Blame.java | 2 +- .../src/org/eclipse/jgit/pgm/Config.java | 6 +- .../org/eclipse/jgit/pgm/debug/ShowDirCache.java | 15 +- .../src/org/eclipse/jgit/pgm/internal/CLIText.java | 1 + .../org/eclipse/jgit/pgm/opt/CmdLineParser.java | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 73 ++-- org.eclipse.jgit.test/pom.xml | 2 +- .../org/eclipse/jgit/api/CheckoutCommandTest.java | 96 +++++ .../tst/org/eclipse/jgit/api/PullCommandTest.java | 65 ++++ .../org/eclipse/jgit/api/RebaseCommandTest.java | 39 ++ .../org/eclipse/jgit/diff/DiffFormatterTest.java | 30 +- .../internal/storage/file/InflatingBitSetTest.java | 2 +- .../internal/storage/file/RefDirectoryTest.java | 25 +- .../jgit/internal/storage/file/RefUpdateTest.java | 1 - .../internal/storage/file/StoredBitmapTest.java | 2 +- .../tst/org/eclipse/jgit/lib/ConfigTest.java | 47 +++ .../tst/org/eclipse/jgit/lib/IndexDiffTest.java | 78 ++++ .../tst/org/eclipse/jgit/lib/ValidRefNameTest.java | 23 ++ .../org/eclipse/jgit/merge/ResolveMergerTest.java | 41 ++- .../jgit/revwalk/RevWalkUtilsReachableTest.java | 128 +++++++ .../org/eclipse/jgit/transport/HttpAuthTest.java | 24 +- .../jgit/treewalk/FileTreeIteratorTest.java | 32 +- .../treewalk/FileTreeIteratorWithTimeControl.java | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/.settings/.api_filters | 19 + org.eclipse.jgit/META-INF/MANIFEST.MF | 69 ++-- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 7 +- .../org/eclipse/jgit/internal/JGitText.properties | 3 + .../src/org/eclipse/jgit/api/ArchiveCommand.java | 38 +- .../src/org/eclipse/jgit/api/BlameCommand.java | 2 +- .../src/org/eclipse/jgit/api/CheckoutCommand.java | 72 +++- .../src/org/eclipse/jgit/api/CleanCommand.java | 7 +- .../src/org/eclipse/jgit/api/FetchCommand.java | 20 +- .../src/org/eclipse/jgit/api/MergeCommand.java | 29 +- .../src/org/eclipse/jgit/api/PullCommand.java | 84 ++++- .../src/org/eclipse/jgit/api/RebaseCommand.java | 5 +- .../src/org/eclipse/jgit/diff/DiffFormatter.java | 38 +- .../eclipse/jgit/dircache/DirCacheCheckout.java | 162 ++++++--- .../TooLargePackException.java} | 43 +-- .../src/org/eclipse/jgit/internal/JGitText.java | 3 + .../internal/storage/file/BasePackBitmapIndex.java | 2 +- .../eclipse/jgit/internal/storage/file/BitSet.java | 2 +- .../internal/storage/file/BitmapIndexImpl.java | 4 +- .../storage/file/CachedObjectDirectory.java | 110 +++--- .../internal/storage/file/FileObjectDatabase.java | 219 +----------- .../jgit/internal/storage/file/FileRepository.java | 40 ++- .../jgit/internal/storage/file/FileSnapshot.java | 4 +- .../internal/storage/file/InflatingBitSet.java | 6 +- .../storage/file/LargePackedDeltaObject.java | 2 +- .../internal/storage/file/ObjectDirectory.java | 351 +++++++++++------- .../storage/file/ObjectDirectoryPackParser.java | 15 + .../internal/storage/file/PackBitmapIndex.java | 4 +- .../storage/file/PackBitmapIndexBuilder.java | 2 +- .../storage/file/PackBitmapIndexRemapper.java | 4 +- .../internal/storage/file/PackBitmapIndexV1.java | 2 +- .../storage/file/PackBitmapIndexWriterV1.java | 2 +- .../jgit/internal/storage/file/RefDirectory.java | 2 +- .../internal/storage/file/SimpleDataInput.java | 2 +- .../internal/storage/file/SimpleDataOutput.java | 2 +- .../storage/pack/PackWriterBitmapPreparer.java | 2 +- .../src/org/eclipse/jgit/lib/ConfigConstants.java | 21 ++ .../src/org/eclipse/jgit/lib/Constants.java | 7 + .../src/org/eclipse/jgit/lib/CoreConfig.java | 12 + .../src/org/eclipse/jgit/lib/IndexDiff.java | 3 +- .../src/org/eclipse/jgit/lib/RefUpdate.java | 5 +- .../src/org/eclipse/jgit/lib/Repository.java | 10 + .../src/org/eclipse/jgit/merge/MergeConfig.java | 189 ++++++++++ .../src/org/eclipse/jgit/merge/ResolveMerger.java | 38 +- .../src/org/eclipse/jgit/revwalk/RevWalk.java | 13 + .../src/org/eclipse/jgit/revwalk/RevWalkUtils.java | 31 +- .../eclipse/jgit/transport/BaseReceivePack.java | 52 +++ .../org/eclipse/jgit/transport/HttpAuthMethod.java | 12 +- .../org/eclipse/jgit/transport/HttpTransport.java | 28 ++ .../src/org/eclipse/jgit/transport/PackParser.java | 14 + .../org/eclipse/jgit/transport/ReceiveCommand.java | 3 +- .../eclipse/jgit/transport/TransportAmazonS3.java | 10 +- .../org/eclipse/jgit/transport/TransportHttp.java | 61 ++-- .../src/org/eclipse/jgit/transport/UploadPack.java | 6 +- .../jgit/transport/http/HttpConnection.java | 278 +++++++++++++++ .../HttpConnectionFactory.java} | 49 ++- .../jgit/transport/http/JDKHttpConnection.java | 194 ++++++++++ .../JDKHttpConnectionFactory.java} | 43 +-- .../eclipse/jgit/treewalk/FileTreeIterator.java | 41 ++- .../eclipse/jgit/treewalk/WorkingTreeIterator.java | 133 ++++++- .../eclipse/jgit/treewalk/WorkingTreeOptions.java | 13 + .../jgit/treewalk/filter/IndexDiffFilter.java | 10 +- org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 183 ++++++++++ .../org/eclipse/jgit/util/GitDateFormatter.java | 2 +- .../src/org/eclipse/jgit/util/GitDateParser.java | 2 +- .../src/org/eclipse/jgit/util/HttpSupport.java | 35 +- .../jgit/util/io/EolCanonicalizingInputStream.java | 44 +++ .../eclipse/jgit/util/io/LimitedInputStream.java | 154 ++++++++ pom.xml | 17 +- 198 files changed, 5931 insertions(+), 1290 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
