[512562] Diff/merge can't handle multiple repos28/91928/13
commit397973f42e0b298452e56379659fe9caae172fe4
authorMartin Fleck <mfleck@eclipsesource.com>
Mon, 27 Feb 2017 16:36:36 +0000 (27 17:36 +0100)
committerLaurent Goubet <laurent.goubet@obeo.fr>
Mon, 10 Apr 2017 13:13:39 +0000 (10 09:13 -0400)
treef54f48f24c0c477edc239d669290477041c1a6c8
parent0460c391dbeb04a23f6f7662bc7babc453aae04e
[512562] Diff/merge can't handle multiple repos

Fix issue of handling multiple repos by pruning resources that are not
in the repository of the left logical model starting point from the
logical model.

- Extend model minimizers to consider the logical model starting point
- Add registry and extension point for the model minimizers
- Add minimizer to remove resources not matching the expected repository
- Use registered model minimizers where applicable

Bug: 512562
Change-Id: I2a6b378760bdfca5e4c09dc4fbd945016ae58dc0
Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>
25 files changed:
performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractGitTestCase.java
plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF
plugins/org.eclipse.emf.compare.egit.ui/plugin.xml
plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/logical/SingleRepositoryMinimizer.java [new file with mode: 0644]
plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/GitTestSupport.java
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/contentmergeviewer/notloadedfragment/NotLoadedFragmentItemTest.java
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/GraphResolutionTest.java
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/ThreadedModelResolverGraphTest.java
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/notloadedfragment/NotLoadedFragmentNodeTest.java
plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/unit/TestBug497566.java
plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
plugins/org.eclipse.emf.compare.ide.ui/schema/modelMinimizers.exsd [new file with mode: 0644]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareIDEUIPlugin.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/AdditiveResourceMappingMerger.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMappingMerger.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/IdenticalResourceMinimizer.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ModelMinimizerRegistry.java [new file with mode: 0644]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ModelMinimizerRegistryListener.java [new file with mode: 0644]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/NullModelMinimizer.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/CompoundModelMinimizer.java [new file with mode: 0644]
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java