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 c513685d6cf8505a8078049a99b9660481ec9d41 Merge: 6c5e71f 2f0a686 Author: Jakub Adam <[email protected]> Date: Tue Jun 11 22:17:30 2013 +0200 Merge tag 'upstream/3.0.0' Upstream version 3.0.0 org.eclipse.egit-feature/feature.properties | 2 +- 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 +- .../eclipse/egit/core/GitMoveDeleteHookTest.java | 10 +- .../indexdiff}/IndexDiffCacheTest.java | 2 +- .../core/internal/storage/BlobStorageTest.java | 9 +- .../internal/storage/IndexFileRevisionTest.java | 4 +- .../egit/core/internal/util/ResourceUtilTest.java | 23 +- .../egit/core/project/RepositoryMappingTest.java | 17 +- .../egit/core/synchronize/AbstractCacheTest.java | 4 +- .../GitResourceVariantTreeSubscriberTest.java | 242 ++++----- .../core/synchronize/ThreeWayDiffEntryTest.java | 4 +- .../core/test/AdaptableFileTreeIteratorTest.java | 4 +- .../ContainerTreeIteratorResourceFilterTest.java | 7 +- .../core/test/GitProjectSetCapabilityTest.java | 6 +- .../org/eclipse/egit/core/test/HistoryTest.java | 462 ++++++++++++++++++ .../org/eclipse/egit/core/test/TestRepository.java | 4 +- .../core/test/internal/mapping/HistoryTest.java | 4 +- .../egit/core/test/op/CloneOperationTest.java | 8 +- .../core/test/op/ConnectProviderOperationTest.java | 6 +- .../core/test/op/StashCreateOperationTest.java | 13 +- org.eclipse.egit.core/.settings/.api_filters | 22 - org.eclipse.egit.core/META-INF/MANIFEST.MF | 63 +-- org.eclipse.egit.core/pom.xml | 2 +- .../src/org/eclipse/egit/core/Activator.java | 6 + .../eclipse/egit/core/ContainerTreeIterator.java | 59 ++- .../org/eclipse/egit/core/GitMoveDeleteHook.java | 1 + .../eclipse/egit/core/GitProjectSetCapability.java | 1 + .../org/eclipse/egit/core/ProjectReference.java | 1 + .../src/org/eclipse/egit/core/RepositoryCache.java | 4 +- .../src/org/eclipse/egit/core/RepositoryUtil.java | 43 +- .../egit/core/internal/CompareCoreUtils.java | 13 +- .../eclipse/egit/core/{ => internal}/CoreText.java | 14 +- .../src/org/eclipse/egit/core/internal/GitURI.java | 1 - .../core/internal/ProjectReferenceImporter.java | 9 +- .../egit/core/{ => internal}/coretext.properties | 5 +- .../internal/indexdiff/IndexDiffCacheEntry.java | 54 +- .../egit/core/internal/storage/BlobStorage.java | 2 +- .../core/internal/storage/CommitFileRevision.java | 2 +- .../egit/core/internal/storage/GitFileHistory.java | 122 ++++- .../core/internal/storage/IndexFileRevision.java | 4 +- .../egit/core/internal/util/ProjectUtil.java | 2 +- .../egit/core/internal/util/ResourceUtil.java | 36 +- .../eclipse/egit/core/op/AddToIndexOperation.java | 2 +- .../egit/core/op/AssumeUnchangedOperation.java | 2 +- .../org/eclipse/egit/core/op/BranchOperation.java | 2 +- .../eclipse/egit/core/op/CherryPickOperation.java | 2 +- .../org/eclipse/egit/core/op/CloneOperation.java | 2 +- .../org/eclipse/egit/core/op/CommitOperation.java | 2 +- .../egit/core/op/ConfigureFetchAfterCloneTask.java | 2 +- .../egit/core/op/ConnectProviderOperation.java | 2 +- .../egit/core/op/CreateLocalBranchOperation.java | 2 +- .../eclipse/egit/core/op/CreatePatchOperation.java | 2 +- .../egit/core/op/DeleteBranchOperation.java | 2 +- .../eclipse/egit/core/op/DeletePathsOperation.java | 2 +- .../eclipse/egit/core/op/DeleteTagOperation.java | 2 +- .../egit/core/op/DiscardChangesOperation.java | 2 +- .../egit/core/op/DisconnectProviderOperation.java | 2 +- .../org/eclipse/egit/core/op/FetchOperation.java | 2 +- .../egit/core/op/GarbageCollectOperation.java | 4 +- .../org/eclipse/egit/core/op/IgnoreOperation.java | 2 +- .../eclipse/egit/core/op/ListRemoteOperation.java | 2 +- .../org/eclipse/egit/core/op/MergeOperation.java | 31 +- .../org/eclipse/egit/core/op/PullOperation.java | 2 +- .../org/eclipse/egit/core/op/PushOperation.java | 35 +- .../org/eclipse/egit/core/op/RebaseOperation.java | 2 +- .../egit/core/op/RemoveFromIndexOperation.java | 2 +- .../egit/core/op/RenameBranchOperation.java | 2 +- .../org/eclipse/egit/core/op/ResetOperation.java | 2 +- .../egit/core/op/RevertCommitOperation.java | 2 +- .../eclipse/egit/core/op/StashCreateOperation.java | 4 +- .../egit/core/op/SubmoduleAddOperation.java | 8 +- .../src/org/eclipse/egit/core/op/TagOperation.java | 2 +- .../org/eclipse/egit/core/op/UntrackOperation.java | 2 +- .../eclipse/egit/core/project/GitProjectData.java | 9 +- .../egit/core/project/RepositoryFinder.java | 13 +- .../egit/core/project/RepositoryMapping.java | 8 +- .../synchronize/GitBaseResourceVariantTree.java | 5 +- .../core/synchronize/GitLocalResourceVariant.java | 60 +++ .../egit/core/synchronize/GitRemoteFolder.java | 2 +- .../egit/core/synchronize/GitRemoteResource.java | 19 +- .../synchronize/GitRemoteResourceVariantTree.java | 5 +- .../core/synchronize/GitResourceVariantTree.java | 8 +- .../GitResourceVariantTreeSubscriber.java | 284 ++++++++++- .../synchronize/GitSourceResourceVariantTree.java | 72 +++ .../synchronize/GitSubscriberMergeContext.java | 2 +- .../egit/core/synchronize/GitSyncObjectCache.java | 2 +- org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.doc/build-help.xml | 6 +- org.eclipse.egit.doc/cheatsheets/clone.xml | 102 ++-- .../help/EGit/New_and_Noteworthy/2.3/2.3.html | 66 --- .../help/EGit/New_and_Noteworthy/3.0/3.0.html | 89 ++++ .../New_and_Noteworthy/3.0/API-changes.html} | 28 +- .../New_and_Noteworthy/{2.3 => 3.0}/Bug-Fixes.html | 30 +- .../{2.3 => 3.0}/Contributors.html | 29 +- .../GitHub-Connector-Features.html} | 27 +- .../{2.3 => 3.0}/Performance-Improvements.html | 25 +- .../{2.3 => 3.0}/Updating-This-Document.html | 8 +- .../3.0/images/EGit-3.0-file-diff-rename.png | Bin 0 -> 6603 bytes .../3.0/images/EGit-3.0-reset-to-expression.png | Bin 0 -> 13374 bytes .../help/EGit/User_Guide/Reference.html | 22 +- .../help/EGit/User_Guide/Tasks.html | 81 +-- .../help/EGit/User_Guide/User-Guide.html | 2 +- .../2.3/Performance-Improvements.html | 62 --- .../{2.3/2.3.html => 3.0/3.0.html} | 23 +- .../3.0/API-Changes-and-Migration-Hints.html | 94 ++++ .../New_and_Noteworthy/3.0}/Bug-Fixes.html | 21 +- .../New_and_Noteworthy/3.0/Command-Line.html} | 35 +- .../help/JGit/New_and_Noteworthy/3.0/Commands.html | 80 +++ .../{2.3 => 3.0}/Contributors.html | 28 +- .../help/JGit/New_and_Noteworthy/3.0/Library.html | 100 ++++ .../3.0/Performance-Improvements.html | 74 +++ .../{2.3 => 3.0}/Updating-This-Document.html | 8 +- org.eclipse.egit.doc/help/toc.xml | 42 +- org.eclipse.egit.doc/pom.xml | 2 +- org.eclipse.egit.import-feature/.project | 17 - .../.settings/org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.core.runtime.prefs | 3 - .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 - .../.settings/org.eclipse.mylyn.team.ui.prefs | 3 - org.eclipse.egit.import-feature/build.properties | 4 - org.eclipse.egit.import-feature/epl-v10.html | 261 ---------- org.eclipse.egit.import-feature/feature.properties | 160 ------ org.eclipse.egit.import-feature/feature.xml | 37 -- org.eclipse.egit.import-feature/license.html | 108 ---- org.eclipse.egit.import-feature/pom.xml | 28 -- org.eclipse.egit.import/.classpath | 7 - org.eclipse.egit.import/.project | 28 -- .../.settings/org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.core.runtime.prefs | 3 - .../.settings/org.eclipse.jdt.core.prefs | 393 --------------- .../.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 - .../.settings/org.eclipse.pde.prefs | 33 -- org.eclipse.egit.import/META-INF/MANIFEST.MF | 20 - org.eclipse.egit.import/about.html | 28 -- org.eclipse.egit.import/build.properties | 7 - org.eclipse.egit.import/plugin.properties | 13 - org.eclipse.egit.import/plugin.xml | 22 - org.eclipse.egit.import/pom.xml | 35 -- .../eclipse/egit/internal/importing/Activator.java | 60 --- .../eclipse/egit/internal/importing/Messages.java | 43 -- .../egit/internal/importing/messages.properties | 15 - org.eclipse.egit.mylyn-feature/feature.properties | 6 +- 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 +- .../ui/commit/MylynCommitMessageProvider.java | 120 ++--- org.eclipse.egit.repository/category.xml | 8 +- 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/pom.xml | 2 +- org.eclipse.egit.target/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.target/egit-3.7.target | 91 ---- org.eclipse.egit.target/egit-4.3-staging.target | 23 +- org.eclipse.egit.target/egit-4.3.target | 23 +- org.eclipse.egit.target/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 22 +- org.eclipse.egit.ui.test/pom.xml | 6 +- .../eclipse/egit/ui/common/CommitDialogTester.java | 2 +- .../eclipse/egit/ui/common/ExistingOrNewPage.java | 2 +- .../egit/ui/common/GitImportRepoWizard.java | 2 +- .../egit/ui/common/LocalRepositoryTestCase.java | 13 +- .../eclipse/egit/ui/common/LoginDialogTester.java | 52 +- .../egit/ui/common/PushResultDialogTester.java | 52 +- .../eclipse/egit/ui/common/PushWizardTester.java | 108 ++-- .../eclipse/egit/ui/common/RefSpecPageTester.java | 42 +- .../eclipse/egit/ui/common/StagingViewTester.java | 2 +- .../src/org/eclipse/egit/ui/httpauth/PushTest.java | 234 ++++----- .../ui/internal/actions/LinkedResourcesTest.java | 138 ++++++ .../decorators/DecoratableResourceAdapterTest.java | 78 +-- .../synchronize/model/GitModelCacheTest.java | 4 +- .../configuration/GlobalConfigurationPageTest.java | 2 +- .../egit/ui/submodule/SubmoduleAddTest.java | 6 +- .../egit/ui/submodule/SubmoduleSyncTest.java | 9 +- .../egit/ui/submodule/SubmoduleUpdateTest.java | 9 +- .../src/org/eclipse/egit/ui/test/Eclipse.java | 7 +- .../egit/ui/test/commit/CommitEditorTest.java | 2 +- .../egit/ui/test/history/HistoryViewTest.java | 6 +- .../egit/ui/test/nonswt/AllNonSWTTests.java | 2 + .../team/actions/BranchAndResetActionTest.java | 2 +- .../test/team/actions/CommitNonWSChangesTest.java | 2 +- .../ui/test/team/actions/CompareActionsTest.java | 2 +- .../test/team/actions/CreatePatchActionTest.java | 8 +- .../test/team/actions/DisconnectConnectTest.java | 2 +- .../test/team/actions/FetchAndMergeActionTest.java | 2 +- .../egit/ui/test/team/actions/LocationPage.java | 2 +- .../egit/ui/test/team/actions/MergeToolTest.java | 12 +- .../egit/ui/test/team/actions/OptionsPage.java | 2 +- .../egit/ui/test/team/actions/PushActionTest.java | 2 +- .../ui/test/team/actions/ReplaceActionsTest.java | 2 +- .../egit/ui/test/team/actions/TagActionTest.java | 2 +- .../test/trace/TraceConfigurationDialogTest.java | 2 +- .../egit/ui/variables/DynamicVariablesTest.java | 11 +- .../GitRepositoriesViewBranchHandlingTest.java | 6 +- .../GitRepositoriesViewFetchAndPushTest.java | 11 +- .../GitRepositoriesViewRemoteHandlingTest.java | 2 +- .../GitRepositoriesViewRepoDeletionTest.java | 8 +- .../GitRepositoriesViewRepoHandlingTest.java | 6 +- .../GitRepositoriesViewTagHandlingTest.java | 2 +- .../view/repositories/GitRepositoriesViewTest.java | 35 +- .../repositories/GitRepositoriesViewTestBase.java | 2 +- .../synchronize/AbstractSynchronizeViewTest.java | 20 +- .../SynchronizeViewGitChangeSetModelTest.java | 10 +- .../view/synchronize/SynchronizeViewPushTest.java | 16 +- .../egit/ui/wizards/clone/GitCloneWizardTest.java | 7 +- .../ui/wizards/clone/GitCloneWizardTestBase.java | 6 +- .../ui/wizards/clone/SampleTestRepository.java | 379 +++++++-------- .../egit/ui/wizards/share/SharingWizardTest.java | 18 +- org.eclipse.egit.ui/.settings/.api_filters | 23 - org.eclipse.egit.ui/META-INF/MANIFEST.MF | 165 ++++--- org.eclipse.egit.ui/META-INF/p2.inf | 3 + org.eclipse.egit.ui/icons/elcl16/filter_ps.gif | Bin 0 -> 219 bytes org.eclipse.egit.ui/icons/ovr/staged_renamed.gif | Bin 0 -> 107 bytes org.eclipse.egit.ui/plugin.properties | 8 +- org.eclipse.egit.ui/plugin.xml | 93 +++- org.eclipse.egit.ui/pom.xml | 2 +- .../src/org/eclipse/egit/ui/Activator.java | 1 + .../egit/ui/PluginPreferenceInitializer.java | 3 +- .../src/org/eclipse/egit/ui/UIPreferences.java | 8 +- .../src/org/eclipse/egit/ui/UIUtils.java | 24 +- .../org/eclipse/egit/ui/internal/CommonUtils.java | 18 +- .../org/eclipse/egit/ui/internal/CompareUtils.java | 116 ++++- .../egit/ui/internal/ConfigurationChecker.java | 1 - .../egit/ui/internal/EgitUiEditorUtils.java | 1 - .../egit/ui/internal/FileRevisionEditorInput.java | 1 - .../GitCompareFileRevisionEditorInput.java | 12 +- .../eclipse/egit/ui/internal/GitLabelProvider.java | 2 - .../egit/ui/internal/LocalFileRevision.java | 1 - .../eclipse/egit/ui/internal/SecureStoreUtils.java | 1 - .../eclipse/egit/ui/{ => internal}/UIIcons.java | 11 +- .../org/eclipse/egit/ui/{ => internal}/UIText.java | 89 +++- .../eclipse/egit/ui/internal/ValidationUtils.java | 1 - .../egit/ui/internal/actions/ActionCommands.java | 5 +- .../internal/actions/AddToIndexActionHandler.java | 2 +- .../actions/AssumeUnchangedActionHandler.java | 2 +- .../actions/CompareIndexWithHeadActionHandler.java | 4 +- .../actions/CompareWithCommitActionHandler.java | 48 +- .../actions/CompareWithHeadActionHandler.java | 2 +- .../actions/CompareWithIndexActionHandler.java | 4 +- .../actions/CompareWithPreviousActionHandler.java | 2 +- .../actions/CompareWithRefActionHandler.java | 39 +- .../actions/DiscardChangesActionHandler.java | 16 +- .../internal/actions/DisconnectActionHandler.java | 2 +- .../ui/internal/actions/FetchActionHandler.java | 2 +- .../ui/internal/actions/IgnoreActionHandler.java | 8 +- .../ui/internal/actions/MergeActionHandler.java | 3 +- .../actions/NoAssumeUnchangedActionHandler.java | 2 +- .../ui/internal/actions/PushActionHandler.java | 2 +- .../egit/ui/internal/actions/RebaseAction.java | 17 +- .../ui/internal/actions/RebaseActionHandler.java | 32 +- .../actions/RemoveFromIndexActionHandler.java | 2 +- .../actions/ReplaceWithPreviousActionHandler.java | 2 +- .../internal/actions/RepositoryActionHandler.java | 70 ++- .../ui/internal/actions/ResetActionHandler.java | 2 +- .../internal/actions/ShowBlameActionHandler.java | 2 +- .../internal/actions/SimpleFetchActionHandler.java | 2 +- .../internal/actions/SimplePushActionHandler.java | 2 +- .../egit/ui/internal/actions/SwitchToMenu.java | 14 +- .../ui/internal/actions/SynchronizeWithMenu.java | 4 +- .../egit/ui/internal/actions/TagActionHandler.java | 2 +- .../egit/ui/internal/actions/UntrackAction.java | 25 - .../ui/internal/actions/UntrackActionHandler.java | 2 +- .../ui/internal/blame/BlameInformationControl.java | 2 +- .../egit/ui/internal/branch/BranchOperationUI.java | 2 +- .../ui/internal/branch/BranchResultDialog.java | 6 +- .../ui/internal/clean/CleanRepositoryPage.java | 2 +- .../ui/internal/clone/AbstractGitCloneWizard.java | 2 +- .../ui/internal/clone/CloneDestinationPage.java | 25 +- .../clone/GitCloneSourceProviderExtension.java | 4 +- .../egit/ui/internal/clone/GitCloneWizard.java | 4 +- .../clone/GitCreateGeneralProjectPage.java | 2 +- .../clone/GitCreateProjectViaWizardWizard.java | 2 +- .../egit/ui/internal/clone/GitImportWizard.java | 4 +- .../ui/internal/clone/GitProjectsImportPage.java | 28 +- .../ui/internal/clone/GitSelectRepositoryPage.java | 8 +- .../ui/internal/clone/GitSelectWizardPage.java | 2 +- .../egit/ui/internal/clone/ProjectUtils.java | 2 +- .../clone/RepositoryLocationContentProvider.java | 2 +- .../clone/RepositoryLocationLabelProvider.java | 2 +- .../ui/internal/clone/RepositoryLocationPage.java | 2 +- .../egit/ui/internal/clone/SourceBranchPage.java | 7 +- .../commands/shared/AbortRebaseCommand.java | 2 +- .../shared/AbstractRebaseCommandHandler.java | 2 +- .../commands/shared/ContinueRebaseCommand.java | 2 +- .../shared/FetchChangeFromGerritCommand.java | 2 +- .../commands/shared/RebaseCurrentRefCommand.java | 44 +- .../commands/shared/SkipRebaseCommand.java | 2 +- .../egit/ui/internal/commit/CommitEditor.java | 2 +- .../egit/ui/internal/commit/CommitEditorInput.java | 4 +- .../egit/ui/internal/commit/CommitEditorPage.java | 4 +- .../egit/ui/internal/commit/CommitHelper.java | 2 +- .../eclipse/egit/ui/internal/commit/CommitJob.java | 2 +- .../internal/commit/CommitProposalProcessor.java | 2 +- .../ui/internal/commit/CommitSelectionDialog.java | 2 +- .../eclipse/egit/ui/internal/commit/CommitUI.java | 2 +- .../egit/ui/internal/commit/DiffEditorPage.java | 2 +- .../internal/commit/DiffStyleRangeFormatter.java | 5 + .../egit/ui/internal/commit/HeaderText.java | 2 +- .../egit/ui/internal/commit/NoteDetailsPage.java | 2 +- .../egit/ui/internal/commit/NotesBlock.java | 2 +- .../egit/ui/internal/commit/NotesEditorPage.java | 2 +- .../egit/ui/internal/commit/RepositoryCommit.java | 32 +- .../ui/internal/commit/RepositoryCommitNote.java | 2 +- .../internal/commit/command/CherryPickHandler.java | 2 +- .../ui/internal/commit/command/RevertHandler.java | 2 +- .../internal/components/CheckboxLabelProvider.java | 2 +- .../components/RefContentAssistProvider.java | 2 +- .../ui/internal/components/RefContentProposal.java | 2 +- .../egit/ui/internal/components/RefSpecPage.java | 2 +- .../egit/ui/internal/components/RefSpecPanel.java | 4 +- .../components/RepositorySelectionPage.java | 4 +- .../ui/internal/components/SimplePushSpecPage.java | 2 +- .../credentials/EGitCredentialsProvider.java | 2 +- .../egit/ui/internal/credentials/LoginDialog.java | 2 +- .../egit/ui/internal/credentials/LoginService.java | 2 +- .../egit/ui/internal/decorators/GitDocument.java | 33 +- .../decorators/GitLightweightDecorator.java | 6 +- .../internal/decorators/GitQuickDiffProvider.java | 2 +- .../internal/dialogs/BasicConfigurationDialog.java | 2 +- .../dialogs/BranchConfigurationDialog.java | 100 +++- .../ui/internal/dialogs/BranchRenameDialog.java | 2 +- .../internal/dialogs/CheckoutConflictDialog.java | 2 +- .../egit/ui/internal/dialogs/CheckoutDialog.java | 514 ++++++++++---------- .../egit/ui/internal/dialogs/CommitCombo.java | 2 +- .../egit/ui/internal/dialogs/CommitDialog.java | 340 +++++++------ .../internal/dialogs/CommitMessageComponent.java | 2 +- .../ui/internal/dialogs/CommitSelectDialog.java | 2 +- .../dialogs/CompareTargetSelectionDialog.java | 2 +- .../egit/ui/internal/dialogs/CompareTreeView.java | 16 +- .../egit/ui/internal/dialogs/CreateTagDialog.java | 4 +- .../ui/internal/dialogs/CustomPromptDialog.java | 2 +- .../ui/internal/dialogs/DeleteBranchDialog.java | 286 +++++------ .../internal/dialogs/FileTreeContentProvider.java | 2 +- .../dialogs/GitTraceConfigurationDialog.java | 29 +- .../dialogs/MergeTargetSelectionDialog.java | 60 ++- .../egit/ui/internal/dialogs/NewRemoteDialog.java | 2 +- .../ui/internal/dialogs/NonDeletedFilesDialog.java | 2 +- .../ui/internal/dialogs/NonDeletedFilesTree.java | 4 +- .../dialogs/RebaseTargetSelectionDialog.java | 2 +- .../ui/internal/dialogs/RenameBranchDialog.java | 2 +- .../dialogs/ReplaceTargetSelectionDialog.java | 2 +- .../dialogs/ResetTargetSelectionDialog.java | 139 +++++- .../ui/internal/dialogs/RevertFailureDialog.java | 2 +- .../dialogs/SourceBranchFailureDialog.java | 2 +- .../dialogs/SpellcheckableMessageArea.java | 2 +- .../ui/internal/dialogs/UnmergedBranchDialog.java | 2 +- .../ui/internal/factories/GitAdapterFactory.java | 4 +- .../ui/internal/fetch/FetchDestinationPage.java | 2 +- .../ui/internal/fetch/FetchGerritChangePage.java | 318 +++++++----- .../ui/internal/fetch/FetchGerritChangeWizard.java | 2 +- .../egit/ui/internal/fetch/FetchOperationUI.java | 2 +- .../egit/ui/internal/fetch/FetchResultDialog.java | 2 +- .../egit/ui/internal/fetch/FetchResultTable.java | 13 +- .../egit/ui/internal/fetch/FetchSourcePage.java | 2 +- .../egit/ui/internal/fetch/FetchWizard.java | 4 +- .../internal/fetch/SimpleConfigureFetchDialog.java | 2 +- .../internal/fetch/SimpleFetchRefSpecWizard.java | 2 +- .../ui/internal/gerrit/ConfigureGerritWizard.java | 4 +- .../internal/gerrit/GerritConfigurationPage.java | 38 +- .../ui/internal/history/CommitFileDiffViewer.java | 96 ++-- .../egit/ui/internal/history/CommitGraphTable.java | 16 +- .../ui/internal/history/CommitInfoBuilder.java | 4 +- .../ui/internal/history/CommitMessageViewer.java | 2 +- .../ui/internal/history/CommitSelectionDialog.java | 6 +- .../eclipse/egit/ui/internal/history/FileDiff.java | 86 +++- .../internal/history/FileDiffContentProvider.java | 9 +- .../ui/internal/history/FileDiffLabelProvider.java | 49 +- .../egit/ui/internal/history/FindToolbar.java | 4 +- .../egit/ui/internal/history/FormatJob.java | 2 +- .../ui/internal/history/GenerateHistoryJob.java | 2 +- .../ui/internal/history/GitCreatePatchWizard.java | 4 +- .../egit/ui/internal/history/GitHistoryPage.java | 13 +- .../egit/ui/internal/history/HistoryPageInput.java | 6 +- .../egit/ui/internal/history/LocationPage.java | 4 +- .../command/AbstractHistoryCommandHandler.java | 58 ++- .../history/command/CheckoutCommitHandler.java | 7 +- .../command/CompareWithWorkingTreeHandler.java | 95 ++-- .../command/CreateBranchOnCommitHandler.java | 55 ++- .../command/DeleteBranchOnCommitHandler.java | 39 +- .../ui/internal/history/command/MergeHandler.java | 2 +- .../history/command/OpenInTextEditorHandler.java | 2 +- .../history/command/PushCommitHandler.java | 2 +- .../history/command/RebaseCurrentHandler.java | 5 +- .../command/RenameBranchOnCommitHandler.java | 34 +- .../ui/internal/history/command/ResetHandler.java | 2 +- .../command/ResetQuickdiffBaselineHandler.java | 2 +- .../command/SetQuickdiffBaselineHandler.java | 2 +- .../internal/history/command/ShowBlameHandler.java | 2 +- .../history/command/ShowVersionsHandler.java | 168 +++---- .../importing/GitScmUrlImportWizardPage.java | 16 +- .../ui/internal/merge/GitCompareEditorInput.java | 2 +- .../ui/internal/merge/GitMergeEditorInput.java | 16 +- .../egit/ui/internal/merge/MergeModeDialog.java | 2 +- .../egit/ui/internal/merge/MergeResultDialog.java | 2 +- .../operations/DeletePathsOperationUI.java | 2 +- .../ui/internal/operations/GitScopeOperation.java | 2 +- .../egit/ui/internal/operations/GitScopeUtil.java | 2 +- .../ui/internal/operations/IgnoreOperationUI.java | 2 +- .../egit/ui/internal/patch/PatchOperationUI.java | 2 +- .../internal/preferences/AddConfigEntryDialog.java | 2 +- .../preferences/CommitDialogPreferencePage.java | 2 +- .../preferences/ConfigurationEditorComponent.java | 2 +- .../preferences/DialogsPreferencePage.java | 2 +- .../preferences/GitDecoratorPreferencePage.java | 2 +- .../ui/internal/preferences/GitPreferenceRoot.java | 2 +- .../preferences/GitProjectPropertyPage.java | 2 +- .../GlobalConfigurationPreferencePage.java | 2 +- .../preferences/HistoryPreferencePage.java | 2 +- .../preferences/ProjectsPreferencePage.java | 2 +- .../preferences/SynchronizePreferencePage.java | 2 +- .../preferences/WindowCachePreferencePage.java | 2 +- .../ui/internal/pull/MultiPullResultDialog.java | 2 +- .../egit/ui/internal/pull/PullOperationUI.java | 2 +- .../egit/ui/internal/pull/PullResultDialog.java | 33 +- .../egit/ui/internal/push/ConfirmationPage.java | 2 +- .../egit/ui/internal/push/PushOperationUI.java | 2 +- .../egit/ui/internal/push/PushResultDialog.java | 2 +- .../egit/ui/internal/push/PushResultTable.java | 4 +- .../egit/ui/internal/push/PushToGerritPage.java | 2 +- .../egit/ui/internal/push/PushToGerritWizard.java | 2 +- .../eclipse/egit/ui/internal/push/PushWizard.java | 4 +- .../egit/ui/internal/push/RefSpecDialog.java | 2 +- .../egit/ui/internal/push/RefUpdateElement.java | 4 +- .../internal/push/SimpleConfigurePushDialog.java | 2 +- .../egit/ui/internal/rebase/RebaseHelper.java | 2 +- .../ui/internal/rebase/RebaseResultDialog.java | 111 ++++- .../ui/internal/reflog/RefSelectionDialog.java | 2 +- .../egit/ui/internal/reflog/ReflogView.java | 6 +- .../command/AbstractReflogCommandHandler.java | 4 +- .../internal/repository/BranchPropertySource.java | 4 +- .../ui/internal/repository/CreateBranchPage.java | 2 +- .../ui/internal/repository/CreateBranchWizard.java | 2 +- .../internal/repository/CreateRepositoryPage.java | 10 +- .../internal/repository/NewRepositoryWizard.java | 2 +- .../ui/internal/repository/RepositoriesView.java | 8 +- .../RepositoriesViewContentProvider.java | 18 +- .../repository/RepositoriesViewLabelProvider.java | 4 +- .../repository/RepositoryPropertySource.java | 4 +- .../repository/RepositoryRemotePropertySource.java | 2 +- .../repository/RepositorySearchDialog.java | 4 +- .../repository/RepositorySearchWizard.java | 2 +- .../repository/RepositoryStatisticsPage.java | 8 +- .../internal/repository/SelectResetTypePage.java | 4 +- .../ui/internal/repository/SelectUriWizard.java | 2 +- .../ui/internal/repository/tree/LinkHelper.java | 4 +- .../tree/RepositoriesViewPropertyTester.java | 16 +- .../repository/tree/RepositoryTreeNodeType.java | 2 +- .../repository/tree/command/AddToIndexCommand.java | 2 +- .../tree/command/ClearCredentialsCommand.java | 2 +- .../repository/tree/command/CreateTagCommand.java | 2 +- .../tree/command/DeleteBranchCommand.java | 2 +- .../command/DeleteRepositoryConfirmDialog.java | 2 +- .../repository/tree/command/DeleteTagCommand.java | 2 +- .../tree/command/FetchConfiguredRemoteCommand.java | 2 +- .../tree/command/GarbageCollectCommand.java | 2 +- .../tree/command/ImportProjectsCommand.java | 24 +- .../repository/tree/command/MergeCommand.java | 2 +- .../tree/command/OpenInEditorCommand.java | 7 +- .../repository/tree/command/PasteCommand.java | 2 +- .../repository/tree/command/PushCommand.java | 2 +- .../tree/command/PushConfiguredRemoteCommand.java | 2 +- .../repository/tree/command/RemoveCommand.java | 37 +- .../tree/command/RemoveRemoteCommand.java | 2 +- .../repository/tree/command/ResetCommand.java | 16 +- .../repository/tree/command/StashApplyCommand.java | 2 +- .../tree/command/StashCreateCommand.java | 4 +- .../repository/tree/command/StashDropCommand.java | 2 +- .../tree/command/SubmoduleAddCommand.java | 2 +- .../tree/command/SubmoduleSyncCommand.java | 2 +- .../tree/command/SubmoduleUpdateCommand.java | 2 +- .../tree/command/SynchronizeCommand.java | 2 +- .../internal/search/CommitResultLabelProvider.java | 2 +- .../egit/ui/internal/search/CommitSearchPage.java | 4 +- .../egit/ui/internal/search/CommitSearchQuery.java | 2 +- .../ui/internal/search/CommitSearchResult.java | 2 +- .../egit/ui/internal/search/RepositoryMatch.java | 2 +- .../ui/internal/sharing/ExistingOrNewPage.java | 96 ++-- .../egit/ui/internal/sharing/SharingWizard.java | 2 +- .../egit/ui/internal/staging/StagingEntry.java | 22 +- .../egit/ui/internal/staging/StagingView.java | 38 +- .../staging/StagingViewContentProvider.java | 11 +- .../internal/staging/StagingViewLabelProvider.java | 2 +- .../egit/ui/internal/stash/StashCreateUI.java | 21 +- .../ui/internal/submodule/AddSubmoduleWizard.java | 4 +- .../submodule/SubmodulePathWizardPage.java | 2 +- .../internal/synchronize/GitActionContributor.java | 15 +- .../internal/synchronize/GitModelSynchronize.java | 2 +- .../GitModelSynchronizeParticipant.java | 122 +++-- .../internal/synchronize/GitSynchronizeWizard.java | 2 +- .../synchronize/GitSynchronizeWizardPage.java | 4 +- .../internal/synchronize/SynchronizeFetchJob.java | 2 +- .../synchronize/action/OpenWorkingFileAction.java | 2 +- .../synchronize/compare/GitCompareInput.java | 2 +- .../compare/LocalNonWorkspaceTypedElement.java | 3 +- .../mapping/GitChangeSetLabelProvider.java | 2 +- .../internal/synchronize/model/GitModelCache.java | 2 +- .../synchronize/model/GitModelWorkingTree.java | 2 +- .../egit/ui/{ => internal}/uitext.properties | 48 +- .../ui/internal/variables/GitVariableResolver.java | 2 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 52 +- tools/egit-developer-tools.p2f | 67 ++- 513 files changed, 6038 insertions(+), 5146 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-egit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
