[eclipse-egit] 01/04: Merge tag 'upstream/3.7.0'
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Mon May 4 17:21:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse-egit.
commit ffa4229fdb3572b6865e21369dbda5ea5aa61c53
Merge: ff2106e 3b3d4f2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sun Apr 26 21:49:36 2015 +0200
Merge tag 'upstream/3.7.0'
Upstream version 3.7.0
.eclipse_iplog | 46 --
README.md | 6 +-
org.eclipse.egit-feature/feature.xml | 4 +-
org.eclipse.egit-feature/pom.xml | 2 +-
org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 22 +-
org.eclipse.egit.core.test/pom.xml | 2 +-
.../indexdiff/IndexDiffCacheEntryTest.java | 258 ++++++++++
.../internal/indexdiff/IndexDiffCacheTest.java | 100 +++-
.../core/internal/indexdiff/IndexDiffDataTest.java | 88 ++++
.../egit/core/internal/util/ProjectUtilTest.java | 46 ++
.../synchronize/GitSubscriberMergeContextTest.java | 569 ++++++++++++++++++++-
.../egit/core/test/DualRepositoryTestCase.java | 4 +-
.../eclipse/egit/core/test/FileDeleteHookTest.java | 64 +++
.../SubmoduleAndContainerTreeIteratorTest.java | 117 +++++
.../core/test/op/CreatePatchOperationTest.java | 83 +--
.../core/test/op/DiscardChangesOperationTest.java | 57 +++
.../egit/core/test/op/TagOperationTest.java | 31 +-
org.eclipse.egit.core/META-INF/MANIFEST.MF | 67 +--
org.eclipse.egit.core/build.properties | 6 +-
org.eclipse.egit.core/pom.xml | 2 +-
.../src/org/eclipse/egit/core/Activator.java | 36 +-
.../eclipse/egit/core/ContainerTreeIterator.java | 24 +-
.../org/eclipse/egit/core/GitMoveDeleteHook.java | 22 +
.../src/org/eclipse/egit/core/IteratorService.java | 7 +-
.../src/org/eclipse/egit/core/RepositoryCache.java | 2 +-
.../src/org/eclipse/egit/core/RevUtils.java | 91 ++++
.../org/eclipse/egit/core/internal/CoreText.java | 12 +
.../core/internal/ProjectReferenceImporter.java | 24 +-
.../eclipse/egit/core/internal/coretext.properties | 8 +-
.../egit/core/internal/gerrit/GerritUtil.java | 130 +++++
.../indexdiff/GitResourceDeltaVisitor.java | 63 ++-
.../internal/indexdiff/IndexDiffCacheEntry.java | 122 +++--
.../core/internal/indexdiff/IndexDiffData.java | 70 ++-
.../internal/indexdiff/IndexDiffUpdateJob.java | 34 +-
.../egit/core/internal/storage/BlobStorage.java | 35 ++
.../core/internal/storage/CommitBlobStorage.java | 25 +
.../egit/core/internal/util/ProjectUtil.java | 43 ++
.../egit/core/internal/util/ResourceUtil.java | 74 +++
.../eclipse/egit/core/op/CherryPickOperation.java | 93 +---
.../core/op/ConfigureGerritAfterCloneTask.java | 209 ++++++++
.../eclipse/egit/core/op/CreatePatchOperation.java | 40 +-
.../egit/core/op/DiscardChangesOperation.java | 163 +++---
.../org/eclipse/egit/core/op/ResetOperation.java | 5 +-
.../egit/core/op/SubmoduleAddOperation.java | 3 +-
.../egit/core/project/RepositoryMapping.java | 50 ++
.../GitResourceVariantTreeSubscriber.java | 2 +
org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.doc/build-help.xml | 4 +-
.../Contributor_Guide/Contributing-Patches.html | 15 +-
.../help/EGit/Contributor_Guide/Documentation.html | 34 ++
.../help/EGit/New_and_Noteworthy/3.5/3.5.html | 178 -------
.../3.5/images/EGit-3.5-repository-submenu.png | Bin 16547 -> 0 bytes
.../3.5/images/EGit-3.5-stash-toolbar.png | Bin 6896 -> 0 bytes
.../3.5/images/EGit-3.5-stash-viewer.png | Bin 27174 -> 0 bytes
.../3.5/images/EGit-3.5-working-set-team-menu.png | Bin 27960 -> 0 bytes
.../3.5/images/Egit-3.5-annotations-in-ruler.png | Bin 23178 -> 0 bytes
.../3.5/images/Egit-3.5-history-delete-tag.png | Bin 28549 -> 0 bytes
.../images/Egit-3.5-history-find-tag-branch.png | Bin 42819 -> 0 bytes
.../Egit-3.5-interactive-rebase-plan-menu.png | Bin 14946 -> 0 bytes
.../3.5/images/Egit-3.5-interactive-rebase.png | Bin 23412 -> 0 bytes
.../3.5/images/Egit-3.5-multi-cherry-pick.png | Bin 26692 -> 0 bytes
.../3.5/images/Egit-3.5-rebase-options.png | Bin 19252 -> 0 bytes
.../New_and_Noteworthy/3.7/3.7.html} | 50 +-
.../New_and_Noteworthy/{3.5 => 3.7}/Bug-Fixes.html | 16 +-
.../{3.5 => 3.7}/Contributors.html | 28 +-
.../{3.5 => 3.7}/Updating-This-Document.html | 8 +-
.../help/EGit/User_Guide/Tasks.html | 17 +-
.../help/EGit/User_Guide/User-Guide.html | 4 +-
.../User_Guide/images/EGit_Amend_Commit_Button.png | Bin 0 -> 29123 bytes
.../{3.5/3.5.html => 3.7/3.7.html} | 38 +-
.../New_and_Noteworthy/{3.5 => 3.7}/Bug-Fixes.html | 16 +-
.../{3.5 => 3.7}/Contributors.html | 44 +-
.../{3.5 => 3.7}/Updating-This-Document.html | 8 +-
.../help/JGit/User_Guide/User-Guide.html | 5 +-
.../help/images/topiclabel/egit.png | Bin 0 -> 1629 bytes
.../help/images/topiclabel/git48.png | Bin 2081 -> 0 bytes
org.eclipse.egit.doc/help/toc.xml | 56 +-
org.eclipse.egit.doc/images/topiclabel/egit.png | Bin 0 -> 1629 bytes
org.eclipse.egit.doc/images/topiclabel/git48.png | Bin 2081 -> 0 bytes
org.eclipse.egit.doc/intro/css/overview.css | 4 +-
org.eclipse.egit.doc/intro/css/overview.properties | 6 +-
org.eclipse.egit.doc/intro/css/tutorials.css | 4 +-
.../intro/css/tutorials.properties | 6 +-
org.eclipse.egit.doc/intro/css/whatsnew.css | 4 +-
org.eclipse.egit.doc/intro/css/whatsnew.properties | 6 +-
.../intro/overviewExtensionContent.xml | 6 +-
.../intro/tutorialsExtensionContent.xml | 8 +-
.../intro/whatsnewExtensionContent.xml | 6 +-
org.eclipse.egit.doc/pom.xml | 6 +-
org.eclipse.egit.mylyn-feature/feature.properties | 2 +-
org.eclipse.egit.mylyn-feature/feature.xml | 4 +-
org.eclipse.egit.mylyn-feature/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.mylyn.ui.test/pom.xml | 84 +--
org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 24 +-
org.eclipse.egit.mylyn.ui/build.properties | 5 +-
org.eclipse.egit.mylyn.ui/pom.xml | 2 +-
org.eclipse.egit.repository/pom.xml | 6 +-
org.eclipse.egit.source-feature/feature.xml | 2 +-
org.eclipse.egit.source-feature/pom.xml | 2 +-
org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.target/egit-4.2.target | 94 ++--
org.eclipse.egit.target/egit-4.2.tpd | 7 +
org.eclipse.egit.target/egit-4.3.target | 87 ++--
org.eclipse.egit.target/egit-4.3.tpd | 7 +
org.eclipse.egit.target/egit-4.4-staging.target | 90 ----
org.eclipse.egit.target/egit-4.4.target | 182 +++----
org.eclipse.egit.target/egit-4.4.tpd | 7 +
.../{egit-4.3.target => egit-4.5-staging.target} | 87 ++--
org.eclipse.egit.target/egit-4.5-staging.tpd | 7 +
.../{egit-4.3.target => egit-4.5.target} | 87 ++--
org.eclipse.egit.target/egit-4.5.tpd | 7 +
.../orbit/R20150124073747-Luna-SR2.tpd | 42 ++
.../orbit/S20150202203538-Mars-M5.tpd | 42 ++
org.eclipse.egit.target/pom.xml | 4 +-
org.eclipse.egit.target/projects/jetty-7.6.14.tpd | 20 +
org.eclipse.egit.target/projects/mylyn-latest.tpd | 12 +
org.eclipse.egit.target/projects/swtbot-2.1.0.tpd | 7 +
org.eclipse.egit.target/releasetrain/4.2-juno.tpd | 14 +
.../releasetrain/4.3-kepler.tpd | 14 +
org.eclipse.egit.target/releasetrain/4.4-luna.tpd | 14 +
org.eclipse.egit.target/releasetrain/4.5-mars.tpd | 14 +
org.eclipse.egit.target/releasetrain/staging.tpd | 14 +
org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 24 +-
org.eclipse.egit.ui.test/pom.xml | 76 +--
.../egit/ui/common/LocalRepositoryTestCase.java | 3 +-
.../eclipse/egit/ui/common/StagingViewTester.java | 7 +
.../eclipse/egit/ui/internal/CommonUtilsTest.java | 10 +
.../ui/internal/push/PushBranchWizardTest.java | 2 +-
.../src/org/eclipse/egit/ui/test/TestUtil.java | 37 ++
.../egit/ui/test/history/HistoryViewTest.java | 1 +
.../egit/ui/test/stagview/StagingViewTest.java | 3 +
.../ui/test/team/actions/CompareActionsTest.java | 3 +-
.../test/team/actions/CreatePatchActionTest.java | 4 +-
.../view/repositories/GitRepositoriesViewTest.java | 5 +-
.../repositories/GitRepositoriesViewTestBase.java | 5 +-
.../ui/wizards/clone/SampleTestRepository.java | 2 +-
org.eclipse.egit.ui/.options | 2 +
org.eclipse.egit.ui/META-INF/MANIFEST.MF | 170 +++---
org.eclipse.egit.ui/build.properties | 8 +-
org.eclipse.egit.ui/icons/obj16/commit.gif | Bin 932 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/commit.png | Bin 0 -> 322 bytes
org.eclipse.egit.ui/icons/obj16/fetch.gif | Bin 230 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/fetch.png | Bin 0 -> 617 bytes
org.eclipse.egit.ui/icons/obj16/gerrit_fetch.gif | Bin 962 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/gerrit_fetch.png | Bin 0 -> 702 bytes
org.eclipse.egit.ui/icons/obj16/gerrit_push.gif | Bin 961 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/gerrit_push.png | Bin 0 -> 650 bytes
org.eclipse.egit.ui/icons/obj16/pull.gif | Bin 936 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/pull.png | Bin 0 -> 628 bytes
org.eclipse.egit.ui/icons/obj16/push.gif | Bin 222 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/push.png | Bin 0 -> 580 bytes
org.eclipse.egit.ui/icons/obj16/remotespec.gif | Bin 950 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/synchronize.png | Bin 0 -> 678 bytes
org.eclipse.egit.ui/icons/ovr/symlink_ovr.gif | Bin 0 -> 191 bytes
org.eclipse.egit.ui/icons/wizban/commit_wizban.png | Bin 0 -> 2659 bytes
.../icons/wizban/fetch_gerrit_wizban.png | Bin 0 -> 2494 bytes
org.eclipse.egit.ui/icons/wizban/fetch_wizban.png | Bin 0 -> 2545 bytes
org.eclipse.egit.ui/icons/wizban/pull_wizban.png | Bin 0 -> 2716 bytes
.../icons/wizban/push_gerrit_wizban.png | Bin 0 -> 2463 bytes
org.eclipse.egit.ui/icons/wizban/push_wizban.png | Bin 0 -> 2493 bytes
.../icons/wizban/synchronize_wizban.png | Bin 0 -> 2584 bytes
org.eclipse.egit.ui/plugin.properties | 7 +-
org.eclipse.egit.ui/plugin.xml | 291 +++++++----
org.eclipse.egit.ui/pom.xml | 2 +-
.../src/org/eclipse/egit/ui/Activator.java | 48 +-
.../src/org/eclipse/egit/ui/JobFamilies.java | 5 +
.../egit/ui/PluginPreferenceInitializer.java | 2 +
.../src/org/eclipse/egit/ui/UIPreferences.java | 2 +
.../org/eclipse/egit/ui/internal/CommonUtils.java | 25 +
.../org/eclipse/egit/ui/internal/CompareUtils.java | 196 +++++--
.../eclipse/egit/ui/internal/GitLabelProvider.java | 153 +-----
.../org/eclipse/egit/ui/internal/GitLabels.java | 253 +++++++++
.../egit/ui/internal/ResourcePropertyTester.java | 2 +-
.../src/org/eclipse/egit/ui/internal/UIIcons.java | 49 +-
.../src/org/eclipse/egit/ui/internal/UIText.java | 97 ++++
.../actions/CompareIndexWithHeadActionHandler.java | 127 ++++-
.../actions/CompareWithPreviousActionHandler.java | 71 ++-
.../eclipse/egit/ui/internal/actions/PushMenu.java | 2 +-
.../actions/ReplaceWithOursTheirsMenu.java | 203 ++++++++
.../egit/ui/internal/branch/BranchOperationUI.java | 87 +++-
.../ui/internal/clone/AbstractGitCloneWizard.java | 9 +
.../ui/internal/clone/CloneDestinationPage.java | 12 +-
.../internal/commit/CommitEditorInputFactory.java | 4 +-
.../eclipse/egit/ui/internal/commit/CommitUI.java | 4 +-
.../internal/commit/command/CherryPickHandler.java | 107 +++-
.../ui/internal/commit/command/EditHandler.java | 23 +-
.../components/RefContentAssistProvider.java | 2 +-
.../egit/ui/internal/components/RefSpecPage.java | 4 +-
.../components/RepositorySelectionPage.java | 2 +-
.../decorators/DecoratableResourceAdapter.java | 18 +-
.../decorators/DecoratableResourceHelper.java | 27 +-
.../decorators/GitLightweightDecorator.java | 81 +--
.../dialogs/BranchConfigurationDialog.java | 7 +-
.../ui/internal/dialogs/CommitLabelProvider.java | 4 +-
.../internal/dialogs/CommitMessageComponent.java | 2 +-
.../egit/ui/internal/dialogs/NewRemoteDialog.java | 8 +-
.../ui/internal/fetch/FetchGerritChangeWizard.java | 2 +
.../egit/ui/internal/fetch/FetchResultTable.java | 12 +-
.../egit/ui/internal/fetch/FetchSourcePage.java | 2 +-
.../egit/ui/internal/fetch/FetchWizard.java | 7 +-
.../internal/fetch/SimpleConfigureFetchDialog.java | 32 +-
.../ui/internal/gerrit/ConfigureGerritWizard.java | 62 +--
.../internal/gerrit/GerritConfigurationPage.java | 1 +
.../egit/ui/internal/gerrit/GerritUtil.java | 41 --
.../egit/ui/internal/history/CommitGraphTable.java | 131 +----
.../history/CommitGraphTableHoverManager.java | 174 +++++++
.../egit/ui/internal/history/GitHistoryPage.java | 9 +
.../egit/ui/internal/history/SWTPlotRenderer.java | 17 +-
.../history/command/CherryPickHandler.java | 15 +-
.../command/DeleteBranchOnCommitHandler.java | 50 +-
.../history/command/DeleteTagOnCommitHandler.java | 2 +-
.../ui/internal/history/command/EditHandler.java | 20 +-
.../egit/ui/internal/pull/PullOperationUI.java | 5 +-
.../egit/ui/internal/push/ConfirmationPage.java | 4 +-
.../egit/ui/internal/push/PushBranchPage.java | 14 +-
.../egit/ui/internal/push/PushBranchWizard.java | 3 +
.../egit/ui/internal/push/PushResultDialog.java | 9 +-
.../egit/ui/internal/push/PushTagsWizard.java | 2 +
.../egit/ui/internal/push/PushToGerritPage.java | 2 +-
.../egit/ui/internal/push/PushToGerritWizard.java | 2 +
.../eclipse/egit/ui/internal/push/PushWizard.java | 7 +-
.../ui/internal/push/RefUpdateContentProvider.java | 13 +-
.../internal/push/SimpleConfigurePushDialog.java | 25 +-
.../internal/rebase/CommitMessageEditorDialog.java | 6 +
.../rebase/RebaseInteractivePreferences.java | 19 +
.../ui/internal/rebase/RebaseInteractiveView.java | 105 +++-
.../ui/internal/rebase/RebaseResultDialog.java | 4 +
.../ui/internal/repository/CreateBranchPage.java | 14 +-
.../ui/internal/repository/CreateBranchWizard.java | 10 +-
.../repository/RepositoriesViewActionProvider.java | 45 +-
.../repository/RepositoriesViewLabelProvider.java | 197 ++++---
.../repository/RepositorySearchDialog.java | 24 +-
.../repository/RepositoryStatisticsPage.java | 100 ++--
.../repository/tree/command/AddToIndexCommand.java | 7 +-
.../tree/command/ImportChangedProjectsCommand.java | 218 ++++++++
.../repository/tree/command/PasteCommand.java | 4 +-
.../repository/tree/command/ResetCommand.java | 2 +-
.../revision/LocationEditableRevision.java | 19 +-
.../revision/ResourceEditableRevision.java | 14 +-
.../egit/ui/internal/selection/SelectionUtils.java | 23 +-
.../egit/ui/internal/sharing/SharingWizard.java | 2 +-
.../egit/ui/internal/staging/StagingEntry.java | 23 +-
.../egit/ui/internal/staging/StagingView.java | 485 +++++++++++++-----
.../staging/StagingViewContentProvider.java | 53 +-
.../internal/staging/StagingViewLabelProvider.java | 38 +-
.../internal/synchronize/GitSynchronizeWizard.java | 2 +
.../egit/ui/internal/trace/GitTraceLocation.java | 18 +-
.../org/eclipse/egit/ui/internal/uitext.properties | 42 +-
org.eclipse.egit/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit/pom.xml | 2 +-
pom.xml | 37 +-
tools/egit-developer-tools.p2f | 100 ++--
253 files changed, 6605 insertions(+), 2507 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-egit.git
More information about the pkg-java-commits
mailing list