[eclipse-jgit] 01/04: Merge tag 'upstream/3.4.0'
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Sat Jun 21 13:16:16 UTC 2014
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 0bb2edb5fecbfa6078e25cc686321fa2221166d7
Merge: f35191a 0720e5a
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sat Jun 21 14:16:16 2014 +0200
Merge tag 'upstream/3.4.0'
Upstream version 3.4.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/.settings/.api_filters | 38 ++
org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 10 +-
.../META-INF/SOURCE-MANIFEST.MF | 6 +-
org.eclipse.jgit.archive/pom.xml | 2 +-
.../org/eclipse/jgit/archive/ArchiveFormats.java | 1 -
.../src/org/eclipse/jgit/archive/TarFormat.java | 12 +-
.../src/org/eclipse/jgit/archive/Tbz2Format.java | 12 +-
.../src/org/eclipse/jgit/archive/TgzFormat.java | 12 +-
.../src/org/eclipse/jgit/archive/TxzFormat.java | 12 +-
.../src/org/eclipse/jgit/archive/ZipFormat.java | 12 +-
org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.console/pom.xml | 2 +-
org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 10 +-
org.eclipse.jgit.http.apache/pom.xml | 2 +-
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 24 +-
org.eclipse.jgit.http.server/pom.xml | 2 +-
.../jgit/http/server/ClientVersionUtil.java | 2 +-
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 36 +-
org.eclipse.jgit.http.test/pom.xml | 2 +-
.../jgit/http/test/SetAdditionalHeadersTest.java | 139 +++++
org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF | 22 +-
...git.java7 -- Java7 feature test (Java 8).launch | 21 +
org.eclipse.jgit.java7.test/pom.xml | 2 +-
.../org/eclipse/jgit/symlinks/SymlinksTest.java | 74 +++
org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 4 +-
org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF | 6 +-
org.eclipse.jgit.java7/pom.xml | 2 +-
.../src/org/eclipse/jgit/util/FS_Win32_Java7.java | 2 +-
org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 +-
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.packaging/.project | 40 ++
.../org.eclipse.jgit.feature/feature.properties | 5 +-
.../org.eclipse.jgit.feature/feature.xml | 2 +-
.../org.eclipse.jgit.feature/license.html | 56 +-
.../org.eclipse.jgit.feature/pom.xml | 2 +-
.../feature.properties | 5 +-
.../feature.xml | 2 +-
.../license.html | 56 +-
.../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +-
.../feature.properties | 5 +-
.../org.eclipse.jgit.java7.feature/feature.xml | 2 +-
.../org.eclipse.jgit.java7.feature/license.html | 56 +-
.../org.eclipse.jgit.java7.feature/pom.xml | 2 +-
.../build.properties | 3 +-
.../feature.properties | 7 +-
.../org.eclipse.jgit.junit.feature/feature.xml | 2 +-
.../license.html | 56 +-
.../org.eclipse.jgit.junit.feature/pom.xml | 2 +-
.../feature.properties | 5 +-
.../org.eclipse.jgit.pgm.feature/feature.xml | 4 +-
.../org.eclipse.jgit.pgm.feature/license.html | 56 +-
.../org.eclipse.jgit.pgm.feature/pom.xml | 2 +-
.../feature.properties | 5 +-
.../feature.xml | 2 +-
.../license.html | 56 +-
.../org.eclipse.jgit.pgm.source.feature/pom.xml | 2 +-
.../org.eclipse.jgit.repository/pom.xml | 2 +-
.../feature.properties | 5 +-
.../org.eclipse.jgit.source.feature/feature.xml | 2 +-
.../org.eclipse.jgit.source.feature/license.html | 56 +-
.../org.eclipse.jgit.source.feature/pom.xml | 2 +-
.../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +-
.../org.eclipse.jgit.target/jgit-4.4.target | 10 +-
.../org.eclipse.jgit.target/pom.xml | 2 +-
org.eclipse.jgit.packaging/pom.xml | 5 +-
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 31 +-
.../org.eclipse.jgit.pgm--All-Tests (Java8).launch | 28 +
org.eclipse.jgit.pgm.test/pom.xml | 4 +-
.../eclipse/jgit/lib/CLIRepositoryTestCase.java | 4 +
.../tst/org/eclipse/jgit/pgm/BranchTest.java | 25 +-
.../tst/org/eclipse/jgit/pgm/CheckoutTest.java | 434 ++++++++++++++
.../tst/org/eclipse/jgit/pgm/ConfigTest.java | 30 +-
.../tst/org/eclipse/jgit/pgm/RepoTest.java | 162 +++++
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 61 +-
org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 6 +-
.../services/org.eclipse.jgit.pgm.TextBuiltin | 1 +
org.eclipse.jgit.pgm/pom.xml | 4 +-
.../eclipse/jgit/pgm/internal/CLIText.properties | 6 +
.../org/eclipse/jgit/pgm/AbstractFetchCommand.java | 7 +-
.../src/org/eclipse/jgit/pgm/AmazonS3Client.java | 2 +-
.../src/org/eclipse/jgit/pgm/Blame.java | 56 +-
.../src/org/eclipse/jgit/pgm/Branch.java | 48 +-
.../src/org/eclipse/jgit/pgm/Checkout.java | 21 +-
.../src/org/eclipse/jgit/pgm/Clone.java | 24 +-
.../src/org/eclipse/jgit/pgm/Die.java | 23 +
.../src/org/eclipse/jgit/pgm/IndexPack.java | 2 +-
.../src/org/eclipse/jgit/pgm/LsTree.java | 3 +-
.../src/org/eclipse/jgit/pgm/Main.java | 4 +
.../src/org/eclipse/jgit/pgm/Push.java | 2 +-
.../src/org/eclipse/jgit/pgm/ReceivePack.java | 2 +-
.../src/org/eclipse/jgit/pgm/Repo.java | 42 +-
.../org/eclipse/jgit/pgm/RevWalkTextBuiltin.java | 25 +-
.../src/org/eclipse/jgit/pgm/TextBuiltin.java | 93 ++-
.../src/org/eclipse/jgit/pgm/UploadPack.java | 2 +-
.../eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 4 +-
.../org/eclipse/jgit/pgm/debug/ShowCommands.java | 34 +-
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 73 +--
...rg.eclipse.jgit.core--All-Tests (Java 8).launch | 29 +
org.eclipse.jgit.test/pom.xml | 4 +-
.../org/eclipse/jgit/api/ArchiveCommandTest.java | 211 +++++++
.../tst/org/eclipse/jgit/api/BlameCommandTest.java | 162 +++++
.../org/eclipse/jgit/api/BranchCommandTest.java | 14 +
.../eclipse/jgit/api/CherryPickCommandTest.java | 58 ++
...mandTests.java => CommitAndLogCommandTest.java} | 2 +-
.../org/eclipse/jgit/api/NameRevCommandTest.java | 14 +
.../tst/org/eclipse/jgit/api/PushCommandTest.java | 71 ++-
.../org/eclipse/jgit/api/RebaseCommandTest.java | 10 +-
.../eclipse/jgit/api/StashApplyCommandTest.java | 90 ++-
.../eclipse/jgit/api/StashCreateCommandTest.java | 47 +-
.../org/eclipse/jgit/gitrepo/RepoCommandTest.java | 438 ++++++++++++++
.../jgit/internal/storage/file/GcPackRefsTest.java | 68 +++
.../jgit/internal/storage/file/PackFileTest.java | 124 ++--
.../internal/storage/file/ReflogWriterTest.java | 67 ++-
.../internal/storage/pack/DeltaStreamTest.java | 314 ----------
.../org/eclipse/jgit/lib/DirCacheCheckoutTest.java | 2 +-
.../org/eclipse/jgit/lib/ObjectCheckerTest.java | 219 +++++++
.../tst/org/eclipse/jgit/lib/RefTest.java | 46 ++
.../tst/org/eclipse/jgit/lib/ValidRefNameTest.java | 78 ++-
.../jgit/revplot/AbstractPlotRendererTest.java | 153 +++++
.../eclipse/jgit/revplot/PlotCommitListTest.java | 399 ++++++++++--
.../jgit/revwalk/RevWalkMergedIntoTest.java | 53 +-
.../jgit/revwalk/RevWalkPathFilter1Test.java | 94 +++
.../org/eclipse/jgit/transport/HttpAuthTest.java | 9 +
.../jgit/treewalk/FileTreeIteratorTest.java | 5 +
org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-
org.eclipse.jgit.ui/pom.xml | 2 +-
.../org/eclipse/jgit/awtui/CommitGraphPane.java | 2 +-
.../org/eclipse/jgit/awtui/SwingCommitList.java | 9 -
org.eclipse.jgit/META-INF/MANIFEST.MF | 67 ++-
org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 6 +-
org.eclipse.jgit/pom.xml | 2 +-
.../jgit/gitrepo/internal/RepoText.properties | 6 +
.../org/eclipse/jgit/internal/JGitText.properties | 8 +-
.../src/org/eclipse/jgit/api/ArchiveCommand.java | 137 ++++-
.../src/org/eclipse/jgit/api/BlameCommand.java | 58 +-
.../org/eclipse/jgit/api/CherryPickCommand.java | 66 +-
.../org/eclipse/jgit/api/CreateBranchCommand.java | 11 +-
.../src/org/eclipse/jgit/api/DescribeCommand.java | 2 +-
.../org/eclipse/jgit/api/ListBranchCommand.java | 78 ++-
.../src/org/eclipse/jgit/api/MergeCommand.java | 6 +-
.../src/org/eclipse/jgit/api/MergeResult.java | 20 +-
.../src/org/eclipse/jgit/api/NameRevCommand.java | 15 +-
.../src/org/eclipse/jgit/api/PullCommand.java | 41 +-
.../src/org/eclipse/jgit/api/RebaseCommand.java | 30 +-
.../src/org/eclipse/jgit/api/RevertCommand.java | 21 +-
.../org/eclipse/jgit/api/StashApplyCommand.java | 117 +++-
.../org/eclipse/jgit/api/StashCreateCommand.java | 74 ++-
.../src/org/eclipse/jgit/api/StashDropCommand.java | 2 +-
.../src/org/eclipse/jgit/api/Status.java | 2 +-
.../eclipse/jgit/api/SubmoduleUpdateCommand.java | 16 +
.../src/org/eclipse/jgit/blame/BlameGenerator.java | 166 ++---
.../src/org/eclipse/jgit/blame/BlameResult.java | 8 +-
.../src/org/eclipse/jgit/blame/Candidate.java | 66 ++
.../src/org/eclipse/jgit/diff/DiffAlgorithm.java | 3 +
.../src/org/eclipse/jgit/diff/DiffEntry.java | 4 +-
.../src/org/eclipse/jgit/diff/Edit.java | 16 +-
.../src/org/eclipse/jgit/diff/HistogramDiff.java | 5 +-
.../src/org/eclipse/jgit/diff/MyersDiff.java | 20 +-
.../src/org/eclipse/jgit/dircache/DirCache.java | 37 +-
.../eclipse/jgit/dircache/DirCacheCheckout.java | 326 +++++-----
.../org/eclipse/jgit/dircache/DirCacheEntry.java | 12 +-
.../jgit/errors/CorruptObjectException.java | 15 +
.../org/eclipse/jgit/fnmatch/FileNameMatcher.java | 1 -
.../src/org/eclipse/jgit/gitrepo/RepoCommand.java | 666 +++++++++++++++++++++
.../internal/RepoText.java} | 38 +-
.../src/org/eclipse/jgit/internal/JGitText.java | 4 +-
.../jgit/internal/storage/dfs/DfsRefDatabase.java | 7 +-
.../jgit/internal/storage/dfs/DfsRefRename.java | 3 +-
.../org/eclipse/jgit/internal/storage/file/GC.java | 2 +-
.../storage/file/LargePackedDeltaObject.java | 265 --------
.../internal/storage/file/ObjectDirectory.java | 10 +-
.../storage/file/ObjectDirectoryInserter.java | 4 +-
.../jgit/internal/storage/file/PackFile.java | 25 +-
.../jgit/internal/storage/file/ReflogWriter.java | 2 +-
.../jgit/internal/storage/pack/DeltaIndex.java | 4 +-
.../jgit/internal/storage/pack/DeltaStream.java | 343 -----------
.../jgit/internal/storage/pack/PackWriter.java | 4 +-
.../org/eclipse/jgit/lib/AbbreviatedObjectId.java | 2 +-
.../src/org/eclipse/jgit/lib/AnyObjectId.java | 4 +-
.../src/org/eclipse/jgit/lib/CoreConfig.java | 6 +-
.../src/org/eclipse/jgit/lib/ObjectChecker.java | 305 +++++++++-
.../src/org/eclipse/jgit/lib/RefComparator.java | 10 +-
.../src/org/eclipse/jgit/lib/RefDatabase.java | 22 +
.../src/org/eclipse/jgit/lib/Repository.java | 46 +-
.../src/org/eclipse/jgit/lib/Tree.java | 2 +-
.../src/org/eclipse/jgit/lib/TreeFormatter.java | 6 +-
.../src/org/eclipse/jgit/merge/MergeFormatter.java | 2 +-
.../src/org/eclipse/jgit/merge/ResolveMerger.java | 154 ++++-
.../eclipse/jgit/revplot/AbstractPlotRenderer.java | 85 ++-
.../src/org/eclipse/jgit/revplot/PlotCommit.java | 35 +-
.../org/eclipse/jgit/revplot/PlotCommitList.java | 311 +++++++---
.../src/org/eclipse/jgit/revplot/PlotLane.java | 8 -
.../src/org/eclipse/jgit/revwalk/FooterLine.java | 2 +-
.../src/org/eclipse/jgit/revwalk/RevCommit.java | 79 ++-
.../org/eclipse/jgit/revwalk/RevCommitList.java | 3 +-
.../src/org/eclipse/jgit/revwalk/RevWalk.java | 36 +-
.../org/eclipse/jgit/revwalk/StartGenerator.java | 4 +-
.../org/eclipse/jgit/storage/pack/PackConfig.java | 2 +-
.../jgit/transport/BasePackPushConnection.java | 8 +-
.../eclipse/jgit/transport/BaseReceivePack.java | 61 +-
.../org/eclipse/jgit/transport/HttpAuthMethod.java | 180 +++++-
.../jgit/transport/JschConfigSessionFactory.java | 3 +
.../src/org/eclipse/jgit/transport/PackParser.java | 8 +-
.../eclipse/jgit/transport/TrackingRefUpdate.java | 11 +-
.../org/eclipse/jgit/transport/TransferConfig.java | 9 +-
.../org/eclipse/jgit/transport/TransportHttp.java | 30 +-
.../src/org/eclipse/jgit/transport/URIish.java | 6 +-
.../eclipse/jgit/treewalk/CanonicalTreeParser.java | 3 +-
.../src/org/eclipse/jgit/treewalk/TreeWalk.java | 2 +-
.../eclipse/jgit/treewalk/WorkingTreeIterator.java | 15 +-
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 8 +-
.../src/org/eclipse/jgit/util/FileUtils.java | 27 +-
.../org/eclipse/jgit/util/GSSManagerFactory.java | 159 +++++
org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java | 2 +-
.../src/org/eclipse/jgit/util/IntList.java | 2 +-
.../src/org/eclipse/jgit/util/LongList.java | 2 +-
org.eclipse.jgit/src/org/eclipse/jgit/util/NB.java | 2 +-
.../src/org/eclipse/jgit/util/RawParseUtils.java | 2 +-
.../org/eclipse/jgit/util/io/InterruptTimer.java | 2 +-
.../eclipse/jgit/util/io/TimeoutInputStream.java | 2 +-
.../eclipse/jgit/util/io/TimeoutOutputStream.java | 2 +-
pom.xml | 38 +-
tools/release.sh | 52 ++
229 files changed, 7237 insertions(+), 2519 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git
More information about the pkg-java-commits
mailing list