[eclipse-egit] 01/03: Merge tag 'upstream/3.1.0'
Jakub Adam
xhaakon-guest at alioth.debian.org
Fri Oct 11 16:34:23 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-egit.
commit 21063f8d6ef612be5e31d46aac35ec91255f4606
Merge: 9d4ca95 3bf3406
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Tue Oct 8 20:56:48 2013 +0200
Merge tag 'upstream/3.1.0'
Upstream version 3.1.0
org.eclipse.egit-feature/feature.xml | 4 +-
org.eclipse.egit-feature/pom.xml | 2 +-
org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 26 +-
org.eclipse.egit.core.test/pom.xml | 2 +-
.../egit/core/internal/util/ProjectUtilTest.java | 2 +-
.../GitResourceVariantComparatorTest.java | 4 +-
.../synchronize/GitSubscriberMergeContextTest.java | 2 +-
.../ContainerTreeIteratorResourceFilterTest.java | 2 +-
.../core/test/GitProjectSetCapabilityTest.java | 44 +
.../egit/core/test/GitResourceDeltaTestHelper.java | 2 -
.../src/org/eclipse/egit/core/test/GitURITest.java | 93 +-
.../org/eclipse/egit/core/test/HistoryTest.java | 6 +-
.../egit/core/test/LinkedResourcesTest.java | 1 -
.../egit/core/test/RepositoryCacheTest.java | 2 +-
.../core/test/op/RemoveFromIndexOperationTest.java | 2 +-
org.eclipse.egit.core/META-INF/MANIFEST.MF | 64 +-
org.eclipse.egit.core/pom.xml | 2 +-
.../org/eclipse/egit/core/internal/CoreText.java | 65 +-
.../core/internal/GitRepositoryProviderType.java | 12 +-
.../core/internal/ProjectReferenceImporter.java | 16 +-
.../eclipse/egit/core/internal/coretext.properties | 30 +-
.../core/internal/storage/CommitFileRevision.java | 10 +-
.../core/internal/storage/GitFileRevision.java | 4 +-
.../core/internal/storage/IndexFileRevision.java | 10 +-
.../internal/storage/WorkingTreeFileRevision.java | 2 +-
.../internal/storage/WorkspaceFileRevision.java | 2 +-
.../egit/core/internal/util/ResourceUtil.java | 38 +-
.../org/eclipse/egit/core/op/CommitOperation.java | 25 +-
.../org/eclipse/egit/core/op/MergeOperation.java | 16 +-
.../eclipse/egit/core/project/GitProjectData.java | 18 +-
.../core/synchronize/GitResourceVariantTree.java | 5 +-
.../GitResourceVariantTreeSubscriber.java | 27 +-
.../core/synchronize/dto/GitSynchronizeData.java | 76 +-
.../synchronize/dto/GitSynchronizeDataSet.java | 38 +-
org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.doc/build-help.xml | 4 +-
.../help/EGit/New_and_Noteworthy/3.0/3.0.html | 89 --
.../EGit/New_and_Noteworthy/3.0/Bug-Fixes.html | 75 --
.../3.0/images/EGit-3.0-file-diff-rename.png | Bin 6603 -> 0 bytes
.../3.0/images/EGit-3.0-reset-to-expression.png | Bin 13374 -> 0 bytes
.../help/EGit/New_and_Noteworthy/3.1/3.1.html | 109 ++
.../{3.0/API-changes.html => 3.1/Bug-Fixes.html} | 28 +-
.../3.1/Build-and-Release-Engineering.html} | 45 +-
.../New_and_Noteworthy/3.1}/Contributors.html | 28 +-
.../{3.0 => 3.1}/GitHub-Connector-Features.html | 24 +-
.../{3.0 => 3.1}/Performance-Improvements.html | 25 +-
.../{3.0 => 3.1}/Updating-This-Document.html | 8 +-
.../images/Checkout-remotetracking-egit-3.1.png | Bin 0 -> 16408 bytes
.../3.1/images/Delete-repository-egit-3.1.png | Bin 0 -> 21411 bytes
.../3.1/images/Gerrit-repoview-egit-3.1.png | Bin 0 -> 14354 bytes
.../3.1/images/Hyperlink-staging-egit-3.1.png | Bin 0 -> 10029 bytes
.../3.1/images/Merge-options-egit-3.1.png | Bin 0 -> 29206 bytes
.../3.1/images/Staging-filter-egit-3.1.png | Bin 0 -> 15057 bytes
.../Staging-presentation-options-egit-3.1.png | Bin 0 -> 11713 bytes
.../3.1/images/Staging-rebase-egit-3.1.png | Bin 0 -> 28013 bytes
.../help/EGit/User_Guide/Reference.html | 66 +-
.../help/EGit/User_Guide/Tasks.html | 297 +++--
.../images/egit-3.1-ConfigureFetchFromUpstream.png | Bin 0 -> 24533 bytes
.../images/egit-3.1-ConfigurePushToUpstream.png | Bin 0 -> 21863 bytes
.../images/egit-3.1-CreateBranchDialog.png | Bin 0 -> 14707 bytes
.../User_Guide/images/egit-3.1-CreateTagDialog.png | Bin 0 -> 14762 bytes
.../images/egit-3.1-DeleteRepository.png | Bin 0 -> 13545 bytes
.../egit-3.1-FetchChangeFromGerritDialog.png | Bin 0 -> 21876 bytes
.../images/egit-3.1-FetchResultDialog.png | Bin 0 -> 51449 bytes
.../images/egit-3.1-FetchWizardResult.png | Bin 0 -> 36933 bytes
.../images/egit-3.1-GerritDownloadCommand.png | Bin 0 -> 11134 bytes
.../EGit/User_Guide/images/egit-3.1-GitMenu.png | Bin 0 -> 8704 bytes
.../EGit/User_Guide/images/egit-3.1-GitToolbar.png | Bin 0 -> 4951 bytes
.../User_Guide/images/egit-3.1-HistoryViewMain.png | Bin 0 -> 21672 bytes
.../images/egit-3.1-HistoryViewQuickDiff.png | Bin 0 -> 5167 bytes
.../images/egit-3.1-HistoryViewSettings.png | Bin 0 -> 15410 bytes
.../images/egit-3.1-HistoryViewSettingsFilter.png | Bin 0 -> 5382 bytes
.../User_Guide/images/egit-3.1-MergeDialog.png | Bin 0 -> 23476 bytes
.../images/egit-3.1-MergeResultDialog.png | Bin 0 -> 11382 bytes
.../images/egit-3.1-ProjectAdvancedSubMenu.png | Bin 0 -> 14811 bytes
.../images/egit-3.1-ProjectMenu-Main.png | Bin 0 -> 14261 bytes
.../images/egit-3.1-ProjectMenu-Remote.png | Bin 0 -> 4703 bytes
.../images/egit-3.1-PushChangeToGerritDialog.png | Bin 0 -> 12060 bytes
.../images/egit-3.1-PushConfirmationDialog.png | Bin 0 -> 41046 bytes
.../images/egit-3.1-RebaseResultWizard.png | Bin 0 -> 23056 bytes
.../images/egit-3.1-ReplaceExistingTag.png | Bin 0 -> 15351 bytes
.../User_Guide/images/egit-3.1-RepoViewBranch.png | Bin 0 -> 13600 bytes
.../images/egit-3.1-RepoViewFetchConfig.png | Bin 0 -> 13689 bytes
.../images/egit-3.1-RepoViewPushConfig.png | Bin 0 -> 14060 bytes
.../images/egit-3.1-RepoViewReference.png | Bin 0 -> 3989 bytes
.../User_Guide/images/egit-3.1-RepoViewRemote.png | Bin 0 -> 9946 bytes
.../User_Guide/images/egit-3.1-RepoViewRepo.png | Bin 0 -> 21007 bytes
.../User_Guide/images/egit-3.1-RepoViewTag.png | Bin 0 -> 11570 bytes
.../images/egit-3.1-RepoViewWorkingDir.png | Bin 0 -> 10383 bytes
.../images/egit-3.1-RepositoryGerritDeco.png | Bin 0 -> 4714 bytes
.../User_Guide/images/egit-3.1-ResourceMenu.png | Bin 0 -> 12746 bytes
.../User_Guide/images/egit-3.1-StagingView.png | Bin 0 -> 25501 bytes
.../images/egit-3.1-StagingViewConflicts.png | Bin 0 -> 18677 bytes
.../egit-3.1-StagingViewConflictsResolved.png | Bin 0 -> 20997 bytes
.../images/egit-3.1-StagingViewFilterFiles.png | Bin 0 -> 22594 bytes
.../images/egit-3.1-StagingViewMarkResolved.png | Bin 0 -> 13925 bytes
.../images/egit-3.1-StagingViewOpenMergeTool.png | Bin 0 -> 25033 bytes
.../images/egit-3.1-StagingViewRebaseButtons.png | Bin 0 -> 3665 bytes
.../images/egit-3.1-StagingViewSettings.png | Bin 0 -> 6712 bytes
.../images/egit-3.1-SynchronizeSwitchModel.png | Bin 0 -> 12886 bytes
.../images/egit-3.1-ViewDiffInHistory.png | Bin 0 -> 91938 bytes
.../3.0/API-Changes-and-Migration-Hints.html | 94 --
.../help/JGit/New_and_Noteworthy/3.0/Commands.html | 80 --
.../help/JGit/New_and_Noteworthy/3.0/Library.html | 100 --
.../3.0/Performance-Improvements.html | 74 --
.../{3.0/3.0.html => 3.1/3.1.html} | 35 +-
.../New_and_Noteworthy/{3.0 => 3.1}/Bug-Fixes.html | 21 +-
.../3.1/Build-and-Release-Engineering.html} | 30 +-
.../New_and_Noteworthy/3.1}/Contributors.html | 31 +-
.../3.1}/Performance-Improvements.html | 31 +-
.../{3.0 => 3.1}/Updating-This-Document.html | 8 +-
.../help/JGit/User_Guide/Snippets.html | 6 +-
org.eclipse.egit.doc/help/toc.xml | 60 +-
org.eclipse.egit.doc/pom.xml | 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 | 8 +-
org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 24 +-
org.eclipse.egit.mylyn.ui/pom.xml | 2 +-
org.eclipse.egit.repository/pom.xml | 2 +-
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/pom.xml | 2 +-
org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 24 +-
org.eclipse.egit.ui.test/pom.xml | 6 +-
.../egit/ui/common/LocalRepositoryTestCase.java | 5 +-
.../ui/test/team/actions/CompareActionsTest.java | 140 ++-
.../egit/ui/test/team/actions/MergeToolTest.java | 2 +-
.../egit/ui/test/team/actions/PushActionTest.java | 4 +-
.../GitRepositoriesViewFetchAndPushTest.java | 4 +-
.../synchronize/AbstractSynchronizeViewTest.java | 3 +-
.../view/synchronize/SynchronizeViewPushTest.java | 4 +-
.../clone/GitCloneSourceProviderExtensionTest.java | 8 +-
.../ui/wizards/clone/SampleTestRepository.java | 15 +-
org.eclipse.egit.ui/META-INF/MANIFEST.MF | 164 +--
org.eclipse.egit.ui/icons/elcl16/compactLayout.gif | Bin 0 -> 355 bytes
org.eclipse.egit.ui/icons/elcl16/flatLayout.gif | Bin 0 -> 97 bytes
.../icons/obj16/repository_gerrit.gif | Bin 0 -> 351 bytes
org.eclipse.egit.ui/plugin.properties | 11 +-
org.eclipse.egit.ui/plugin.xml | 468 +++++---
org.eclipse.egit.ui/pom.xml | 2 +-
.../egit/ui/PluginPreferenceInitializer.java | 5 +-
.../src/org/eclipse/egit/ui/UIPreferences.java | 10 +-
.../src/org/eclipse/egit/ui/UIUtils.java | 118 ++
.../org/eclipse/egit/ui/internal/CompareUtils.java | 450 ++++---
.../eclipse/egit/ui/internal/EditableRevision.java | 20 +-
.../egit/ui/internal/FilteredCheckboxTree.java | 8 +-
.../egit/ui/internal/ResourcePropertyTester.java | 36 +-
.../org/eclipse/egit/ui/internal/SaveFilter.java | 1 +
.../src/org/eclipse/egit/ui/internal/UIIcons.java | 12 +
.../src/org/eclipse/egit/ui/internal/UIText.java | 302 ++---
.../actions/CompareIndexWithHeadActionHandler.java | 39 +-
.../actions/CompareWithCommitActionHandler.java | 37 +-
.../actions/CompareWithHeadActionHandler.java | 65 +-
.../actions/CompareWithIndexActionHandler.java | 83 +-
.../actions/CompareWithPreviousActionHandler.java | 201 ++--
.../actions/CompareWithRefActionHandler.java | 53 +-
.../egit/ui/internal/actions/DisconnectAction.java | 21 -
.../ui/internal/actions/MergeActionHandler.java | 1 +
.../internal/actions/RepositoryActionHandler.java | 16 +-
.../ui/internal/actions/SynchronizeWithMenu.java | 7 +-
.../actions/SynchronizeWorkspaceActionHandler.java | 22 +-
.../egit/ui/internal/branch/BranchOperationUI.java | 107 +-
.../ui/internal/branch/BranchResultDialog.java | 5 +-
.../egit/ui/internal/commit/RepositoryCommit.java | 1 +
.../components/ToggleableWarningLabel.java | 2 +-
.../decorators/GitLightweightDecorator.java | 31 +-
.../egit/ui/internal/dialogs/CheckoutDialog.java | 14 +-
.../egit/ui/internal/dialogs/CommitDialog.java | 56 +-
.../internal/dialogs/CommitMessageComponent.java | 34 +-
.../ICommitMessageComponentNotifications.java | 8 +-
.../dialogs/MergeTargetSelectionDialog.java | 30 +-
.../dialogs/SpellcheckableMessageArea.java | 83 +-
.../ui/internal/gerrit/ConfigureGerritWizard.java | 12 +-
.../internal/gerrit/GerritConfigurationPage.java | 2 +-
.../egit/ui/internal/gerrit/GerritUtil.java | 41 +
.../ui/internal/history/CommitFileDiffViewer.java | 101 +-
.../ui/internal/history/CommitMessageViewer.java | 54 +-
.../ui/internal/history/GitCreatePatchWizard.java | 19 +-
.../egit/ui/internal/history/GitHistoryPage.java | 47 +-
.../egit/ui/internal/history/LocationPage.java | 11 +-
.../command/AbstractHistoryCommandHandler.java | 11 +-
.../history/command/CompareVersionsHandler.java | 66 +-
.../command/CompareVersionsInTreeHandler.java | 10 +-
.../command/CompareWithWorkingTreeHandler.java | 24 +-
.../history/command/ShowVersionsHandler.java | 26 +-
.../egit/ui/internal/merge/MergeResultDialog.java | 38 +-
.../ui/internal/pull/MultiPullResultDialog.java | 9 +-
.../egit/ui/internal/push/PushResultDialog.java | 4 +-
.../egit/ui/internal/push/PushResultTable.java | 9 +-
.../egit/ui/internal/push/PushToGerritPage.java | 3 +-
.../egit/ui/internal/push/RefUpdateElement.java | 1 +
.../ui/internal/rebase/RebaseResultDialog.java | 30 +-
.../egit/ui/internal/reflog/ReflogView.java | 8 +-
.../repository/RepositoriesViewLabelProvider.java | 15 +-
.../repository/RepositoryPropertyPage.java | 10 +-
.../repository/tree/command/AddToIndexCommand.java | 4 +-
.../repository/tree/command/CheckoutCommand.java | 27 +-
.../tree/command/CreateBranchCommand.java | 4 +-
.../repository/tree/command/CreateTagCommand.java | 4 +-
.../repository/tree/command/DeleteFileCommand.java | 4 +-
.../tree/command/FetchConfiguredRemoteCommand.java | 30 +-
.../repository/tree/command/MergeCommand.java | 4 +-
.../repository/tree/command/PushCommand.java | 5 +-
.../tree/command/PushConfiguredRemoteCommand.java | 30 +-
.../command/RepositoriesViewCommandHandler.java | 182 ++-
.../repository/tree/command/SubmoduleCommand.java | 2 +-
.../egit/ui/internal/staging/StagingEntry.java | 34 +-
.../ui/internal/staging/StagingFolderEntry.java | 125 ++
.../egit/ui/internal/staging/StagingView.java | 1247 +++++++++++++++-----
.../staging/StagingViewContentProvider.java | 256 +++-
.../internal/staging/StagingViewLabelProvider.java | 107 +-
.../internal/synchronize/GitModelSynchronize.java | 139 ++-
.../GitModelSynchronizeParticipant.java | 33 +-
.../internal/synchronize/GitSynchronizeWizard.java | 13 +-
.../synchronize/mapping/GitContainerMapping.java | 52 +-
.../synchronize/model/GitModelRepository.java | 7 +-
.../internal/synchronize/model/GitModelRoot.java | 3 +-
.../internal/synchronize/model/GitModelTree.java | 5 -
.../org/eclipse/egit/ui/internal/uitext.properties | 114 +-
org.eclipse.egit/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit/pom.xml | 2 +-
pom.xml | 4 +-
tools/egit-developer-tools.p2f | 2 +-
226 files changed, 4565 insertions(+), 3243 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