[eclipse-jgit] 01/04: Merge tag 'upstream/3.1.0'
Jakub Adam
xhaakon-guest at alioth.debian.org
Tue Oct 8 20:05:44 UTC 2013
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 1fccedddeb044a801763b57f22c7aca4ebb6bc94
Merge: 4f54a9a fa0fc68
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Tue Oct 8 19:57:14 2013 +0200
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 14 +-
org.eclipse.jgit.ant.test/pom.xml | 4 +-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 6 +-
org.eclipse.jgit.ant/pom.xml | 2 +-
org.eclipse.jgit.archive/.classpath | 7 +
org.eclipse.jgit.archive/.project | 34 ++
.../.settings/org.eclipse.core.resources.prefs | 3 +
.../.settings/org.eclipse.core.runtime.prefs | 3 +
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
.../.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.archive/META-INF/MANIFEST.MF | 20 ++
.../META-INF/SOURCE-MANIFEST.MF | 7 +
org.eclipse.jgit.archive/about.html | 59 ++++
org.eclipse.jgit.archive/build.properties | 6 +
org.eclipse.jgit.archive/plugin.properties | 2 +
.../pom.xml | 27 +-
.../org/eclipse/jgit/archive/ArchiveFormats.java | 66 ++--
.../org/eclipse/jgit/archive/FormatActivator.java | 51 +--
.../src/org/eclipse/jgit/archive/TarFormat.java | 87 +++--
.../src/org/eclipse/jgit/archive/Tbz2Format.java | 62 ++--
.../src/org/eclipse/jgit/archive/TgzFormat.java | 62 ++--
.../src/org/eclipse/jgit/archive/TxzFormat.java | 62 ++--
.../src/org/eclipse/jgit/archive/ZipFormat.java | 76 ++--
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.console/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 24 +-
org.eclipse.jgit.http.server/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 32 +-
.../org.eclipse.jgit.http--All-Tests.launch | 4 +
org.eclipse.jgit.http.test/pom.xml | 4 +-
.../eclipse/jgit/http/test/HttpClientTests.java | 16 +
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.java7.test/META-INF/MANIFEST.MF | 12 +-
org.eclipse.jgit.java7.test/pom.xml | 2 +-
.../jgit/lib/DirCacheCheckoutTestWithSymlinks.java | 99 ++++++
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.java7/META-INF/MANIFEST.MF | 6 +-
org.eclipse.jgit.java7/META-INF/SOURCE-MANIFEST.MF | 4 +-
org.eclipse.jgit.java7/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 +-
org.eclipse.jgit.junit.http/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 30 +-
org.eclipse.jgit.junit/pom.xml | 2 +-
.../jgit/junit/LocalDiskRepositoryTestCase.java | 143 ++++----
.../org.eclipse.jgit.feature/feature.xml | 16 +-
.../org.eclipse.jgit.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 | 8 +-
.../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 | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 29 +-
.../org.eclipse.jgit.pgm--All-Tests (Java7).launch | 4 +
.../org.eclipse.jgit.pgm--All-Tests.launch | 4 +
org.eclipse.jgit.pgm.test/pom.xml | 2 +-
.../tst/org/eclipse/jgit/pgm/ArchiveTest.java | 247 ++++++++++++-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 59 ++--
org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 5 +-
.../services/org.eclipse.jgit.pgm.TextBuiltin | 2 +-
org.eclipse.jgit.pgm/pom.xml | 22 +-
.../eclipse/jgit/pgm/internal/CLIText.properties | 33 +-
.../src/org/eclipse/jgit/pgm/Archive.java | 42 ++-
.../src/org/eclipse/jgit/pgm/Config.java | 10 +-
.../src/org/eclipse/jgit/pgm/DiffTree.java | 1 +
.../src/org/eclipse/jgit/pgm/Fetch.java | 6 +-
.../src/org/eclipse/jgit/pgm/{debug => }/Gc.java | 4 +-
.../src/org/eclipse/jgit/pgm/Glog.java | 1 +
.../src/org/eclipse/jgit/pgm/IndexPack.java | 1 +
.../src/org/eclipse/jgit/pgm/LsRemote.java | 1 +
.../src/org/eclipse/jgit/pgm/LsTree.java | 1 +
.../src/org/eclipse/jgit/pgm/Merge.java | 12 +-
.../src/org/eclipse/jgit/pgm/MergeBase.java | 1 +
.../src/org/eclipse/jgit/pgm/RevList.java | 1 +
.../src/org/eclipse/jgit/pgm/RevParse.java | 5 +-
.../src/org/eclipse/jgit/pgm/ShowRef.java | 1 +
.../src/org/eclipse/jgit/pgm/Status.java | 11 +-
.../eclipse/jgit/pgm/archive/ArchiveCommand.java | 278 ---------------
.../org/eclipse/jgit/pgm/debug/DiffAlgorithms.java | 2 +
.../org/eclipse/jgit/pgm/debug/MakeCacheTree.java | 2 +
.../org/eclipse/jgit/pgm/debug/ReadDirCache.java | 2 +
.../eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 2 +
.../org/eclipse/jgit/pgm/debug/ShowCacheTree.java | 2 +
.../org/eclipse/jgit/pgm/debug/ShowDirCache.java | 2 +
.../org/eclipse/jgit/pgm/debug/ShowPackDelta.java | 2 +
.../eclipse/jgit/pgm/debug/TextHashFunctions.java | 2 +
.../org/eclipse/jgit/pgm/debug/WriteDirCache.java | 2 +
.../src/org/eclipse/jgit/pgm/internal/CLIText.java | 1 -
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 73 ++--
org.eclipse.jgit.test/pom.xml | 4 +-
.../org/eclipse/jgit/api/LsRemoteCommandTest.java | 10 +-
.../tst/org/eclipse/jgit/api/ResetCommandTest.java | 38 +-
.../eclipse/jgit/api/StashApplyCommandTest.java | 3 +
.../org/eclipse/jgit/api/StatusCommandTest.java | 36 ++
.../eclipse/jgit/fnmatch/FileNameMatcherTest.java | 40 +++
.../org/eclipse/jgit/ignore/IgnoreNodeTest.java | 11 +
.../internal/storage/dfs/DfsOutputStreamTest.java | 150 ++++++++
.../internal/storage/file/PackIndexTestCase.java | 15 +
.../storage/file/RepositorySetupWorkDirTest.java | 21 +-
.../eclipse/jgit/revplot/PlotCommitListTest.java | 51 ++-
.../org/eclipse/jgit/transport/TransportTest.java | 16 +
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-
org.eclipse.jgit.ui/pom.xml | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 2 +-
org.eclipse.jgit/META-INF/MANIFEST.MF | 76 ++--
org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 5 +-
org.eclipse.jgit/pom.xml | 2 +-
.../org/eclipse/jgit/internal/JGitText.properties | 4 +
.../src/org/eclipse/jgit/api/ArchiveCommand.java | 373 ++++++++++++++++++++
.../org/eclipse/jgit/api/CherryPickCommand.java | 1 +
.../src/org/eclipse/jgit/api/CommitCommand.java | 4 +-
org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java | 21 ++
.../src/org/eclipse/jgit/api/LogCommand.java | 20 +-
.../src/org/eclipse/jgit/api/LsRemoteCommand.java | 8 +-
.../src/org/eclipse/jgit/api/MergeResult.java | 2 +-
.../src/org/eclipse/jgit/api/RebaseCommand.java | 6 +-
.../src/org/eclipse/jgit/api/ResetCommand.java | 141 +++++---
.../src/org/eclipse/jgit/api/RevertCommand.java | 2 +-
.../org/eclipse/jgit/api/StashApplyCommand.java | 2 +-
.../src/org/eclipse/jgit/api/StatusCommand.java | 59 +++-
.../eclipse/jgit/api/errors/GitAPIException.java | 21 +-
.../eclipse/jgit/dircache/DirCacheCheckout.java | 2 +-
.../org/eclipse/jgit/fnmatch/FileNameMatcher.java | 64 ++--
.../src/org/eclipse/jgit/ignore/IgnoreNode.java | 2 +-
.../src/org/eclipse/jgit/internal/JGitText.java | 4 +
.../jgit/internal/storage/dfs/DfsBlock.java | 35 +-
.../jgit/internal/storage/dfs/DfsOutputStream.java | 59 ++++
.../internal/storage/dfs/DfsPackCompactor.java | 8 +-
.../jgit/internal/storage/dfs/DfsReader.java | 25 +-
.../internal/storage/dfs/InMemoryOutputStream.java | 53 ++-
.../internal/storage/dfs/InMemoryRepository.java | 40 +--
.../jgit/internal/storage/file/PackFile.java | 16 +-
.../jgit/internal/storage/file/PackIndex.java | 13 +
.../jgit/internal/storage/file/PackIndexV1.java | 27 +-
.../jgit/internal/storage/file/PackIndexV2.java | 30 +-
.../internal/storage/file/PackReverseIndex.java | 173 ++++-----
.../org/eclipse/jgit/lib/BranchTrackingStatus.java | 6 +-
.../org/eclipse/jgit/revplot/PlotCommitList.java | 6 +-
.../src/org/eclipse/jgit/revwalk/RevFlag.java | 2 +-
.../jgit/transport/BasePackFetchConnection.java | 59 +++-
.../org/eclipse/jgit/transport/TransferConfig.java | 56 ++-
.../src/org/eclipse/jgit/transport/Transport.java | 6 +
.../jgit/transport/TransportBundleFile.java | 15 +
.../org/eclipse/jgit/transport/TransportLocal.java | 21 ++
.../org/eclipse/jgit/transport/TransportSftp.java | 2 +-
.../src/org/eclipse/jgit/transport/URIish.java | 2 +-
.../src/org/eclipse/jgit/transport/UploadPack.java | 355 ++++++++++++++++---
.../jgit/treewalk/filter/PathSuffixFilter.java | 14 +-
.../src/org/eclipse/jgit/util/ChangeIdUtil.java | 2 +-
.../eclipse/jgit/util/RelativeDateFormatter.java | 2 +-
.../src/org/eclipse/jgit/util/StringUtils.java | 1 +
pom.xml | 12 +-
tools/fix-headers.pl | 343 ------------------
tools/fix-headers.tst | 11 -
tools/rewrite-history.sh | 84 -----
178 files changed, 3221 insertions(+), 1691 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