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 62ac66118805287548b18d19abc3ba5426975b0e Merge: cf7939b 829c421 Author: Jakub Adam <[email protected]> Date: Tue Sep 17 20:00:46 2013 +0200 Merge tag 'upstream/3.0.3' Upstream version 3.0.3 org.eclipse.egit-feature/feature.xml | 4 +- org.eclipse.egit-feature/pom.xml | 2 +- org.eclipse.egit.core.test/META-INF/MANIFEST.MF | 21 +- org.eclipse.egit.core.test/pom.xml | 7 +- .../eclipse/egit/core/GitMoveDeleteHookTest.java | 1 + .../core/synchronize/GitCommitsModelCacheTest.java | 66 ++-- .../GitSubscriberResourceMappingContextTest.java | 327 ++++++++++++++++++++ .../egit/core/test/GitResourceDeltaTestHelper.java | 10 +- .../egit/core/test/LinkedResourcesTest.java | 8 +- .../src/org/eclipse/egit/core/test/TestUtils.java | 47 ++- .../egit/core/test/op/IgnoreOperationTest.java | 43 ++- org.eclipse.egit.core/META-INF/MANIFEST.MF | 66 ++-- org.eclipse.egit.core/build.properties | 5 + org.eclipse.egit.core/pom.xml | 2 +- .../src/org/eclipse/egit/core/Activator.java | 116 ++++--- .../egit/core/internal/util/ProjectUtil.java | 27 +- .../egit/core/internal/util/ResourceUtil.java | 17 +- .../org/eclipse/egit/core/op/IgnoreOperation.java | 8 +- .../core/synchronize/GitCommitsModelCache.java | 89 +++--- .../GitResourceVariantTreeSubscriber.java | 7 +- .../egit/core/synchronize/GitSyncCache.java | 22 +- .../egit/core/synchronize/GitSyncObjectCache.java | 69 +++-- org.eclipse.egit.doc/META-INF/MANIFEST.MF | 2 +- 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/build.properties | 4 + org.eclipse.egit.mylyn.ui/pom.xml | 2 +- org.eclipse.egit.repository/pom.xml | 54 +--- 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 | 34 +- org.eclipse.egit.target/egit-4.3-staging.target | 51 +-- org.eclipse.egit.target/egit-4.3.target | 51 +-- org.eclipse.egit.target/pom.xml | 2 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 23 +- org.eclipse.egit.ui.test/pom.xml | 8 +- .../egit/ui/common/CompareEditorTester.java | 99 ++++++ .../eclipse/egit/ui/common/CreatePatchWizard.java | 11 +- .../egit/ui/common/GitImportRepoWizard.java | 4 +- .../egit/ui/common/LocalRepositoryTestCase.java | 9 +- .../ui/internal/actions/LinkedResourcesTest.java | 6 +- .../egit/ui/operations/GitScopeUtilTest.java | 100 ++++-- .../src/org/eclipse/egit/ui/test/TestUtil.java | 34 +- .../egit/ui/test/stagview/StagingViewTest.java | 3 +- .../ui/test/team/actions/CommitActionTest.java | 30 +- .../test/team/actions/CommitNonWSChangesTest.java | 6 +- .../test/team/actions/CreatePatchActionTest.java | 76 ++--- .../egit/ui/test/team/actions/LocationPage.java | 2 +- .../egit/ui/test/team/actions/MergeToolTest.java | 11 +- .../egit/ui/test/team/actions/TagActionTest.java | 2 + .../GitRepositoriesViewBranchHandlingTest.java | 172 +++++----- .../GitRepositoriesViewRepoDeletionTest.java | 28 +- .../GitRepositoriesViewRepoHandlingTest.java | 122 ++++---- .../view/repositories/GitRepositoriesViewTest.java | 8 +- .../repositories/GitRepositoriesViewTestBase.java | 2 +- .../repositories/GitRepositoriesViewTestUtils.java | 28 -- .../synchronize/AbstractSynchronizeViewTest.java | 12 +- .../synchronize/CompareEditorTitleMatcher.java | 36 --- .../SynchronizeViewGitChangeSetModelTest.java | 55 ++-- .../SynchronizeViewWorkspaceModelTest.java | 26 +- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 164 +++++----- org.eclipse.egit.ui/build.properties | 6 + org.eclipse.egit.ui/icons/eview16/repo_rep.gif | Bin 588 -> 609 bytes org.eclipse.egit.ui/plugin.properties | 2 +- org.eclipse.egit.ui/plugin.xml | 8 +- org.eclipse.egit.ui/pom.xml | 2 +- .../src/org/eclipse/egit/ui/UIUtils.java | 80 +++-- .../org/eclipse/egit/ui/internal/CompareUtils.java | 2 +- .../src/org/eclipse/egit/ui/internal/UIText.java | 26 +- .../egit/ui/internal/actions/RepositoryAction.java | 20 +- .../shared/AbstractRebaseCommandHandler.java | 67 ++-- .../egit/ui/internal/dialogs/CommitDialog.java | 20 +- .../internal/dialogs/CommitMessageComponent.java | 13 +- .../egit/ui/internal/dialogs/CreateTagDialog.java | 159 +++++----- .../ui/internal/fetch/FetchGerritChangePage.java | 14 +- .../internal/gerrit/GerritConfigurationPage.java | 14 +- .../ui/internal/history/CommitFileDiffViewer.java | 10 +- .../eclipse/egit/ui/internal/history/FileDiff.java | 19 +- .../history/command/CherryPickHandler.java | 9 + .../ui/internal/history/command/MergeHandler.java | 9 + .../history/command/RebaseCurrentHandler.java | 11 +- .../ui/internal/operations/GitScopeOperation.java | 67 ++-- .../preferences/GitProjectPropertyPage.java | 6 +- .../egit/ui/internal/push/PushToGerritPage.java | 14 +- .../egit/ui/internal/rebase/RebaseHelper.java | 8 +- .../ui/internal/rebase/RebaseResultDialog.java | 48 +-- .../command/DeleteRepositoryConfirmDialog.java | 116 +++++-- .../repository/tree/command/RemoveCommand.java | 3 +- .../command/RemoveOrDeleteRepositoryCommand.java | 55 ++++ .../org/eclipse/egit/ui/internal/uitext.properties | 18 +- org.eclipse.egit/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit/pom.xml | 2 +- pom.xml | 171 +++++++++- tools/egit-developer-tools.p2f | 37 ++- tools/version.sh | 16 + 100 files changed, 2122 insertions(+), 1221 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
