[eclipse-egit] 01/04: Merge tag 'upstream/3.4.0'
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Sat Jun 21 13:17:25 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-egit.
commit 71329432fd5e8976ac88c30c2654cbe3c268bebc
Merge: c74f8f7 8b7af9e
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sat Jun 21 14:54:22 2014 +0200
Merge tag 'upstream/3.4.0'
Upstream version 3.4.0
org.eclipse.egit-feature/feature.properties | 3 +-
org.eclipse.egit-feature/feature.xml | 4 +-
org.eclipse.egit-feature/license.html | 56 +++---
org.eclipse.egit-feature/pom.xml | 2 +-
org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 22 +--
org.eclipse.egit.core.test/build.properties | 1 +
org.eclipse.egit.core.test/pom.xml | 11 +-
.../synchronize/dto/GitSynchronizeDataTest.java | 64 ++-----
.../org/eclipse/egit/core/test/TestRepository.java | 2 +-
.../src/org/eclipse/egit/core/test/TestUtils.java | 2 +-
.../egit/core/test/op/EditCommitOperationTest.java | 86 ++++++++++
.../egit/core/test/op/IgnoreOperationTest.java | 23 ++-
.../egit/core/test/op/PushOperationTest.java | 4 +-
.../core/test/op/RewordCommitsOperationTest.java | 64 +++++++
.../core/test/op/StashCreateOperationTest.java | 15 ++
.../test/rebase/RebaseInteractivePlanTest.java | 5 +-
org.eclipse.egit.core/META-INF/MANIFEST.MF | 66 ++++----
org.eclipse.egit.core/plugin.properties | 1 +
org.eclipse.egit.core/plugin.xml | 10 ++
org.eclipse.egit.core/pom.xml | 2 +-
.../src/org/eclipse/egit/core/Activator.java | 7 +-
.../src/org/eclipse/egit/core/CommitUtil.java | 73 ++++++++
.../src/org/eclipse/egit/core/RepositoryUtil.java | 32 +---
.../org/eclipse/egit/core/internal/CoreText.java | 6 +
.../eclipse/egit/core/internal/coretext.properties | 20 ++-
.../internal/rebase/RebaseInteractivePlan.java | 7 +-
.../core/internal/storage/CommitFileRevision.java | 9 +-
.../core/internal/storage/IndexFileRevision.java | 11 +-
.../storage/OpenWorkspaceVersionEnabled.java | 31 ++++
.../egit/core/internal/util/ProjectUtil.java | 26 ++-
.../egit/core/op/ConnectProviderOperation.java | 5 +-
.../egit/core/op/DeleteBranchOperation.java | 2 +-
.../eclipse/egit/core/op/EditCommitOperation.java | 113 +++++++++++++
.../org/eclipse/egit/core/op/IgnoreOperation.java | 15 +-
.../org/eclipse/egit/core/op/MergeOperation.java | 30 ++--
.../egit/core/op/RewordCommitOperation.java | 118 +++++++++++++
.../eclipse/egit/core/op/StashCreateOperation.java | 23 ++-
.../egit/core/project/RepositoryFinder.java | 48 ++++--
.../core/synchronize/dto/GitSynchronizeData.java | 90 +++++-----
org.eclipse.egit.doc/META-INF/MANIFEST.MF | 7 +-
org.eclipse.egit.doc/build-help.xml | 23 ++-
.../Git-For-Eclipse-Users.html | 18 +-
.../help/EGit/New_and_Noteworthy/3.3/3.3.html | 74 --------
.../3.3/Build-and-Release-Engineering.html | 62 -------
.../New_and_Noteworthy/3.3/GitHub-Connector.html | 61 -------
.../help/EGit/New_and_Noteworthy/3.4/3.4.html | 93 ++++++++++
.../New_and_Noteworthy/{3.3 => 3.4}/Bug-Fixes.html | 16 +-
.../{3.3 => 3.4}/Contributors.html | 25 ++-
.../{3.3 => 3.4}/Updating-This-Document.html | 8 +-
.../help/EGit/User_Guide/Concepts.html | 70 ++++----
.../help/EGit/User_Guide/Tasks.html | 86 ++++++----
.../help/EGit/User_Guide/User-Guide.html | 88 +++++-----
...png => Egit-3.1-ConfigureFetchFromUpstream.png} | Bin
...am.png => Egit-3.1-ConfigurePushToUpstream.png} | Bin
...hDialog.png => Egit-3.1-CreateBranchDialog.png} | Bin
...eTagDialog.png => Egit-3.1-CreateTagDialog.png} | Bin
...epository.png => Egit-3.1-DeleteRepository.png} | Bin
...ng => Egit-3.1-FetchChangeFromGerritDialog.png} | Bin
...ltDialog.png => Egit-3.1-FetchResultDialog.png} | Bin
...rdResult.png => Egit-3.1-FetchWizardResult.png} | Bin
...mand.png => Egit-3.1-GerritDownloadCommand.png} | Bin
.../{egit-3.1-GitMenu.png => Egit-3.1-GitMenu.png} | Bin
...-3.1-GitToolbar.png => Egit-3.1-GitToolbar.png} | Bin
...ryViewMain.png => Egit-3.1-HistoryViewMain.png} | Bin
...kDiff.png => Egit-3.1-HistoryViewQuickDiff.png} | Bin
...ttings.png => Egit-3.1-HistoryViewSettings.png} | Bin
....png => Egit-3.1-HistoryViewSettingsFilter.png} | Bin
....1-MergeDialog.png => Egit-3.1-MergeDialog.png} | Bin
...ltDialog.png => Egit-3.1-MergeResultDialog.png} | Bin
...Menu-Main.png => Egit-3.1-ProjectMenu-Main.png} | Bin
...-Remote.png => Egit-3.1-ProjectMenu-Remote.png} | Bin
...bMenu.png => Egit-3.1-ProjectMenuAdvanced2.png} | Bin
...g.png => Egit-3.1-PushChangeToGerritDialog.png} | Bin
...log.png => Egit-3.1-PushConfirmationDialog.png} | Bin
...tWizard.png => Egit-3.1-RebaseResultWizard.png} | Bin
...tingTag.png => Egit-3.1-ReplaceExistingTag.png} | Bin
...oViewBranch.png => Egit-3.1-RepoViewBranch.png} | Bin
...Config.png => Egit-3.1-RepoViewFetchConfig.png} | Bin
...hConfig.png => Egit-3.1-RepoViewPushConfig.png} | Bin
...eference.png => Egit-3.1-RepoViewReference.png} | Bin
...oViewRemote.png => Egit-3.1-RepoViewRemote.png} | Bin
....1-RepoViewTag.png => Egit-3.1-RepoViewTag.png} | Bin
...kingDir.png => Egit-3.1-RepoViewWorkingDir.png} | Bin
...tDeco.png => Egit-3.1-RepositoryGerritDeco.png} | Bin
...-RepoViewRepo.png => Egit-3.1-ResourceMenu.png} | Bin
....1-StagingView.png => Egit-3.1-StagingView.png} | Bin
...licts.png => Egit-3.1-StagingViewConflicts.png} | Bin
...g => Egit-3.1-StagingViewConflictsResolved.png} | Bin
...les.png => Egit-3.1-StagingViewFilterFiles.png} | Bin
...ed.png => Egit-3.1-StagingViewMarkResolved.png} | Bin
...l.png => Egit-3.1-StagingViewOpenMergeTool.png} | Bin
...s.png => Egit-3.1-StagingViewRebaseButtons.png} | Bin
...ttings.png => Egit-3.1-StagingViewSettings.png} | Bin
...del.png => Egit-3.1-SynchronizeSwitchModel.png} | Bin
...nHistory.png => Egit-3.1-ViewDiffInHistory.png} | Bin
.../images/Egit-3.2-BlameImprovements.png | Bin 0 -> 62444 bytes
.../images/Egit-3.2-InteractiveRebaseAmend.png | Bin 0 -> 24632 bytes
.../images/Egit-3.2-InteractiveRebaseEdit.png | Bin 0 -> 23294 bytes
.../images/Egit-3.2-InteractiveRebaseFinished.png | Bin 0 -> 9734 bytes
.../Egit-3.2-InteractiveRebaseHistoryAfterEdit.png | Bin 0 -> 23157 bytes
...git-3.2-InteractiveRebaseHistoryAfterRebase.png | Bin 0 -> 22781 bytes
.../images/Egit-3.2-InteractiveRebaseReword.png | Bin 0 -> 58324 bytes
.../images/Egit-3.2-InteractiveRebaseSquash.png | Bin 0 -> 61329 bytes
.../Egit-3.2-InteractiveRebaseSquashMessage.png | Bin 0 -> 11490 bytes
.../images/Egit-3.2-InteractiveRebaseView.png | Bin 0 -> 20998 bytes
.../images/Egit-3.2-PlanInteractiveRebase.png | Bin 0 -> 22702 bytes
.../images/Egit-3.2-StartInteractiveRebase.png | Bin 0 -> 49450 bytes
.../images/Egit-3.2-StartedInteractiveRebase.png | Bin 0 -> 44073 bytes
.../User_Guide/images/Egit-3.4-merge-options.png | Bin 0 -> 21258 bytes
.../User_Guide/images/egit-3.1-ResourceMenu.png | Bin 12746 -> 0 bytes
.../images/egit-3.2-BlameImprovements.png | Bin 55951 -> 0 bytes
.../images/egit-3.2-InteractiveRebaseAmend.png | Bin 20857 -> 0 bytes
.../images/egit-3.2-InteractiveRebaseEdit.png | Bin 22583 -> 0 bytes
.../images/egit-3.2-InteractiveRebaseFinished.png | Bin 6468 -> 0 bytes
.../egit-3.2-InteractiveRebaseHistoryAfterEdit.png | Bin 19476 -> 0 bytes
...git-3.2-InteractiveRebaseHistoryAfterRebase.png | Bin 19114 -> 0 bytes
.../images/egit-3.2-InteractiveRebaseReword.png | Bin 56759 -> 0 bytes
.../images/egit-3.2-InteractiveRebaseSquash.png | Bin 59470 -> 0 bytes
.../egit-3.2-InteractiveRebaseSquashMessage.png | Bin 8130 -> 0 bytes
.../images/egit-3.2-InteractiveRebaseView.png | Bin 16827 -> 0 bytes
.../images/egit-3.2-PlanInteractiveRebase.png | Bin 18865 -> 0 bytes
.../images/egit-3.2-StartInteractiveRebase.png | Bin 44387 -> 0 bytes
.../images/egit-3.2-StartedInteractiveRebase.png | Bin 42666 -> 0 bytes
.../{3.3/3.3.html => 3.4/3.4.html} | 55 +++---
.../New_and_Noteworthy/{3.3 => 3.4}/Bug-Fixes.html | 16 +-
.../{3.3 => 3.4}/Contributors.html | 34 +++-
.../{3.3 => 3.4}/Updating-This-Document.html | 8 +-
org.eclipse.egit.doc/help/toc.xml | 37 ++--
org.eclipse.egit.doc/pom.xml | 2 +-
org.eclipse.egit.mylyn-feature/feature.properties | 4 +-
org.eclipse.egit.mylyn-feature/feature.xml | 4 +-
org.eclipse.egit.mylyn-feature/license.html | 56 +++---
org.eclipse.egit.mylyn-feature/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.mylyn.ui.test/build.properties | 1 +
org.eclipse.egit.mylyn.ui.test/pom.xml | 17 +-
org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 24 +--
org.eclipse.egit.mylyn.ui/plugin.xml | 6 +
org.eclipse.egit.mylyn.ui/pom.xml | 2 +-
.../ui/commit/ActiveTaskBranchNameProvider.java | 62 +++++++
org.eclipse.egit.repository/pom.xml | 2 +-
org.eclipse.egit.source-feature/feature.properties | 4 +-
org.eclipse.egit.source-feature/feature.xml | 2 +-
org.eclipse.egit.source-feature/license.html | 56 +++---
org.eclipse.egit.source-feature/pom.xml | 2 +-
org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.target/egit-4.3.target | 11 ++
org.eclipse.egit.target/egit-4.4-staging.target | 21 ++-
org.eclipse.egit.target/egit-4.4.target | 21 ++-
org.eclipse.egit.target/pom.xml | 2 +-
org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 24 +--
org.eclipse.egit.ui.test/build.properties | 1 +
org.eclipse.egit.ui.test/pom.xml | 15 +-
.../egit/ui/common/LocalRepositoryTestCase.java | 12 +-
.../eclipse/egit/ui/internal/CommonUtilsTest.java | 54 ++++++
.../egit/ui/internal/actions/SwitchToMenuTest.java | 187 +++++++++++++++++++++
.../decorators/DecoratableResourceAdapterTest.java | 178 +++++++++++---------
.../ui/internal/push/PushBranchWizardTest.java | 10 +-
.../ui/internal/push/PushBranchWizardTester.java | 7 +
.../egit/ui/internal/push/PushToUpstreamTest.java | 126 ++++++++++++++
.../internal/repository/CreateBranchPageTest.java | 34 ----
.../src/org/eclipse/egit/ui/test/TestUtil.java | 26 ++-
.../egit/ui/test/history/HistoryViewTest.java | 34 +++-
.../egit/ui/test/team/actions/MergeToolTest.java | 8 -
.../GitRepositoriesViewRepoHandlingTest.java | 13 +-
.../egit/ui/wizards/share/SharingWizardTest.java | 5 +-
org.eclipse.egit.ui/META-INF/MANIFEST.MF | 169 ++++++++++---------
org.eclipse.egit.ui/build.properties | 3 +-
org.eclipse.egit.ui/css/e4-dark_egit_prefstyle.css | 28 +++
org.eclipse.egit.ui/plugin.properties | 13 +-
org.eclipse.egit.ui/plugin.xml | 84 +++++++++
org.eclipse.egit.ui/pom.xml | 2 +-
org.eclipse.egit.ui/schema/branchNameProvider.exsd | 118 +++++++++++++
.../org/eclipse/egit/ui/IBranchNameProvider.java | 22 +++
.../src/org/eclipse/egit/ui/JobFamilies.java | 10 ++
.../egit/ui/PluginPreferenceInitializer.java | 7 +-
.../src/org/eclipse/egit/ui/UIPreferences.java | 9 +
.../src/org/eclipse/egit/ui/UIUtils.java | 45 ++++-
.../org/eclipse/egit/ui/internal/CommonUtils.java | 23 +--
.../org/eclipse/egit/ui/internal/CompareUtils.java | 56 ++++--
.../egit/ui/internal/EgitUiEditorUtils.java | 11 +-
.../GitCompareFileRevisionEditorInput.java | 95 +++++++++++
.../egit/ui/internal/RepositorySaveableFilter.java | 21 ++-
.../egit/ui/internal/ResourcePropertyTester.java | 13 +-
.../eclipse/egit/ui/internal/SecureStoreUtils.java | 40 +++++
.../egit/ui/internal/UIRepositoryUtils.java | 67 ++++++++
.../src/org/eclipse/egit/ui/internal/UIText.java | 108 ++++++++++--
.../ui/internal/actions/RebaseActionHandler.java | 2 +-
.../egit/ui/internal/actions/ResetMenu.java | 115 +++++++++++++
.../egit/ui/internal/actions/SwitchToMenu.java | 16 +-
.../egit/ui/internal/blame/BlameOperation.java | 11 ++
.../egit/ui/internal/branch/BranchOperationUI.java | 93 ++++++++++
.../ui/internal/branch/BranchProjectTracker.java | 3 +-
.../ui/internal/clone/AbstractGitCloneWizard.java | 3 +-
.../clone/GitCreateProjectViaWizardWizard.java | 2 +-
.../egit/ui/internal/clone/GitImportWizard.java | 4 +-
.../egit/ui/internal/clone/ProjectUtils.java | 52 ++++--
.../shared/AbstractRebaseCommandHandler.java | 7 +-
.../egit/ui/internal/commit/CommitEditor.java | 2 +
.../egit/ui/internal/commit/CommitEditorInput.java | 4 +-
.../ui/internal/commit/command/EditHandler.java | 60 +++++++
.../{SquashHandler.java => RewordHandler.java} | 81 ++++-----
.../commit/command/ShowInHistoryHandler.java | 46 +++++
.../ui/internal/commit/command/SquashHandler.java | 10 ++
.../components/RefContentAssistProvider.java | 4 +
.../egit/ui/internal/components/RefSpecPage.java | 12 +-
.../components/RepositorySelectionPage.java | 15 +-
.../credentials/EGitCredentialsProvider.java | 16 +-
.../egit/ui/internal/credentials/LoginService.java | 38 +----
.../decorators/DecoratableResourceAdapter.java | 29 +++-
.../egit/ui/internal/decorators/GitDocument.java | 31 +++-
.../internal/decorators/GitQuickDiffProvider.java | 22 +--
.../dialogs/BranchSelectionAndEditDialog.java | 2 +
.../internal/dialogs/CommitMessageComponent.java | 10 +-
.../egit/ui/internal/dialogs/CompareTreeView.java | 126 +++++++++++---
.../dialogs/MergeTargetSelectionDialog.java | 39 +++--
.../ui/internal/fetch/FetchGerritChangePage.java | 62 ++++---
.../ui/internal/history/CommitFileDiffViewer.java | 108 ++++++++----
.../egit/ui/internal/history/CommitGraphTable.java | 57 ++++---
.../ui/internal/history/CommitSelectionDialog.java | 1 +
.../egit/ui/internal/history/GitHistoryPage.java | 4 +-
.../egit/ui/internal/history/SWTCommitList.java | 10 --
.../egit/ui/internal/history/SWTPlotRenderer.java | 38 ++++-
.../command/AbstractHistoryCommandHandler.java | 95 ++++++++---
.../AbstractRebaseHistoryCommandHandler.java | 2 +-
.../history/command/CheckoutCommitHandler.java | 7 +-
.../history/command/CherryPickHandler.java | 5 +-
.../history/command/CompareVersionsHandler.java | 4 +-
.../command/CompareVersionsInTreeHandler.java | 9 +-
.../command/CompareWithWorkingTreeHandler.java | 4 +-
.../command/CreateBranchOnCommitHandler.java | 10 +-
.../history/command/CreatePatchHandler.java | 2 +-
.../history/command/CreateTagOnCommitHandler.java | 11 +-
.../command/DeleteBranchOnCommitHandler.java | 15 +-
.../ui/internal/history/command/EditHandler.java | 110 ++++++++++++
.../history/command/HistoryViewCommands.java | 14 +-
.../ui/internal/history/command/MergeHandler.java | 9 +-
.../history/command/OpenInCommitViewerHandler.java | 2 +-
.../history/command/OpenInTextEditorHandler.java | 4 +-
.../history/command/PushCommitHandler.java | 2 +-
.../command/RebaseInteractiveCurrentHandler.java | 2 +-
.../command/RenameBranchOnCommitHandler.java | 8 +-
.../ui/internal/history/command/ResetHandler.java | 51 +-----
.../ui/internal/history/command/RevertHandler.java | 5 +-
.../ui/internal/history/command/RewordHandler.java | 74 ++++++++
.../command/SetQuickdiffBaselineHandler.java | 6 +-
.../internal/history/command/ShowBlameHandler.java | 4 +-
.../history/command/ShowVersionsHandler.java | 4 +-
.../ui/internal/history/command/SquashHandler.java | 60 +------
.../importing/GitScmUrlImportWizardPage.java | 13 +-
.../egit/ui/internal/operations/GitScopeUtil.java | 22 ++-
.../preferences/DialogsPreferencePage.java | 4 +
.../preferences/SynchronizePreferencePage.java | 3 +
.../ui/internal/pull/MultiPullResultDialog.java | 5 +-
.../egit/ui/internal/pull/PullOperationUI.java | 104 +++++++++++-
.../egit/ui/internal/push/PushBranchPage.java | 10 +-
.../egit/ui/internal/push/PushToGerritPage.java | 28 ++-
.../egit/ui/internal/push/PushToGerritWizard.java | 17 +-
.../internal/push/SimpleConfigurePushDialog.java | 20 ++-
...RebaseInteractiveStepActionToolBarProvider.java | 112 ++++++------
.../ui/internal/rebase/RebaseInteractiveView.java | 62 ++++++-
.../egit/ui/internal/reflog/ReflogView.java | 7 +-
.../ui/internal/reflog/command/ResetHandler.java | 31 ++++
.../ui/internal/repository/CreateBranchPage.java | 60 +++++--
.../internal/repository/CreateRepositoryPage.java | 62 +++----
.../internal/repository/NewRepositoryWizard.java | 75 +++++++--
.../repository/RepositorySearchDialog.java | 2 +-
.../repository/tree/command/AddCommand.java | 1 +
.../command/DeleteRepositoryConfirmDialog.java | 1 +
.../ui/internal/sharing/ExistingOrNewPage.java | 2 +
.../egit/ui/internal/staging/StagingView.java | 33 ++--
.../egit/ui/internal/stash/StashCreateUI.java | 93 +++++++++-
.../GitModelSynchronizeParticipant.java | 9 +-
.../ui/internal/synchronize/action/PushAction.java | 2 +-
.../org/eclipse/egit/ui/internal/uitext.properties | 87 ++++++----
org.eclipse.egit/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit/pom.xml | 2 +-
pom.xml | 7 +-
tools/release.sh | 51 ++++++
279 files changed, 4679 insertions(+), 1775 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