[eclipse-egit] branch master updated (96070a0 -> dd6ba29)

Jakub Adam xhaakon-guest at moszumanska.debian.org
Mon Dec 23 19:12:55 UTC 2013


This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a change to branch master
in repository eclipse-egit.

      from  96070a0   prepare for upload
      adds  524d741   Imported Upstream version 3.2.0
       new  cae53b9   Merge tag 'upstream/3.2.0'
       new  ce08747   Updated d/changelog with new upstream version
       new  8a4c564   Refreshed d/patches/use-distribution-jgit.patch
       new  fe8d00e   Bump Standards-Version to 3.9.5
       new  dd6ba29   Make Vcs-* fields canonical

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md                                          |  10 +-
 debian/changelog                                   |   9 +
 debian/control                                     |   6 +-
 debian/patches/use-distribution-jgit.patch         |   4 +-
 egit.psf                                           |  14 +-
 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 +-
 .../eclipse/egit/core/GitMoveDeleteHookTest.java   |   3 +-
 .../core/internal/storage/BlobStorageTest.java     |   3 +-
 .../egit/core/internal/util/ResourceUtilTest.java  |  43 +
 .../GitResourceVariantComparatorTest.java          |  12 +-
 .../GitSubscriberResourceMappingContextTest.java   |   8 +-
 .../core/test/AdaptableFileTreeIteratorTest.java   |   7 +-
 .../org/eclipse/egit/core/test/GitTestCase.java    |   9 +-
 .../egit/core/test/LinkedResourcesTest.java        |   6 +-
 .../egit/core/test/RepositoryCacheTest.java        |  46 ++
 .../org/eclipse/egit/core/test/TestRepository.java |  17 +-
 .../src/org/eclipse/egit/core/test/TestUtils.java  |   6 +-
 .../core/test/internal/mapping/HistoryTest.java    |   9 +-
 .../egit/core/test/op/CloneOperationTest.java      |  47 +-
 .../core/test/op/DeletePathsOperationTest.java     |   3 +-
 .../egit/core/test/op/IgnoreOperationTest.java     |   2 +-
 .../test/rebase/RebaseInteractivePlanTest.java     | 447 +++++++++++
 org.eclipse.egit.core/META-INF/MANIFEST.MF         |  65 +-
 org.eclipse.egit.core/pom.xml                      |   2 +-
 .../src/org/eclipse/egit/core/Activator.java       |  29 +-
 .../eclipse/egit/core/ContainerTreeIterator.java   |  18 +-
 .../src/org/eclipse/egit/core/RepositoryCache.java |  58 ++
 .../src/org/eclipse/egit/core/RepositoryUtil.java  |  47 +-
 .../egit/core/internal/CompareCoreUtils.java       |  61 +-
 .../org/eclipse/egit/core/internal/CoreText.java   |   6 +
 .../core/internal/ProjectReferenceImporter.java    |  21 +-
 .../eclipse/egit/core/internal/coretext.properties |   2 +
 .../internal/rebase/RebaseInteractivePlan.java     | 884 +++++++++++++++++++++
 .../egit/core/internal/util/ResourceUtil.java      |  56 +-
 .../org/eclipse/egit/core/op/BranchOperation.java  |   7 +-
 .../eclipse/egit/core/op/CherryPickOperation.java  |   7 +-
 .../org/eclipse/egit/core/op/CloneOperation.java   |   5 +-
 .../org/eclipse/egit/core/op/CommitOperation.java  |   7 +-
 .../egit/core/op/CreateLocalBranchOperation.java   |  49 +-
 .../eclipse/egit/core/op/CreatePatchOperation.java |  21 +-
 .../egit/core/op/DeleteBranchOperation.java        |   7 +-
 .../egit/core/op/GarbageCollectOperation.java      |  22 +-
 .../org/eclipse/egit/core/op/IgnoreOperation.java  |   2 +-
 .../org/eclipse/egit/core/op/MergeOperation.java   |   7 +-
 .../org/eclipse/egit/core/op/PullOperation.java    |   8 +-
 .../org/eclipse/egit/core/op/RebaseOperation.java  |  73 +-
 .../egit/core/op/RenameBranchOperation.java        |   7 +-
 .../org/eclipse/egit/core/op/ResetOperation.java   |   7 +-
 .../egit/core/op/RevertCommitOperation.java        |   7 +-
 .../eclipse/egit/core/op/StashApplyOperation.java  |   7 +-
 .../eclipse/egit/core/op/StashCreateOperation.java |   7 +-
 .../eclipse/egit/core/op/StashDropOperation.java   |   7 +-
 .../egit/core/op/SubmoduleAddOperation.java        |   4 +-
 .../egit/core/op/SubmoduleSyncOperation.java       |   4 +-
 .../egit/core/op/SubmoduleUpdateOperation.java     |   4 +-
 .../eclipse/egit/core/project/GitProjectData.java  |   2 +-
 .../egit/core/project/RepositoryFinder.java        |  70 +-
 .../egit/core/project/RepositoryMapping.java       |  22 +-
 .../core/synchronize/GitLocalResourceVariant.java  |   7 +-
 .../egit/core/synchronize/GitRemoteResource.java   |   8 +-
 .../core/synchronize/GitResourceVariantTree.java   |   9 +-
 .../GitResourceVariantTreeSubscriber.java          |   6 +-
 org.eclipse.egit.doc/META-INF/MANIFEST.MF          |   2 +-
 org.eclipse.egit.doc/build-help.xml                |   4 +-
 org.eclipse.egit.doc/cheatsheets/push.xml          |   2 +-
 .../help/EGit/New_and_Noteworthy/3.1/3.1.html      | 109 ---
 .../3.1/Build-and-Release-Engineering.html         |  64 --
 .../3.1/GitHub-Connector-Features.html             |  59 --
 .../3.1/Performance-Improvements.html              |  63 --
 .../images/Checkout-remotetracking-egit-3.1.png    | Bin 16408 -> 0 bytes
 .../3.1/images/Delete-repository-egit-3.1.png      | Bin 21411 -> 0 bytes
 .../3.1/images/Gerrit-repoview-egit-3.1.png        | Bin 14354 -> 0 bytes
 .../3.1/images/Hyperlink-staging-egit-3.1.png      | Bin 10029 -> 0 bytes
 .../3.1/images/Merge-options-egit-3.1.png          | Bin 29206 -> 0 bytes
 .../3.1/images/Staging-filter-egit-3.1.png         | Bin 15057 -> 0 bytes
 .../Staging-presentation-options-egit-3.1.png      | Bin 11713 -> 0 bytes
 .../3.1/images/Staging-rebase-egit-3.1.png         | Bin 28013 -> 0 bytes
 .../help/EGit/New_and_Noteworthy/3.2/3.2.html      | 116 +++
 .../New_and_Noteworthy/{3.1 => 3.2}/Bug-Fixes.html |   8 +-
 .../3.2}/Build-and-Release-Engineering.html        |  21 +-
 .../New_and_Noteworthy/3.2}/Contributors.html      |  10 +-
 .../3.2/GitHub-Connector-Features.html}            |  22 +-
 .../{3.1 => 3.2}/Updating-This-Document.html       |   8 +-
 .../3.2/images/Egit-3.2-BlameImprovements.png      | Bin 0 -> 62444 bytes
 .../3.2/images/Egit-3.2-CreateBranchWizard.png     | Bin 0 -> 18069 bytes
 .../3.2/images/Egit-3.2-InteractiveRebaseView.png  | Bin 0 -> 20998 bytes
 .../3.2/images/Egit-3.2-PushBranchWizard.png       | Bin 0 -> 21712 bytes
 .../3.2/images/Egit-3.2-PushTagWizard.png          | Bin 0 -> 27094 bytes
 .../help/EGit/User_Guide/Reference.html            |   3 -
 .../help/EGit/User_Guide/Tasks.html                | 139 +++-
 .../help/EGit/User_Guide/User-Guide.html           |   6 +-
 .../EGit/User_Guide/images/01-TextDecorations.png  | Bin 3499 -> 7450 bytes
 .../EGit/User_Guide/images/02-IconDecorations.png  | Bin 3790 -> 6837 bytes
 .../User_Guide/images/03-ExampleDecoration.png     | Bin 1541 -> 2018 bytes
 .../User_Guide/images/04-QuickDiffPreferences.png  | Bin 8972 -> 16398 bytes
 .../User_Guide/images/05-QuickDiffInEditor.png     | Bin 2947 -> 5858 bytes
 .../images/06-QuickDiffInEditorPopup.png           | Bin 1569 -> 3476 bytes
 .../help/EGit/User_Guide/images/CherryPick1.png    | Bin 11639 -> 38219 bytes
 .../help/EGit/User_Guide/images/CherryPick2.png    | Bin 8888 -> 15221 bytes
 .../help/EGit/User_Guide/images/CherryPick3.png    | Bin 6303 -> 11627 bytes
 .../images/Commit-editor-commit-page.png           | Bin 27638 -> 36363 bytes
 .../images/egit-3.2-BlameImprovements.png          | Bin 0 -> 55951 bytes
 .../images/egit-3.2-InteractiveRebaseAmend.png     | Bin 0 -> 20857 bytes
 .../images/egit-3.2-InteractiveRebaseEdit.png      | Bin 0 -> 22583 bytes
 .../images/egit-3.2-InteractiveRebaseFinished.png  | Bin 0 -> 6468 bytes
 .../egit-3.2-InteractiveRebaseHistoryAfterEdit.png | Bin 0 -> 19476 bytes
 ...git-3.2-InteractiveRebaseHistoryAfterRebase.png | Bin 0 -> 19114 bytes
 .../images/egit-3.2-InteractiveRebaseReword.png    | Bin 0 -> 56759 bytes
 .../images/egit-3.2-InteractiveRebaseSquash.png    | Bin 0 -> 59470 bytes
 .../egit-3.2-InteractiveRebaseSquashMessage.png    | Bin 0 -> 8130 bytes
 .../images/egit-3.2-InteractiveRebaseView.png      | Bin 0 -> 16827 bytes
 .../images/egit-3.2-PlanInteractiveRebase.png      | Bin 0 -> 18865 bytes
 .../images/egit-3.2-StartInteractiveRebase.png     | Bin 0 -> 44387 bytes
 .../images/egit-3.2-StartedInteractiveRebase.png   | Bin 0 -> 42666 bytes
 .../{3.1/3.1.html => 3.2/3.2.html}                 |  40 +-
 .../New_and_Noteworthy/{3.1 => 3.2}/Bug-Fixes.html |  16 +-
 .../New_and_Noteworthy/3.2}/Contributors.html      |  10 +-
 .../{3.1 => 3.2}/Updating-This-Document.html       |   8 +-
 org.eclipse.egit.doc/help/toc.xml                  |  46 +-
 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             |  13 +-
 .../eclipse/egit/internal/mylyn/AllMylynTests.java |  21 -
 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/egit-4.2.target            |  36 +-
 org.eclipse.egit.target/egit-4.3-staging.target    |  90 ---
 org.eclipse.egit.target/egit-4.3.target            |  36 +-
 org.eclipse.egit.target/egit-4.4-staging.target    |  79 ++
 org.eclipse.egit.target/egit-4.4.target            |  79 ++
 org.eclipse.egit.target/pom.xml                    |   2 +-
 org.eclipse.egit.ui.test/META-INF/MANIFEST.MF      |  24 +-
 .../org.eclipse.egit.ui--All-JUnit-Tests.launch    |  15 -
 .../org.eclipse.egit.ui--All-Non-SWT-Tests.launch  |  44 -
 .../org.eclipse.egit.ui--All-SWT-Tests.launch      |  40 -
 org.eclipse.egit.ui.test/pom.xml                   |   9 +-
 .../eclipse/egit/ui/common/CommitDialogTester.java |  26 +-
 .../eclipse/egit/ui/common/CreatePatchWizard.java  |   6 +-
 .../egit/ui/common/LocalRepositoryTestCase.java    |  81 +-
 .../eclipse/egit/ui/common/StagingViewTester.java  |  32 +-
 .../ui/internal/actions/LinkedResourcesTest.java   |  17 +-
 .../egit/ui/internal/branch/BranchTests.java       |  25 -
 .../decorators/DecoratableResourceAdapterTest.java |   9 -
 .../ui/internal/push/PushBranchWizardTest.java     | 227 ++++++
 .../ui/internal/push/PushBranchWizardTester.java   | 120 +++
 .../egit/ui/internal/push/PushTagsWizardTest.java  |  73 ++
 .../ui/internal/push/PushTagsWizardTester.java     | 107 +++
 .../internal/repository/CreateBranchPageTest.java  |   4 +-
 .../synchronize/model/AllGitModelTests.java        |  28 -
 .../synchronize/model/GitModelBlobTest.java        |   5 +-
 .../synchronize/model/GitModelCacheFileTest.java   |   9 +-
 .../synchronize/model/GitModelCacheTest.java       |   5 +-
 .../synchronize/model/GitModelCacheTreeTest.java   |   5 +-
 .../synchronize/model/GitModelCommitTest.java      |   5 +-
 .../synchronize/model/GitModelRepositoryTest.java  |   5 +-
 .../synchronize/model/GitModelRootTest.java        |   8 +-
 .../synchronize/model/GitModelTestCase.java        |   4 +-
 .../synchronize/model/GitModelTreeTest.java        |   9 +-
 .../synchronize/model/GitModelWorkingFileTest.java |   5 +-
 .../synchronize/model/GitModelWorkingTreeTest.java |   5 +-
 .../egit/ui/operations/GitScopeUtilTest.java       |  18 -
 .../egit/ui/search/CommitSearchDialogTest.java     |  13 +-
 .../egit/ui/search/CommitSearchQueryTest.java      |  12 +-
 .../org/eclipse/egit/ui/search/SearchTests.java    |  26 -
 .../eclipse/egit/ui/submodule/SubmoduleTests.java  |  27 -
 .../org/eclipse/egit/ui/test/AllLocalTests.java    |  52 --
 .../eclipse/egit/ui/test/AllSWTAndNonSWTTests.java |  26 -
 .../src/org/eclipse/egit/ui/test/AllTests.java     |  22 -
 .../eclipse/egit/ui/test/ContextMenuHelper.java    |   3 +-
 .../src/org/eclipse/egit/ui/test/Eclipse.java      |   4 +-
 .../org/eclipse/egit/ui/test/SWTBotTreeColumn.java |  63 ++
 .../src/org/eclipse/egit/ui/test/TestUtil.java     |  34 +-
 .../test/commit/CommitEditorInputFactoryTest.java  |  12 +-
 .../egit/ui/test/commit/CommitEditorInputTest.java |  12 +-
 .../egit/ui/test/commit/CommitEditorTest.java      |  13 +-
 .../eclipse/egit/ui/test/commit/CommitTests.java   |  29 -
 .../test/commit/DiffStyleRangeFormatterTest.java   |  12 +-
 .../egit/ui/test/commit/RepositoryCommitTest.java  |  13 +-
 .../egit/ui/test/history/HistoryViewTest.java      |  36 +-
 .../eclipse/egit/ui/test/junit/AllJUnitTests.java  |  19 -
 .../egit/ui/test/nonswt/AllNonSWTTests.java        |  24 -
 .../egit/ui/test/stagview/StagingViewTest.java     |  45 +-
 .../ui/test/team/actions/AllTeamActionTests.java   |  31 -
 .../team/actions/BranchAndResetActionTest.java     | 139 ++--
 .../ui/test/team/actions/CommitActionTest.java     |  39 +-
 .../test/team/actions/CommitNonWSChangesTest.java  |  56 +-
 .../ui/test/team/actions/CompareActionsTest.java   |  42 +-
 .../test/team/actions/CreatePatchActionTest.java   |  15 +-
 .../test/team/actions/DisconnectConnectTest.java   |  29 +-
 .../test/team/actions/FetchAndMergeActionTest.java |  71 +-
 .../egit/ui/test/team/actions/MergeToolTest.java   |  10 +-
 .../egit/ui/test/team/actions/PushActionTest.java  |  28 +-
 .../ui/test/team/actions/ReplaceActionsTest.java   | 152 ++--
 .../egit/ui/test/team/actions/ShowInTest.java      |  33 +-
 .../egit/ui/test/team/actions/TagActionTest.java   |  86 +-
 .../egit/ui/variables/DynamicVariablesTest.java    |  19 +-
 .../repositories/AllRepositoriesViewTests.java     |  28 -
 .../GitRepositoriesViewBranchHandlingTest.java     |  16 +-
 .../GitRepositoriesViewFetchAndPushTest.java       |  19 +-
 .../GitRepositoriesViewRemoteHandlingTest.java     |  16 +-
 .../GitRepositoriesViewRepoHandlingTest.java       |  10 +-
 .../GitRepositoriesViewTagHandlingTest.java        |  46 +-
 .../view/repositories/GitRepositoriesViewTest.java | 259 +++---
 .../repositories/GitRepositoriesViewTestBase.java  | 150 +---
 .../synchronize/AbstractSynchronizeViewTest.java   |  21 +-
 .../SynchronizeViewGitChangeSetModelTest.java      |  10 +-
 .../SynchronizeViewWorkspaceModelTest.java         |   9 +-
 .../ui/wizards/clone/GitCloneWizardTestBase.java   |   4 +-
 .../egit/ui/wizards/share/SharingWizardTest.java   |  15 +-
 org.eclipse.egit.ui/META-INF/MANIFEST.MF           | 165 ++--
 org.eclipse.egit.ui/icons/elcl16/continue.gif      | Bin 337 -> 336 bytes
 org.eclipse.egit.ui/icons/elcl16/start.gif         | Bin 0 -> 332 bytes
 .../icons/eview16/rebase_interactive.gif           | Bin 0 -> 349 bytes
 org.eclipse.egit.ui/icons/obj16/current_step.gif   | Bin 0 -> 296 bytes
 org.eclipse.egit.ui/icons/obj16/done_step.gif      | Bin 0 -> 978 bytes
 org.eclipse.egit.ui/icons/obj16/fixup.gif          | Bin 0 -> 299 bytes
 .../icons/obj16/rebase_interactive.gif             | Bin 0 -> 349 bytes
 org.eclipse.egit.ui/icons/obj16/reword.gif         | Bin 0 -> 578 bytes
 org.eclipse.egit.ui/icons/obj16/squash.gif         | Bin 0 -> 321 bytes
 org.eclipse.egit.ui/icons/obj16/todo_step.gif      | Bin 0 -> 121 bytes
 org.eclipse.egit.ui/plugin.properties              |  26 +-
 org.eclipse.egit.ui/plugin.xml                     | 503 ++++++++----
 org.eclipse.egit.ui/pom.xml                        |   2 +-
 .../egit/ui/PluginPreferenceInitializer.java       |   5 +-
 .../src/org/eclipse/egit/ui/UIPreferences.java     |   3 +
 .../src/org/eclipse/egit/ui/UIUtils.java           |  10 +
 .../org/eclipse/egit/ui/internal/CompareUtils.java |  23 +-
 .../eclipse/egit/ui/internal/GitLabelProvider.java |  73 +-
 ...Revision.java => LocationEditableRevision.java} |  61 +-
 ...Revision.java => ResourceEditableRevision.java} |   9 +-
 .../egit/ui/internal/ResourcePropertyTester.java   |  21 +-
 .../src/org/eclipse/egit/ui/internal/UIIcons.java  |  55 ++
 .../src/org/eclipse/egit/ui/internal/UIText.java   | 375 +++++++--
 .../actions/CompareWithCommitActionHandler.java    |   6 +-
 .../actions/CompareWithRefActionHandler.java       |   6 +-
 .../actions/CompareWithRevisionAction.java         |  23 -
 .../actions/CompareWithRevisionActionHandler.java  |  41 -
 .../internal/actions/MergeToolActionHandler.java   |  17 +-
 .../internal/actions/PushBranchActionHandler.java  |  55 ++
 ...tionHandler.java => PushTagsActionHandler.java} |  21 +-
 ...Action.java => PushUpstreamOrBranchAction.java} |  11 +-
 .../actions/PushUpstreamOrBranchActionHandler.java |  90 +++
 .../internal/actions/RepositoryActionHandler.java  |  44 +-
 .../egit/ui/internal/actions/SimplePushAction.java |  21 -
 .../internal/actions/SimplePushActionHandler.java  |   7 +-
 .../egit/ui/internal/actions/TagAction.java        |  25 -
 .../egit/ui/internal/actions/TagActionHandler.java |  17 +-
 .../ui/internal/blame/BlameInformationControl.java | 304 ++++++-
 .../blame/BlameInformationControlCreator.java      |  30 +-
 .../egit/ui/internal/blame/BlameOperation.java     | 111 ++-
 .../egit/ui/internal/blame/BlameRevision.java      | 157 +++-
 .../egit/ui/internal/branch/BranchOperationUI.java |  87 +-
 .../ui/internal/branch/BranchResultDialog.java     | 202 -----
 .../CleanupUncomittedChangesDialog.java}           |  86 +-
 .../egit/ui/internal/clean/CleanWizard.java        |  16 +
 .../ui/internal/clone/CloneDestinationPage.java    |  13 +-
 .../egit/ui/internal/clone/GitImportWizard.java    |  21 +-
 .../ui/internal/clone/GitSelectWizardPage.java     |   4 +
 .../egit/ui/internal/clone/ProjectRecord.java      |  37 +-
 .../egit/ui/internal/clone/SourceBranchPage.java   |   5 +-
 .../commands/shared/AbortRebaseCommand.java        |  11 +-
 .../shared/AbstractRebaseCommandHandler.java       | 199 ++++-
 .../commands/shared/ContinueRebaseCommand.java     |  15 +-
 .../commands/shared/ProcessStepsRebaseCommand.java |  41 +
 .../commands/shared/RebaseCurrentRefCommand.java   |  32 +-
 .../commands/shared/SkipRebaseCommand.java         |  13 +-
 .../egit/ui/internal/commit/CommitHelper.java      |  38 +-
 .../eclipse/egit/ui/internal/commit/CommitJob.java |   5 +-
 .../internal/commit/DiffStyleRangeFormatter.java   |   2 +-
 .../ui/internal/commit/RepositoryCommitNote.java   |   3 +-
 .../internal/commit/command/CreateTagHandler.java  |  14 +-
 .../internal/components/RemoteSelectionCombo.java  | 203 +++++
 .../components/RepositorySelectionPage.java        |  80 +-
 .../components/UpstreamConfigComponent.java        | 162 ++++
 .../egit/ui/internal/credentials/LoginDialog.java  |   6 +-
 .../decorators/GitLightweightDecorator.java        |  21 +-
 .../dialogs/AbstractBranchSelectionDialog.java     |  41 +-
 .../egit/ui/internal/dialogs/BranchEditDialog.java |  57 ++
 ...alog.java => BranchSelectionAndEditDialog.java} | 215 +++--
 .../ui/internal/dialogs/BranchSelectionDialog.java |  11 +
 .../internal/dialogs/CheckoutConflictDialog.java   |   6 +-
 .../egit/ui/internal/dialogs/CheckoutDialog.java   | 216 +----
 .../egit/ui/internal/dialogs/CommitDialog.java     | 121 ++-
 .../internal/dialogs/CommitMessageComponent.java   |   6 +-
 .../ui/internal/dialogs/CommitSelectDialog.java    |  12 +-
 .../egit/ui/internal/dialogs/CompareTreeView.java  |  18 +-
 .../egit/ui/internal/dialogs/CreateTagDialog.java  |  46 +-
 .../dialogs/GitTraceConfigurationDialog.java       |  24 +-
 .../egit/ui/internal/dialogs/NewRemoteDialog.java  |  19 +-
 .../dialogs/ResetTargetSelectionDialog.java        |  59 +-
 .../dialogs/SourceBranchFailureDialog.java         |  43 +-
 .../dialogs/SpellcheckableMessageArea.java         |  59 +-
 .../ui/internal/fetch/FetchGerritChangePage.java   |  79 +-
 .../ui/internal/history/CommitFileDiffViewer.java  |  12 +-
 .../egit/ui/internal/history/CommitGraphTable.java |  44 +-
 .../ui/internal/history/CommitInfoBuilder.java     |  24 +-
 .../egit/ui/internal/history/FindToolbar.java      | 213 ++---
 .../ui/internal/history/GitCreatePatchWizard.java  |   7 +-
 .../egit/ui/internal/history/GitHistoryPage.java   |   8 +-
 .../egit/ui/internal/history/LocationPage.java     |   3 +-
 .../command/AbstractHistoryCommandHandler.java     |  11 +-
 ...va => AbstractRebaseHistoryCommandHandler.java} |  57 +-
 .../history/command/CreateTagOnCommitHandler.java  |   7 +-
 .../history/command/HistoryViewCommands.java       |   3 +
 .../history/command/RebaseCurrentHandler.java      |  82 +-
 .../command/RebaseInteractiveCurrentHandler.java   |  79 ++
 .../ui/internal/merge/GitMergeEditorInput.java     | 101 ++-
 .../egit/ui/internal/merge/MergeResultDialog.java  |   9 +-
 .../preferences/DialogsPreferencePage.java         |   3 +
 .../egit/ui/internal/push/AddRemotePage.java       | 107 +++
 .../egit/ui/internal/push/AddRemoteWizard.java     |  67 ++
 .../egit/ui/internal/push/PushBranchPage.java      | 302 +++++++
 .../egit/ui/internal/push/PushBranchWizard.java    | 213 +++++
 .../egit/ui/internal/push/PushOperationUI.java     |  63 +-
 .../egit/ui/internal/push/PushResultDialog.java    |  12 +-
 .../egit/ui/internal/push/PushTagsPage.java        | 227 ++++++
 .../egit/ui/internal/push/PushTagsWizard.java      | 151 ++++
 .../egit/ui/internal/push/PushToGerritPage.java    |   6 +-
 .../egit/ui/internal/push/RefSpecWizard.java       |  13 +-
 .../internal/push/SimpleConfigurePushDialog.java   |  21 +-
 .../internal/rebase/CommitMessageEditorDialog.java | 110 +++
 .../egit/ui/internal/rebase/RebaseHelper.java      | 117 ---
 .../RebaseInteractiveDragSourceListener.java       |  59 ++
 .../RebaseInteractiveDropTargetListener.java       |  90 +++
 .../internal/rebase/RebaseInteractiveHandler.java  |  51 ++
 .../RebaseInteractivePlanContentProvider.java      |  73 ++
 ...RebaseInteractiveStepActionToolBarProvider.java | 337 ++++++++
 .../ui/internal/rebase/RebaseInteractiveView.java  | 682 ++++++++++++++++
 .../ui/internal/rebase/RebaseResultDialog.java     |  82 +-
 .../ui/internal/repository/CreateBranchPage.java   | 408 ++++------
 .../ui/internal/repository/RepositoriesView.java   |  41 +-
 .../RepositoriesViewContentProvider.java           |  55 +-
 .../repository/RepositoriesViewLabelProvider.java  |  91 ++-
 .../RepositoriesViewStyledCellLabelProvider.java   |  42 +
 .../repository/RepositoryPropertySource.java       |   8 +-
 .../tree/RepositoriesViewPropertyTester.java       |  18 -
 .../egit/ui/internal/repository/tree/TagNode.java  |  50 +-
 .../repository/tree/command/AddCommand.java        |  88 +-
 .../repository/tree/command/CommitCommand.java     |  39 -
 .../repository/tree/command/CreateTagCommand.java  | 137 ----
 .../tree/command/ImportProjectsCommand.java        |  12 +-
 .../repository/tree/command/MergeCommand.java      |  21 +-
 .../repository/tree/command/PushCommand.java       |  48 +-
 .../tree/command/PushConfiguredRemoteCommand.java  |  52 +-
 .../repository/tree/command/StashDropCommand.java  |  81 +-
 .../ui/internal/sharing/ExistingOrNewPage.java     |  16 +-
 .../egit/ui/internal/staging/StagingView.java      | 148 ++--
 .../internal/synchronize/GitModelSynchronize.java  |   4 +-
 .../synchronize/GitSynchronizeWizardPage.java      |   2 +-
 .../ui/internal/synchronize/action/PushAction.java |  10 +-
 .../compare/LocalNonWorkspaceTypedElement.java     |   2 +-
 .../org/eclipse/egit/ui/internal/uitext.properties | 179 ++++-
 .../ui/internal/variables/GitVariableResolver.java |  17 +-
 org.eclipse.egit/META-INF/MANIFEST.MF              |   2 +-
 org.eclipse.egit/pom.xml                           |   2 +-
 pom.xml                                            |  35 +-
 365 files changed, 11125 insertions(+), 4953 deletions(-)
 create mode 100644 org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/rebase/RebaseInteractivePlanTest.java
 create mode 100644 org.eclipse.egit.core/src/org/eclipse/egit/core/internal/rebase/RebaseInteractivePlan.java
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/3.1.html
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Build-and-Release-Engineering.html
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/GitHub-Connector-Features.html
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/Performance-Improvements.html
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Checkout-remotetracking-egit-3.1.png
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Delete-repository-egit-3.1.png
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Gerrit-repoview-egit-3.1.png
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Hyperlink-staging-egit-3.1.png
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Merge-options-egit-3.1.png
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-filter-egit-3.1.png
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-presentation-options-egit-3.1.png
 delete mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.1/images/Staging-rebase-egit-3.1.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/3.2.html
 rename org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/{3.1 => 3.2}/Bug-Fixes.html (86%)
 rename org.eclipse.egit.doc/help/{JGit/New_and_Noteworthy/3.1 => EGit/New_and_Noteworthy/3.2}/Build-and-Release-Engineering.html (71%)
 rename org.eclipse.egit.doc/help/{JGit/New_and_Noteworthy/3.1 => EGit/New_and_Noteworthy/3.2}/Contributors.html (81%)
 rename org.eclipse.egit.doc/help/{JGit/New_and_Noteworthy/3.1/Performance-Improvements.html => EGit/New_and_Noteworthy/3.2/GitHub-Connector-Features.html} (70%)
 rename org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/{3.1 => 3.2}/Updating-This-Document.html (87%)
 create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-BlameImprovements.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-CreateBranchWizard.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-InteractiveRebaseView.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushBranchWizard.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/3.2/images/Egit-3.2-PushTagWizard.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-BlameImprovements.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseAmend.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseEdit.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseFinished.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseHistoryAfterEdit.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseHistoryAfterRebase.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseReword.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseSquash.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseSquashMessage.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-InteractiveRebaseView.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-PlanInteractiveRebase.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-StartInteractiveRebase.png
 create mode 100644 org.eclipse.egit.doc/help/EGit/User_Guide/images/egit-3.2-StartedInteractiveRebase.png
 rename org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/{3.1/3.1.html => 3.2/3.2.html} (56%)
 rename org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/{3.1 => 3.2}/Bug-Fixes.html (72%)
 rename org.eclipse.egit.doc/help/{EGit/New_and_Noteworthy/3.1 => JGit/New_and_Noteworthy/3.2}/Contributors.html (79%)
 rename org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/{3.1 => 3.2}/Updating-This-Document.html (87%)
 delete mode 100644 org.eclipse.egit.mylyn.ui.test/src/org/eclipse/egit/internal/mylyn/AllMylynTests.java
 delete mode 100644 org.eclipse.egit.target/egit-4.3-staging.target
 create mode 100644 org.eclipse.egit.target/egit-4.4-staging.target
 create mode 100644 org.eclipse.egit.target/egit-4.4.target
 delete mode 100644 org.eclipse.egit.ui.test/org.eclipse.egit.ui--All-JUnit-Tests.launch
 delete mode 100644 org.eclipse.egit.ui.test/org.eclipse.egit.ui--All-Non-SWT-Tests.launch
 delete mode 100644 org.eclipse.egit.ui.test/org.eclipse.egit.ui--All-SWT-Tests.launch
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/branch/BranchTests.java
 create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushBranchWizardTest.java
 create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushBranchWizardTester.java
 create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushTagsWizardTest.java
 create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushTagsWizardTester.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/synchronize/model/AllGitModelTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/search/SearchTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/submodule/SubmoduleTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllLocalTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllSWTAndNonSWTTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/AllTests.java
 create mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/SWTBotTreeColumn.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/junit/AllJUnitTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/nonswt/AllNonSWTTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/AllTeamActionTests.java
 delete mode 100644 org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/AllRepositoriesViewTests.java
 create mode 100644 org.eclipse.egit.ui/icons/elcl16/start.gif
 create mode 100644 org.eclipse.egit.ui/icons/eview16/rebase_interactive.gif
 create mode 100644 org.eclipse.egit.ui/icons/obj16/current_step.gif
 create mode 100644 org.eclipse.egit.ui/icons/obj16/done_step.gif
 create mode 100644 org.eclipse.egit.ui/icons/obj16/fixup.gif
 create mode 100644 org.eclipse.egit.ui/icons/obj16/rebase_interactive.gif
 create mode 100644 org.eclipse.egit.ui/icons/obj16/reword.gif
 create mode 100644 org.eclipse.egit.ui/icons/obj16/squash.gif
 create mode 100644 org.eclipse.egit.ui/icons/obj16/todo_step.gif
 copy org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/{FileEditableRevision.java => LocationEditableRevision.java} (61%)
 rename org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/{FileEditableRevision.java => ResourceEditableRevision.java} (90%)
 delete mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithRevisionAction.java
 delete mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithRevisionActionHandler.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushBranchActionHandler.java
 copy org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/{DeleteBranchActionHandler.java => PushTagsActionHandler.java} (61%)
 copy org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/{ShowRepositoriesViewAction.java => PushUpstreamOrBranchAction.java} (58%)
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PushUpstreamOrBranchActionHandler.java
 delete mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SimplePushAction.java
 delete mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/TagAction.java
 delete mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/BranchResultDialog.java
 copy org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/{dialogs/CheckoutConflictDialog.java => branch/CleanupUncomittedChangesDialog.java} (52%)
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/ProcessStepsRebaseCommand.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RemoteSelectionCombo.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/UpstreamConfigComponent.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchEditDialog.java
 copy org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/{CheckoutDialog.java => BranchSelectionAndEditDialog.java} (64%)
 copy org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/{RebaseCurrentHandler.java => AbstractRebaseHistoryCommandHandler.java} (62%)
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/RebaseInteractiveCurrentHandler.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/AddRemotePage.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/AddRemoteWizard.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushBranchPage.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushBranchWizard.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushTagsPage.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushTagsWizard.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java
 delete mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseHelper.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveDragSourceListener.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveDropTargetListener.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveHandler.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractivePlanContentProvider.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveStepActionToolBarProvider.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseInteractiveView.java
 create mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesViewStyledCellLabelProvider.java
 delete mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/CommitCommand.java
 delete mode 100644 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/CreateTagCommand.java

-- 
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