[eclipse-egit] 01/05: Merge tag 'upstream/3.5.2'
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Thu Nov 13 21:09:11 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 77c9644cc71ac61115aeb9ff347f91de339a2174
Merge: 8c8af93 d0b46fa
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Nov 13 21:42:21 2014 +0100
Merge tag 'upstream/3.5.2'
Upstream version 3.5.2
CONTRIBUTING.md | 44 ++
SUBMITTING_PATCHES | 104 ---
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 +-
.../src/org/eclipse/egit/core/test/GitURITest.java | 1 +
.../egit/core/test/op/CloneOperationTest.java | 1 +
.../core/test/op/CreatePatchOperationTest.java | 10 +-
org.eclipse.egit.core/META-INF/MANIFEST.MF | 66 +-
org.eclipse.egit.core/pom.xml | 2 +-
.../eclipse/egit/core/ContainerTreeIterator.java | 12 +-
.../src/org/eclipse/egit/core/IteratorService.java | 34 +-
.../src/org/eclipse/egit/core/RepositoryUtil.java | 7 +-
.../org/eclipse/egit/core/internal/CoreText.java | 6 +-
.../src/org/eclipse/egit/core/internal/Utils.java | 13 +
.../eclipse/egit/core/internal/coretext.properties | 6 +-
.../internal/indexdiff/IndexDiffCacheEntry.java | 38 +-
.../internal/indexdiff/IndexDiffUpdateJob.java | 96 +++
.../core/internal/storage/CommitFileRevision.java | 2 +-
.../eclipse/egit/core/op/CherryPickOperation.java | 93 ++-
.../eclipse/egit/core/op/CreatePatchOperation.java | 11 +-
.../org/eclipse/egit/core/op/MergeOperation.java | 17 +
.../org/eclipse/egit/core/op/RebaseOperation.java | 14 +-
.../egit/core/op/RevertCommitOperation.java | 16 +-
.../eclipse/egit/core/project/GitProjectData.java | 29 +-
.../GitResourceVariantTreeSubscriber.java | 1 +
org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit.doc/build-help.xml | 5 +-
.../help/EGit/Contributor_Guide/Bugs.html | 271 +++++++
.../help/EGit/Contributor_Guide/Builds.html | 219 ++++++
.../Contributor_Guide/Contributing-Patches.html | 414 ++++++++++
.../EGit/Contributor_Guide/Contributor-Guide.html | 89 +++
.../Development-IDE-Configuration.html | 152 ++++
.../help/EGit/Contributor_Guide/Documentation.html | 80 ++
.../Gerrit-Code-Review-Cheatsheet.html | 182 +++++
.../EGit/Contributor_Guide/Obtaining-Sources.html | 120 +++
.../help/EGit/Contributor_Guide/Tests.html | 112 +++
.../Contributor_Guide}/Updating-This-Document.html | 22 +-
.../help/EGit/Contributor_Guide/Website.html | 100 +++
.../images/EGit-Target-Platforms.png | Bin 0 -> 11786 bytes
.../Contributor_Guide/images/Start-swtbot-test.png | Bin 0 -> 26374 bytes
.../Git-For-Eclipse-Users.html | 8 +-
.../help/EGit/New_and_Noteworthy/3.4/3.4.html | 93 ---
.../help/EGit/New_and_Noteworthy/3.5/3.5.html | 178 +++++
.../New_and_Noteworthy/3.5}/Bug-Fixes.html | 16 +-
.../{3.4 => 3.5}/Contributors.html | 29 +-
.../{3.4 => 3.5}/Updating-This-Document.html | 8 +-
.../3.5/images/EGit-3.5-repository-submenu.png | Bin 0 -> 16547 bytes
.../3.5/images/EGit-3.5-stash-toolbar.png | Bin 0 -> 6896 bytes
.../3.5/images/EGit-3.5-stash-viewer.png | Bin 0 -> 27174 bytes
.../3.5/images/EGit-3.5-working-set-team-menu.png | Bin 0 -> 27960 bytes
.../3.5/images/Egit-3.5-annotations-in-ruler.png | Bin 0 -> 23178 bytes
.../3.5/images/Egit-3.5-history-delete-tag.png | Bin 0 -> 28549 bytes
.../images/Egit-3.5-history-find-tag-branch.png | Bin 0 -> 42819 bytes
.../Egit-3.5-interactive-rebase-plan-menu.png | Bin 0 -> 14946 bytes
.../3.5/images/Egit-3.5-interactive-rebase.png | Bin 0 -> 23412 bytes
.../3.5/images/Egit-3.5-multi-cherry-pick.png | Bin 0 -> 26692 bytes
.../3.5/images/Egit-3.5-rebase-options.png | Bin 0 -> 19252 bytes
.../help/EGit/User_Guide/Tasks.html | 74 +-
.../help/EGit/User_Guide/User-Guide.html | 21 +-
.../images/EGit-0.10-RebaseConflictDialog.png | Bin 12565 -> 0 bytes
.../images/EGit-0.7-ViewDiffInResourceHistory.png | Bin 16989 -> 0 bytes
.../images/Egit-0.10-ConfirmProjectRemoval.png | Bin 16805 -> 0 bytes
.../images/Egit-0.10-ConfirmRepositoryDeletion.png | Bin 12887 -> 0 bytes
.../images/Egit-0.10-repoview-refmenu.png | Bin 6006 -> 0 bytes
.../images/Egit-0.11-BranchCreationDialog.png | Bin 12206 -> 0 bytes
.../Egit-0.11-ConfigureFetchFromUpstream.png | Bin 14507 -> 0 bytes
.../images/Egit-0.11-ConfigurePushToUpstream.png | Bin 15204 -> 0 bytes
.../images/Egit-0.11-FetchResultDialog.png | Bin 11048 -> 0 bytes
.../Egit-0.11-fetchChangeFromGerritDialog.png | Bin 22688 -> 0 bytes
.../User_Guide/images/Egit-0.11-workbench-menu.png | Bin 11859 -> 0 bytes
.../images/Egit-0.11-workbench-toolbar.png | Bin 4516 -> 0 bytes
.../EGit/User_Guide/images/Egit-0.8-tag-create.png | Bin 4130 -> 0 bytes
.../User_Guide/images/Egit-0.8-tag-replace.png | Bin 4610 -> 0 bytes
.../images/Egit-0.9-commit-dialog-amend.png | Bin 8511 -> 0 bytes
.../images/Egit-0.9-fetch-wizard-result.png | Bin 17014 -> 0 bytes
.../images/Egit-0.9-push-wizard-push-result.png | Bin 16831 -> 0 bytes
.../User_Guide/images/Egit-1.0-blame-ruler.png | Bin 24789 -> 0 bytes
.../images/Egit-1.2-project-menu-advanced.png | Bin 29910 -> 0 bytes
.../images/Egit-1.2-project-menu-main.png | Bin 13888 -> 0 bytes
.../images/Egit-1.2-project-menu-remote.png | Bin 5871 -> 0 bytes
.../images/Egit-1.2-repoview-branch-menu.png | Bin 8843 -> 0 bytes
.../images/Egit-1.2-repoview-fetchconfig-menu.png | Bin 9493 -> 0 bytes
.../images/Egit-1.2-repoview-pushconfig-menu.png | Bin 8351 -> 0 bytes
.../images/Egit-1.2-repoview-repository-menu.png | Bin 27145 -> 0 bytes
.../images/Egit-1.2-repoview-tag-menu.png | Bin 7147 -> 0 bytes
.../images/Egit-1.2-repoview-workingtree-menu.png | Bin 6744 -> 0 bytes
.../User_Guide/images/Egit-1.2-resource-menu.png | Bin 11796 -> 0 bytes
.../User_Guide/images/Egit-1.2-staging-view.png | Bin 18541 -> 0 bytes
.../images/Egit-2.1-history-view-menu.png | Bin 50048 -> 0 bytes
.../images/Egit-2.1-pushChangeToGerritDialog.png | Bin 24373 -> 0 bytes
.../images/Egit-3.1-CreateBranchDialog.png | Bin 14707 -> 0 bytes
.../images/Egit-3.5-ConfigureBranchDialog.png | Bin 0 -> 8946 bytes
.../images/Egit-3.5-CreateBranchDialog.png | Bin 0 -> 12464 bytes
.../help/EGit/User_Guide/images/Filters.png | Bin 40666 -> 0 bytes
.../EGit/User_Guide/images/Git_merge_conflict.png | Bin 0 -> 78853 bytes
.../help/EGit/User_Guide/images/MergeDialog.png | Bin 22435 -> 0 bytes
.../EGit/User_Guide/images/MergeResultMerged.png | Bin 11980 -> 0 bytes
.../help/EGit/User_Guide/images/TagCreation.png | Bin 20395 -> 0 bytes
.../{3.4/3.4.html => 3.5/3.5.html} | 54 +-
.../New_and_Noteworthy/3.5}/Bug-Fixes.html | 16 +-
.../{3.4 => 3.5}/Contributors.html | 51 +-
.../{3.4 => 3.5}/Updating-This-Document.html | 8 +-
.../help/JGit/User_Guide/User-Guide.html | 2 +-
org.eclipse.egit.doc/help/toc.xml | 146 +++-
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 +-
.../eclipse/egit/ui/common/RepoPropertiesPage.java | 2 +-
.../eclipse/egit/ui/common/StagingViewTester.java | 64 +-
.../egit/ui/internal/actions/StashesMenuTest.java | 91 +++
.../egit/ui/internal/actions/SwitchToMenuTest.java | 28 +-
.../ui/internal/push/PushBranchWizardTest.java | 31 +-
.../ui/internal/push/PushBranchWizardTester.java | 25 +-
.../ui/internal/selection/SelectionUtilsTest.java | 44 ++
.../src/org/eclipse/egit/ui/test/TestUtil.java | 59 +-
.../test/commit/CommitEditorInputFactoryTest.java | 50 +-
.../ui/test/commit/RepositoryCommitMatcher.java | 62 ++
.../egit/ui/test/history/HistoryViewTest.java | 11 +-
.../egit/ui/test/stagview/StagingViewTest.java | 66 +-
.../ui/test/team/actions/CompareActionsTest.java | 12 +-
.../view/repositories/GitRepositoriesViewTest.java | 4 +-
.../synchronize/AbstractSynchronizeViewTest.java | 18 +-
.../egit/ui/wizards/clone/GitCloneWizardTest.java | 18 +-
org.eclipse.egit.ui/META-INF/MANIFEST.MF | 169 ++--
org.eclipse.egit.ui/icons/obj16/done_step.gif | Bin 978 -> 76 bytes
org.eclipse.egit.ui/icons/obj16/fixup-down.png | Bin 0 -> 382 bytes
org.eclipse.egit.ui/icons/obj16/fixup-up.png | Bin 0 -> 358 bytes
org.eclipse.egit.ui/icons/obj16/fixup.gif | Bin 299 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/squash-down.png | Bin 0 -> 513 bytes
org.eclipse.egit.ui/icons/obj16/squash-up.png | Bin 0 -> 528 bytes
org.eclipse.egit.ui/icons/obj16/squash.gif | Bin 321 -> 0 bytes
org.eclipse.egit.ui/icons/obj16/stash-apply.png | Bin 0 -> 4294 bytes
org.eclipse.egit.ui/icons/obj16/stash-create.png | Bin 873 -> 4361 bytes
org.eclipse.egit.ui/icons/obj16/todo_step.gif | Bin 121 -> 0 bytes
org.eclipse.egit.ui/plugin.properties | 47 +-
org.eclipse.egit.ui/plugin.xml | 868 +++++++++++----------
org.eclipse.egit.ui/pom.xml | 2 +-
.../src/org/eclipse/egit/ui/Activator.java | 34 +-
.../src/org/eclipse/egit/ui/UIPreferences.java | 2 +
.../src/org/eclipse/egit/ui/UIUtils.java | 27 +-
.../org/eclipse/egit/ui/internal/CommonUtils.java | 29 +-
.../org/eclipse/egit/ui/internal/CompareUtils.java | 132 +++-
.../egit/ui/internal/ConfigurationChecker.java | 16 +-
.../egit/ui/internal/EgitUiEditorUtils.java | 1 +
.../src/org/eclipse/egit/ui/internal/UIIcons.java | 24 +-
.../src/org/eclipse/egit/ui/internal/UIText.java | 187 +++--
.../egit/ui/internal/actions/ActionCommands.java | 10 +-
.../ui/internal/actions/CreatePatchAction.java | 22 -
.../actions/DiscardChangesActionHandler.java | 2 +-
.../internal/actions/DisconnectActionHandler.java | 23 +-
.../ui/internal/actions/MergeActionHandler.java | 40 +-
.../internal/actions/PushBranchActionHandler.java | 24 +-
.../eclipse/egit/ui/internal/actions/PushMenu.java | 97 +++
.../actions/PushUpstreamOrBranchActionHandler.java | 2 +-
.../egit/ui/internal/actions/RepositoryAction.java | 15 +-
.../internal/actions/RepositoryActionHandler.java | 256 +-----
.../internal/actions/ShowBlameActionHandler.java | 79 +-
.../ui/internal/actions/ShowHistoryAction.java | 22 -
.../actions/ShowRepositoriesViewAction.java | 21 -
.../ui/internal/actions/StashCreateHandler.java | 64 ++
.../ui/internal/actions/StashToolbarAction.java | 58 ++
.../egit/ui/internal/actions/StashesMenu.java | 151 ++++
.../egit/ui/internal/actions/SwitchToMenu.java | 45 +-
.../ui/internal/actions/SynchronizeWithMenu.java | 3 +-
.../egit/ui/internal/actions/TagActionHandler.java | 2 +-
.../ui/internal/blame/BlameInformationControl.java | 54 +-
.../egit/ui/internal/branch/BranchOperationUI.java | 75 +-
.../ui/internal/clone/AbstractGitCloneWizard.java | 2 +-
.../ui/internal/clone/GitProjectsImportPage.java | 4 +-
.../egit/ui/internal/clone/SourceBranchPage.java | 4 +-
.../shared/AbstractRebaseCommandHandler.java | 35 +-
.../shared/AbstractSharedCommandHandler.java | 89 +--
.../commands/shared/RebaseCurrentRefCommand.java | 43 +-
.../egit/ui/internal/commit/CommitEditor.java | 81 +-
.../internal/commit/CommitEditorInputFactory.java | 17 +-
.../egit/ui/internal/commit/CommitEditorPage.java | 127 +--
.../eclipse/egit/ui/internal/commit/CommitJob.java | 29 +-
.../egit/ui/internal/commit/DiffEditorPage.java | 40 +-
.../egit/ui/internal/commit/DiffViewer.java | 12 +-
.../egit/ui/internal/commit/HeaderText.java | 9 +-
.../egit/ui/internal/commit/RepositoryCommit.java | 68 +-
.../egit/ui/internal/commit/StashEditorPage.java | 200 +++++
.../internal/commit/command/CherryPickHandler.java | 168 ++--
.../ui/internal/commit/command/RevertHandler.java | 88 ++-
.../internal/commit/command/StashApplyHandler.java | 78 ++
.../internal/commit/command/StashDropHandler.java | 121 +++
.../{ => components}/CachedCheckboxTreeViewer.java | 2 +-
.../{ => components}/FilteredCheckboxTree.java | 2 +-
.../components/RepositorySelectionPage.java | 21 +-
.../ui/internal/components/SimplePushSpecPage.java | 198 -----
.../internal/dialogs/BasicConfigurationDialog.java | 15 +-
.../ui/internal/dialogs/BranchRenameDialog.java | 19 +-
.../ui/internal/dialogs/BranchSelectionDialog.java | 4 +-
.../internal/dialogs/CheckoutConflictDialog.java | 3 +-
.../egit/ui/internal/dialogs/CommitDialog.java | 68 +-
.../ui/internal/dialogs/CommitSelectDialog.java | 1 -
.../egit/ui/internal/dialogs/CompareTreeView.java | 37 +-
.../egit/ui/internal/dialogs/CreateTagDialog.java | 2 +-
.../dialogs/RebaseTargetSelectionDialog.java | 44 ++
.../dialogs/SpellcheckableMessageArea.java | 18 +-
.../ui/internal/fetch/FetchGerritChangePage.java | 3 +-
.../egit/ui/internal/fetch/FetchResultTable.java | 1 -
.../internal/gerrit/GerritConfigurationPage.java | 4 +-
.../ui/internal/history/CommitFileDiffViewer.java | 6 +-
.../egit/ui/internal/history/CommitGraphTable.java | 25 +-
.../ui/internal/history/CommitInfoBuilder.java | 172 +---
.../ui/internal/history/CommitMessageViewer.java | 176 ++---
.../eclipse/egit/ui/internal/history/FileDiff.java | 50 +-
.../egit/ui/internal/history/FindToolbar.java | 21 +
.../ui/internal/history/FindToolbarThread.java | 21 +
.../egit/ui/internal/history/FormatJob.java | 57 +-
.../ui/internal/history/GenerateHistoryJob.java | 2 +-
.../ui/internal/history/GitCreatePatchWizard.java | 16 +-
.../egit/ui/internal/history/GitHistoryPage.java | 169 +++-
.../egit/ui/internal/history/RenameTracker.java | 110 +++
.../command/AbstractHistoryCommandHandler.java | 11 +
.../history/command/CherryPickHandler.java | 15 +-
.../history/command/CompareVersionsHandler.java | 37 +-
.../command/CompareVersionsInTreeHandler.java | 27 +-
.../command/CompareWithWorkingTreeHandler.java | 57 +-
.../history/command/CreatePatchHandler.java | 2 +-
.../history/command/DeleteTagOnCommitHandler.java | 151 ++++
.../history/command/HistoryViewCommands.java | 3 +
.../ui/internal/history/command/MergeHandler.java | 29 +-
.../history/command/OpenInTextEditorHandler.java | 28 +-
.../history/command/PushCommitHandler.java | 22 +-
.../ui/internal/history/command/RevertHandler.java | 37 +-
.../history/command/ShowVersionsHandler.java | 165 ++--
.../ui/internal/merge/GitCompareEditorInput.java | 14 +-
.../ui/internal/merge/GitMergeEditorInput.java | 29 +-
.../egit/ui/internal/merge/MergeResultDialog.java | 3 -
.../egit/ui/internal/operations/GitScopeUtil.java | 4 +-
.../egit/ui/internal/push/PushBranchPage.java | 294 +++++--
.../egit/ui/internal/push/PushBranchWizard.java | 65 +-
.../egit/ui/internal/push/PushResultTable.java | 1 -
.../egit/ui/internal/push/PushTagsPage.java | 4 +-
.../egit/ui/internal/push/RefUpdateElement.java | 10 +-
.../egit/ui/internal/push/SimplePushRefWizard.java | 169 ----
.../ui/internal/rebase/PlanContextMenuAction.java | 50 ++
.../RebaseInteractiveDropTargetListener.java | 41 +-
.../RebaseInteractivePlanContentProvider.java | 5 +
.../rebase/RebaseInteractivePreferences.java | 45 ++
...RebaseInteractiveStepActionToolBarProvider.java | 66 +-
.../ui/internal/rebase/RebaseInteractiveView.java | 167 +++-
.../egit/ui/internal/rebase/RebasePlanIndexer.java | 144 ++++
.../egit/ui/internal/reflog/ReflogView.java | 10 +-
.../ui/internal/repository/CreateBranchPage.java | 22 +-
.../ui/internal/repository/RepositoriesView.java | 40 +-
.../RepositoriesViewContentProvider.java | 4 +-
.../repository/RepositoriesViewLabelProvider.java | 4 +-
.../repository/RepositorySearchDialog.java | 4 +-
.../repository/tree/RepositoriesViewSorter.java | 6 +
.../repository/tree/RepositoryTreeNodeType.java | 6 +-
.../tree/command/ConfigureFetchCommand.java | 5 +-
.../tree/command/ConfigurePushCommand.java | 4 +-
.../repository/tree/command/DeleteTagCommand.java | 2 +-
.../tree/command/GarbageCollectCommand.java | 4 +-
.../repository/tree/command/MergeCommand.java | 26 +-
.../repository/tree/command/OpenCommand.java | 10 +-
.../repository/tree/command/PushCommand.java | 7 +-
.../repository/tree/command/RemoveCommand.java | 4 +-
.../command/RepositoriesViewCommandHandler.java | 6 +
.../tree/command/StashCreateCommand.java | 49 --
.../repository/tree/command/StashDropCommand.java | 2 +-
.../internal/{ => revision}/EditableRevision.java | 3 +-
.../{ => revision}/FileRevisionEditorInput.java | 6 +-
.../{ => revision}/FileRevisionTypedElement.java | 2 +-
.../GitCompareFileRevisionEditorInput.java | 10 +-
.../internal/{ => revision}/LocalFileRevision.java | 3 +-
.../{ => revision}/LocationEditableRevision.java | 2 +-
.../{ => revision}/NotifiableDiffNode.java | 2 +-
.../{ => revision}/ResourceEditableRevision.java | 9 +-
.../{ => revision}/StorageTypedElement.java | 2 +-
.../selection/SelectionPropertyTester.java | 170 ++++
.../egit/ui/internal/selection/SelectionUtils.java | 294 +++++++
.../egit/ui/internal/staging/StagingEntry.java | 27 +-
.../egit/ui/internal/staging/StagingView.java | 125 ++-
.../staging/StagingViewContentProvider.java | 40 +-
.../internal/synchronize/GitActionContributor.java | 4 +-
.../internal/synchronize/GitModelSynchronize.java | 2 +-
.../GitModelSynchronizeParticipant.java | 5 +-
.../synchronize/action/GitOpenInCompareAction.java | 2 +-
.../synchronize/compare/GitCompareInput.java | 2 +-
.../compare/LocalNonWorkspaceTypedElement.java | 1 +
.../org/eclipse/egit/ui/internal/uitext.properties | 141 ++--
org.eclipse.egit/META-INF/MANIFEST.MF | 2 +-
org.eclipse.egit/egit.png | Bin 1366 -> 1629 bytes
org.eclipse.egit/egit.svg | 222 +++---
org.eclipse.egit/pom.xml | 2 +-
pom.xml | 4 +-
303 files changed, 8319 insertions(+), 3552 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