[eclipse-jgit] 01/03: Merge tag 'upstream/3.5.2'
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Thu Nov 13 21:07:37 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 8dd1df38edd026b31fc4030e97cbbb1d90451a50
Merge: 1e3a003 5481636
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Nov 13 21:03:50 2014 +0100
Merge tag 'upstream/3.5.2'
Upstream version 3.5.2
CONTRIBUTING.md | 44 +++
README.md | 90 +++++-
SUBMITTING_PATCHES | 106 ------
.../.settings/org.eclipse.jdt.core.prefs | 5 +
org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.ant.test/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +-
org.eclipse.jgit.ant/pom.xml | 2 +-
org.eclipse.jgit.archive/.settings/.api_filters | 38 ---
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 10 +-
.../META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.archive/pom.xml | 2 +-
.../src/org/eclipse/jgit/archive/TarFormat.java | 6 +-
.../src/org/eclipse/jgit/archive/ZipFormat.java | 6 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.console/pom.xml | 2 +-
.../jgit/console/ConsoleCredentialsProvider.java | 6 +-
org.eclipse.jgit.http.apache/.classpath | 1 +
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 10 +-
org.eclipse.jgit.http.apache/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 24 +-
org.eclipse.jgit.http.server/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 36 +--
org.eclipse.jgit.http.test/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF | 22 +-
org.eclipse.jgit.java7.test/build.properties | 3 -
org.eclipse.jgit.java7.test/pom.xml | 2 +-
.../org/eclipse/jgit/symlinks/SymlinksTest.java | 1 -
.../jgit/treewalk/FileTreeIteratorJava7Test.java | 6 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
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 | 10 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 +-
org.eclipse.jgit.junit.http/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 30 +-
org.eclipse.jgit.junit/pom.xml | 2 +-
.../src/org/eclipse/jgit/junit/JGitTestUtil.java | 5 +
.../org/eclipse/jgit/junit/RepositoryTestCase.java | 11 +-
.../org.eclipse.jgit.feature/feature.xml | 2 +-
.../org.eclipse.jgit.feature/pom.xml | 2 +-
.../feature.xml | 2 +-
.../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +-
.../org.eclipse.jgit.java7.feature/feature.xml | 2 +-
.../org.eclipse.jgit.java7.feature/pom.xml | 2 +-
.../org.eclipse.jgit.junit.feature/feature.xml | 2 +-
.../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/pom.xml | 2 +-
.../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/pom.xml | 2 +-
org.eclipse.jgit.packaging/pom.xml | 8 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 34 +-
org.eclipse.jgit.pgm.test/pom.xml | 2 +-
.../tst/org/eclipse/jgit/pgm/MergeTest.java | 25 +-
.../tst/org/eclipse/jgit/pgm/RepoTest.java | 2 +-
.../tst/org/eclipse/jgit/pgm/StatusTest.java | 150 ++++-----
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 62 ++--
org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.pgm/pom.xml | 2 +-
.../eclipse/jgit/pgm/internal/CLIText.properties | 11 +-
.../src/org/eclipse/jgit/pgm/Log.java | 5 +-
.../src/org/eclipse/jgit/pgm/LsRemote.java | 5 +
.../src/org/eclipse/jgit/pgm/Main.java | 6 +-
.../src/org/eclipse/jgit/pgm/Merge.java | 9 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 74 ++---
org.eclipse.jgit.test/pom.xml | 2 +-
.../org/eclipse/jgit/api/BranchCommandTest.java | 11 +-
.../org/eclipse/jgit/api/CheckoutCommandTest.java | 97 ++++--
.../eclipse/jgit/api/CherryPickCommandTest.java | 48 ++-
.../tst/org/eclipse/jgit/api/MergeCommandTest.java | 65 +++-
.../tst/org/eclipse/jgit/api/PullCommandTest.java | 207 ++++++++++++
.../org/eclipse/jgit/api/RebaseCommandTest.java | 278 ++++++++++++++++
.../org/eclipse/jgit/api/RevertCommandTest.java | 100 ++++++
.../org/eclipse/jgit/diff/DiffFormatterTest.java | 88 ++++-
.../org/eclipse/jgit/gitrepo/RepoCommandTest.java | 350 +++++++++++++++++---
.../jgit/internal/storage/dfs/DfsInserterTest.java | 175 ++++++++++
.../internal/storage/dfs/DfsOutputStreamTest.java | 150 ---------
.../jgit/internal/storage/file/PackFileTest.java | 11 +-
.../jgit/internal/storage/file/PackWriterTest.java | 29 ++
.../tst/org/eclipse/jgit/lib/BranchConfigTest.java | 16 +
.../tst/org/eclipse/jgit/lib/ConfigTest.java | 14 +
.../org/eclipse/jgit/lib/DirCacheCheckoutTest.java | 19 ++
.../tst/org/eclipse/jgit/lib/IndexDiffTest.java | 116 +++++++
.../eclipse/jgit/merge/RecursiveMergerTest.java | 263 ++++++++++++++-
.../eclipse/jgit/revplot/PlotCommitListTest.java | 38 +++
.../org/eclipse/jgit/revwalk/ObjectWalkTest.java | 15 +
.../eclipse/jgit/revwalk/TreeRevFilterTest.java | 188 +++++++++++
.../tst/org/eclipse/jgit/transport/NetRCTest.java | 191 +++++++++++
.../eclipse/jgit/transport/OpenSshConfigTest.java | 34 +-
.../jgit/treewalk/filter/IndexDiffFilterTest.java | 25 ++
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-
org.eclipse.jgit.ui/pom.xml | 2 +-
org.eclipse.jgit/.settings/.api_filters | 34 +-
.../.settings/org.eclipse.jdt.core.prefs | 7 +-
org.eclipse.jgit/META-INF/MANIFEST.MF | 67 ++--
org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit/pom.xml | 2 +-
.../jgit/gitrepo/internal/RepoText.properties | 7 +-
.../org/eclipse/jgit/internal/JGitText.properties | 21 +-
.../jgit/internal/storage/dfs/DfsText.properties | 2 +
.../src/org/eclipse/jgit/api/ArchiveCommand.java | 4 +-
.../src/org/eclipse/jgit/api/CheckoutCommand.java | 25 +-
.../org/eclipse/jgit/api/CherryPickCommand.java | 33 +-
.../src/org/eclipse/jgit/api/CommitCommand.java | 19 +-
.../org/eclipse/jgit/api/CreateBranchCommand.java | 22 +-
org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java | 4 +
.../src/org/eclipse/jgit/api/LsRemoteCommand.java | 29 +-
.../src/org/eclipse/jgit/api/MergeCommand.java | 41 ++-
.../src/org/eclipse/jgit/api/MergeResult.java | 6 +-
.../src/org/eclipse/jgit/api/PullCommand.java | 65 ++--
.../src/org/eclipse/jgit/api/RebaseCommand.java | 313 +++++++++++++++---
.../src/org/eclipse/jgit/api/RevertCommand.java | 1 +
.../org/eclipse/jgit/api/StashApplyCommand.java | 6 +-
.../api/errors/StashApplyFailureException.java | 2 +
.../src/org/eclipse/jgit/diff/DiffFormatter.java | 60 +++-
.../src/org/eclipse/jgit/diff/Edit.java | 15 +-
.../src/org/eclipse/jgit/diff/HistogramDiff.java | 20 +-
.../src/org/eclipse/jgit/diff/MyersDiff.java | 1 +
.../eclipse/jgit/dircache/DirCacheCheckout.java | 15 +-
.../org/eclipse/jgit/dircache/DirCacheEditor.java | 4 +-
.../org/eclipse/jgit/fnmatch/CharacterHead.java | 5 +
.../org/eclipse/jgit/fnmatch/FileNameMatcher.java | 16 +-
.../jgit/fnmatch/RestrictedWildCardHead.java | 5 +
.../src/org/eclipse/jgit/gitrepo/RepoCommand.java | 360 +++++++++++++++++----
.../eclipse/jgit/gitrepo/internal/RepoText.java | 3 +
.../src/org/eclipse/jgit/ignore/IgnoreRule.java | 25 +-
.../src/org/eclipse/jgit/internal/JGitText.java | 4 +
.../jgit/internal/storage/dfs/DfsBlock.java | 11 +-
.../jgit/internal/storage/dfs/DfsInserter.java | 302 ++++++++++++++++-
.../jgit/internal/storage/dfs/DfsOutputStream.java | 59 ----
.../jgit/internal/storage/dfs/DfsReader.java | 31 +-
.../eclipse/jgit/internal/storage/dfs/DfsText.java | 2 +
.../internal/storage/dfs/InMemoryRepository.java | 40 ++-
.../jgit/internal/storage/file/FileRepository.java | 7 +
.../storage/file/ObjectDirectoryInserter.java | 8 +-
.../internal/storage/file/PackBitmapIndexV1.java | 7 +-
.../jgit/internal/storage/file/PackFile.java | 4 +-
.../jgit/internal/storage/file/PackIndexV2.java | 8 +-
.../jgit/internal/storage/file/WindowCursor.java | 33 +-
.../jgit/internal/storage/pack/DeltaTask.java | 2 +-
.../jgit/internal/storage/pack/PackWriter.java | 7 +-
.../storage/pack/PackWriterBitmapWalker.java | 14 +-
.../src/org/eclipse/jgit/lib/BranchConfig.java | 73 +++--
.../src/org/eclipse/jgit/lib/ConfigConstants.java | 13 +
.../src/org/eclipse/jgit/lib/CoreConfig.java | 14 +
.../src/org/eclipse/jgit/lib/ObjectInserter.java | 24 ++
.../src/org/eclipse/jgit/lib/Repository.java | 6 +-
.../src/org/eclipse/jgit/lib/UserConfig.java | 8 +-
.../src/org/eclipse/jgit/merge/MergeResult.java | 13 +
.../src/org/eclipse/jgit/merge/Merger.java | 67 ++--
.../org/eclipse/jgit/merge/RecursiveMerger.java | 70 ++--
.../src/org/eclipse/jgit/merge/ResolveMerger.java | 240 ++++++++------
.../org/eclipse/jgit/nls/GlobalBundleCache.java | 1 +
.../org/eclipse/jgit/nls/TranslationBundle.java | 16 +-
.../eclipse/jgit/revplot/AbstractPlotRenderer.java | 3 +-
.../src/org/eclipse/jgit/revplot/PlotCommit.java | 1 +
.../org/eclipse/jgit/revplot/PlotCommitList.java | 13 +-
.../src/org/eclipse/jgit/revwalk/ObjectWalk.java | 13 +-
.../org/eclipse/jgit/revwalk/RevCommitList.java | 2 +
.../org/eclipse/jgit/revwalk/RevObjectList.java | 2 +
.../org/eclipse/jgit/revwalk/RewriteGenerator.java | 4 +-
.../org/eclipse/jgit/revwalk/StartGenerator.java | 11 +-
.../{RewriteTreeFilter.java => TreeRevFilter.java} | 67 +++-
.../eclipse/jgit/transport/BaseReceivePack.java | 23 +-
.../transport/ChainingCredentialsProvider.java | 131 ++++++++
.../src/org/eclipse/jgit/transport/Daemon.java | 1 +
.../jgit/transport/JschConfigSessionFactory.java | 42 ++-
.../src/org/eclipse/jgit/transport/NetRC.java | 319 ++++++++++++++++++
.../NetRCCredentialsProvider.java} | 89 +++--
.../org/eclipse/jgit/transport/OpenSshConfig.java | 31 +-
.../src/org/eclipse/jgit/transport/PackParser.java | 31 +-
.../org/eclipse/jgit/transport/SshTransport.java | 17 +-
.../org/eclipse/jgit/transport/TcpTransport.java | 11 +
.../src/org/eclipse/jgit/transport/Transport.java | 12 +-
.../eclipse/jgit/transport/TransportGitAnon.java | 9 +
.../eclipse/jgit/transport/TransportGitSsh.java | 14 +
.../org/eclipse/jgit/transport/TransportHttp.java | 13 +-
.../org/eclipse/jgit/transport/TransportSftp.java | 27 +-
.../src/org/eclipse/jgit/transport/URIish.java | 15 +-
.../src/org/eclipse/jgit/transport/UploadPack.java | 7 +-
.../jgit/transport/http/JDKHttpConnection.java | 2 +-
.../jgit/treewalk/AbstractTreeIterator.java | 6 +-
.../eclipse/jgit/treewalk/WorkingTreeOptions.java | 14 +
.../jgit/treewalk/filter/IndexDiffFilter.java | 6 +-
.../src/org/eclipse/jgit/util/FileUtils.java | 4 +-
.../src/org/eclipse/jgit/util/HttpSupport.java | 4 +-
pom.xml | 85 ++++-
tools/maven-central/deploy.rb | 9 +-
tools/maven-central/download.rb | 9 +-
208 files changed, 5532 insertions(+), 1477 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