?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 906d0cc) | patch
Model Merge Tool + classes to do model merges with EGit30/56230/10
commit32d90bb986c9978fc5976596abc909196076bfd8
authorMathieu Cartaud <mathieu.cartaud@obeo.fr>
Fri, 18 Sep 2015 09:06:47 +0000 (18 11:06 +0200)
committerAxel Richard <axel.richard@obeo.fr>
Wed, 23 Sep 2015 13:00:45 +0000 (23 15:00 +0200)
treedfdd4e1ed9d71c1fcbf196d652e8838482a60317tree | snapshot (tar.gz zip)
parent906d0cc7d2eb527b375c26c3654d3e030c482cc3commit | diff
Model Merge Tool + classes to do model merges with EGit

Introduce classes to be able to perform merges interacting with EGit
from code hosted by EMFCompare.

This will allow us to abandon reviews 22674 and 22672 in EGit.

Change-Id: I28e96903c09206f34b510f3c08ec93d7fb91eba0
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
59 files changed:
org.eclipse.emf.compare-parent/pom.xml diff | blob | blame | history
packaging/org.eclipse.emf.compare.egit-feature/feature.xml diff | blob | blame | history
plugins/org.eclipse.emf.compare.egit.ui/.checkstyle [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/.classpath [new file with mode: 0755] blob
plugins/org.eclipse.emf.compare.egit.ui/.project [new file with mode: 0755] blob
plugins/org.eclipse.emf.compare.egit.ui/.settings/edu.umd.cs.findbugs.core.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/.settings/org.eclipse.core.resources.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/.settings/org.eclipse.core.runtime.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/.settings/org.eclipse.jdt.ui.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/.settings/org.eclipse.pde.api.tools.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF [new file with mode: 0755] blob
plugins/org.eclipse.emf.compare.egit.ui/about.html [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/build.properties [new file with mode: 0755] blob
plugins/org.eclipse.emf.compare.egit.ui/icons/obj16/modelmergetool.png [new file with mode: 0755] blob
plugins/org.eclipse.emf.compare.egit.ui/plugin.properties [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/plugin.xml [new file with mode: 0755] blob
plugins/org.eclipse.emf.compare.egit.ui/pom.xml [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/EMFCompareEGitUIMessages.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/actions/ModelMergeToolAction.java [new file with mode: 0755] blob
plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/actions/ModelMergeToolActionHandler.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/egit_ide_ui_messages.properties [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF diff | blob | blame | history
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/ModelEGitResourceUtil.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/DirCacheResourceVariantTreeProvider.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/GitCachedResourceVariantTree.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/GitResourceVariantCache.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/GitResourceVariantFileRevision.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/GitResourceVariantTreeProvider.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/GitResourceVariantTreeSubscriber.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/GitSyncInfoToDiffConverter.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/LogicalModels.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/TreeWalkResourceVariantTreeProvider.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/AbstractGitResourceVariant.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/GitLocalResourceVariant.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/IndexBlobStorage.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/IndexResourceVariant.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/TreeParserResourceVariant.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/storage/WorkspaceGitBlobStorage.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/.settings/edu.umd.cs.findbugs.core.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/.settings/org.eclipse.pde.api.tools.prefs [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/META-INF/MANIFEST.MF diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui.tests.git/fragment.xml [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/DirCacheResourceVariantTreeProviderTest.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/GitResourceVariantTreeSubscriberTest.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/ResourceVariantTest.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/TreeWalkResourceVariantTreeProviderTest.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/VariantsTestCase.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/ModelTestCase.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleModelAdapterFactory.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleModelProvider.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleResourceMapping.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleResourceMappingMerger.java [new file with mode: 0644] blob
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/suite/GitTests.java diff | blob | blame | history
plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/MovedImplicitResourceAmongChangedResourcesTest.java diff | blob | blame | history
Eclipse foundation framework to comapre EMF models