Skip to main content
AgeCommit message (Collapse)AuthorFilesLines
2015-03-13[442227] Compare an untracked file with HEAD.3.1.0M6Axel Richard1-4/+16
Fix IllegalArgumentException trying to compare an untracked file with HEAD. Just like the origin side, the right/remote side of the comparison can be null, e.g compare an untracked file with HEAD. Bug: 442227 Change-Id: I8454e7cccb3e75181d2cab60e438d588566c9326 Signed-off-by: Axel Richard <>
2015-03-12[461504] Removes line-breaks in UI from attribute change valuesPhilip Langer2-2/+16
Bug: 461504 Change-Id: I324a3dff8aa8e240974d1e123c901af401f4dfc3 Signed-off-by: Philip Langer <>
2015-03-10[458147] Three-way merging for rejecting opaque element body changesPhilip Langer2-38/+180
Bug: 458147 Change-Id: I5462f6f514efddf5e5a9f12982e015a84fe95743 Signed-off-by: Philip Langer <>
2015-03-09[457652] Give xmi:ids higher priority than attribute idsStefan Dirix25-107/+363
The IdentifierEObjectMatcher will now give xmi:ids priority over attribute ids to prevent models with duplicate xmi:ids. Includes testcases. Bug: 457652 Signed-off-by: Stefan Dirix <> Change-Id: Ia3ba4222837ecc7f6a17bccc3973ecaee334fad0
2015-03-09[461291] Avoid matching proxies with actual objects inStefan Dirix9-11/+291
IdentifierEObjectMatcher Differentiates between identifiers for proxies and identifiers for actual objects within the IdentifierEObjectMachter. This avoids matching proxies with actual objects while still allowing themselves to be matched. Includes testcases. Bug: 461291 Signed-off-by: Stefan Dirix <> Change-Id: Ib1a6553bfd0a682652de728f727a21607c6cc6c6
2015-03-04[458963] EMFCompare object doesn't use EMFCompareRCP registriesAxel Richard19-42/+588
EMFCompareBuilderConfigurator wasn't called everywhere it should be. Add tests. Bug: 458963 Change-Id: Iff41881d47a16c9a8f6624941dd5aacd33c00fad Signed-off-by: Axel Richard <>
2015-03-04Performances tests: increase max memory & max perm sizeAxel Richard1-1/+1
Change-Id: I89e412b145fe3cc465ecbd06aebaa325d87f10c5 Signed-off-by: Axel Richard <>
2015-03-02[458968] Fix Rejecting DiagramChange causes NPEAxel Richard1-8/+22
Bug: 458968 Change-Id: Ib7c4541f04101fd21603e5a870fc581d1a51f3ca Signed-off-by: Axel Richard <>
2015-03-02Fix core feature name to be consistent with other features namesAxel Richard1-1/+1
Change-Id: Ie2d89a692943361b4e5af742945736677fba1af8 Signed-off-by: Axel Richard <>
2015-03-02[413038] Fix Properties View: edit a value changes selectionAxel Richard2-5/+73
Fix regression intrduced by previous version of this fix. Bug: 413038 Change-Id: I6e33ccd5298b6bac039aeba610dbdd56aa2157a2 Signed-off-by: Axel Richard <>
2015-03-02[458147] Apply three-way merging also for rejecting attribute changesPhilip Langer2-107/+509
Bug: 458147 Change-Id: I7ca592c1de713f99157e19593d05fd4e71775d80 Signed-off-by: Philip Langer <>
2015-03-02[461011] Allow customization of parent determination while matchingStefan Dirix1-4/+19
Extracts the determination of parent objects in the IdentifierEObjectMatcher into a protected method. This method can be overwritten by clients who use a more complex architecture. Bug: 461011 Change-Id: Ic6645cdda971f6b75577eee4e092eebea4ef05fe Signed-off-by: Stefan Dirix <>
2015-03-02[460778] Improves duplicate ID warning in IdentifierEObjectMatcherPhilip Langer2-11/+53
We now add -- if available -- the URI of the resource containing the EObject that has the duplicate ID to the warning. Also, we externalized the warning String. Bug: 460778 Change-Id: I08f270910a2cc45eeffb77785402ae71498b67b6 Signed-off-by: Philip Langer <>
2015-03-02[460675] Fix differences for noncontained FeatureMapEntries with movedStefan Dirix7-13/+94
values Fixes the calculation of differences in scenarios where a non-contained entry is added to (or removed from) a FeatureMap and its reference is simultaneously moved. Includes testcases. Bug: 460675 Signed-off-by: Stefan Dirix <> Change-Id: I0c10a907f3bf3d2aaf857ac799cbe81967d23249
2015-03-02[460923] Do not filter FeatureMapChanges on removed ElementsStefan Dirix5-16/+85
The DefaultDiffEngine tries to minimize the number of calculated differences. This fix modifies the DefaultDiffEngine to allow calculation of FeatureMapChanges on removed elements. This is needed to prevent ordering issues when contained elements are added back via right-to-left merges. Includes testcase. Signed-off-by: Stefan Dirix <> Change-Id: Ia119ed2bf98a2730aa74c343e9138ed4bd82d35e
2015-03-02[460902] Fix Dependency Calculation for FeatureMap Add and DeleteStefan Dirix5-7/+79
The DefaultDiffReqEngine did not properly consider FeatureMapChanges when calculating the requirements between ReferenceChanges and FeatureMapChanges concerning Add and Delete operations. Includes testcase. Bug: 460902 Signed-off-by: Stefan Dirix <> Change-Id: Id7553e88d2caf09990f797fb8466c698f0d780c5
2015-02-27[457839] Adds model update strategy for opaque element body changesPhilip Langer2-2/+154
Change-Id: I57be6a403660de8bc5f7f104cedcd5b93eb88206 Signed-off-by: Philip Langer <>
2015-02-27[457839] Introduces model update strategies for content merge viewersPhilip Langer7-95/+442
Content merge viewers may enable users to actually perform model updates. Currently, the EMFCompareTextMergeViewer has that functionality to update EAttribute values. This update functionality is tightly bound to the diff type though (AttributeChange in this case). Diff extensions may re-use these content merge viewers for other change types, as it is the case with OpaqueElementBodyChanges right now. However, as EMFCompareTextMergeViewer expects attribute changes only, the model update is not working for such extensions. To enable model updates for other change types, we introduced IModelUpdateStrategies and adapted EMFCompareTextMergeViewer to perform the actual update using a specific model update strategy only without assuming a specific diff type; model update strategies therefore encapsulate the knowledge on how to perform the actual model update. Accessors may now implement IModelUpdateStrategyProviders and provide such a specific strategy to the content merge viewers they have selected. Bug: 457839 Change-Id: I9a2893bc5dac14e333816eae199f1c27ce6840c6 Signed-off-by: Philip Langer <>
2015-02-26[434621] RootIDMatchingStrategy matches incorrectlyAxel Richard1-2/+5
Avoid addition of null values in matching strategy. Bug: 434621 Change-Id: Ia096ab45f849b315e9f05c28b837d9c13b515c17 Signed-off-by: Axel Richard <>
2015-02-24[458818] NPE when conflict on multi-valued attrib. (move vs delete)Laurent Delaigue3-38/+58
This can be tested with conflict/data/c5/ and conflict/data/c2 test folders. Bug: 458818 Change-Id: I5602226549d940c01ffb240b00aa3156bb4bba33 Signed-off-by: Laurent Delaigue <>
2015-02-18[452147] Fix handling of diffs for interlocked one-to-one refsStefan Dirix8-21/+308
Every difference describes an effect which modifies the model. In a model with interlocked one-to-one references merging a difference can implicitly execute the effect of other differences without being equivalent to them. These differences are added to the directResultingMerges of the AbstractMerger. This patch also modifies the determination of equivalences for the described case in the DefaultEquiEngine. Includes testcases. Bug: 452147 Signed-off-by: Stefan Dirix <> Change-Id: I8741885c45736f82e2442a32843f7d0afbaf9a67
2015-02-11[UI Tests] Update q7 tests configAxel Richard1-0/+16
Change-Id: Ie9104724160a38c22b53903162ad3b0f5887690d Signed-off-by: Axel Richard <>
2015-02-10Provide coherent names for the SDK featuresLaurent Goubet18-9/+509
Change-Id: I0152c3b00f254880bf25d9fbdb8fb42b10ee5554 Signed-off-by: Laurent Goubet <>
2015-02-09[458802] NPE when IComparisonScope computes empty comparison.Laurent Delaigue1-7/+20
Now hooking required adapters when comparison is computed by a given scope. Notes: - It could be useful to add fail-fast test in ForwardingCompareInput to throw an exception when constructor is invoked with null param. Bug 458802 Change-Id: I27bfb7dc7fc4d712e49b7397becded86c2f2f6ae Signed-off-by: Laurent Delaigue <>
2015-02-09[UI] Update q7 testsAxel Richard7-47/+103
Tests from ts015 are still failing. Raise platform UI bug:459479 Change-Id: I0a58b0256e4bc3f4378a779c381154e24d7587ff Signed-off-by: Axel Richard <>
2015-02-09Change feature names to more descriptive onesLaurent Goubet9-34/+40
Change-Id: I8fd2df41faf7731edb1399d25d17e9ffc963854a Signed-off-by: Laurent Goubet <>
2015-02-09[436050] Fix copy all does nothingAxel Richard4-38/+67
Fix dirty state of editor after copy all Fix selected diff after copy all Fix undo after copy all Change-Id: Ia1a612aba3eb650517e059c84b57b305124fa557 Signed-off-by: Axel Richard <>
2015-02-09[456796] Cascading filter shouldn't hide move differencesAxel Richard5-16/+157
The Move differences are not hidden by the cascading filter anymore. Also add a UI test case. Change-Id: If1ef2719d715a715b989b6f6fab5222403c0591c Signed-off-by: Axel Richard <>
2015-02-09[413038] Fix Properties View: edit a value changes selectionAxel Richard2-5/+15
Only refresh the content viewers if the command is a compare command. This avoid to synchronize the selection between structure merge viewer and content merge viewers after editing value in the properties view. Bug: 413038 Change-Id: Ie21e94d3e9f48b1168937c6063e300fde7847116 Signed-off-by: Axel Richard <>
2015-02-09[459131] Fix Logical Model Resources Graph updateAxel Richard8-3/+219
Some links between resources were lost between logical model resources graph updates. Add associated test case. Bug:459131 Change-Id: Ib6f5fb95b96d5efb507bf0971c1ed25e39ca6b50 Signed-off-by: Axel Richard <>
2015-02-09Update Q7 AUT for Mars M5Axel Richard1-2/+2
Change-Id: I59ee596e7d93a333cd20695e8636c13606a7a1ba Signed-off-by: Axel Richard <>
2015-02-06[457034] ProximityEObjectMatcher should support cancellationLaurent Delaigue18-507/+1334
Improved monitoring by making use of SubMonitor and supporting cancel where it makes sense. Also added dedicated unit tests. Didn't want to break the API so added TODOs instead... Bug: 457034 Change-Id: I92dc82e2217c0cce818fb3d95a545f38f97bc86b Signed-off-by: Laurent Delaigue <>
2015-02-03[458502] NPE in EMFCompareStructureMergeViewer.3.1.0M5Laurent Delaigue1-1/+7
Needed to make sure diagnostic passed to method updateProblemIndication is never null. Bug: 458502 (duplicate) Bug: 457700 Change-Id: I023c74755332c7d6a93fa0bad1049ac64bdf915f Signed-off-by: Laurent Delaigue <>
2015-02-02[458544] Impossible to save value of text att if left not editable.Laurent Delaigue2-32/+74
EMFCompareTextMergeViewer now checks the relevant side instead of always checking the left side. Bug: 458544 Change-Id: Ia3118f10d8ee280cf0d1a9b32a65c1366c043baf Signed-off-by: Laurent Delaigue <>
2015-02-02Merge "Happy boy-scout: Fixed findbugs warning."Philip Langer1-10/+8
2015-01-27Add large split git uml models to performances testsAxel Richard12-9/+192
Change-Id: I3e62ec1c30b413f33ea63b46eabcd785b0fac0c8 Signed-off-by: Axel Richard <>
2015-01-27Improves git performances testsAxel Richard2-18/+67
Change-Id: I7dc77c0aa593ccc4fd5aa7f83cc448d4fd1a9dcd Signed-off-by: Axel Richard <>
2015-01-27Add nominal split git uml models to performances testsAxel Richard12-27/+210
Change-Id: Ifb56c3b1663af7fd57704071cd4f9c76914425a6 Signed-off-by: Axel Richard <>
2015-01-26Fix git performances testsAxel Richard1-9/+11
Change-Id: I8be6e984b7e199e3bd58622206ee09827a532c53 Signed-off-by: Axel Richard <>
2015-01-26Fix performances testsAxel Richard1-1/+1
Change-Id: I1799a9cedc8ce3aaf3d3d70a796f038b0c297649 Signed-off-by: Axel Richard <>
2015-01-26Add small split uml models to git performances testsAxel Richard14-16/+273
Change-Id: I47bab87506f6ec352a1b3e16116bcbe6d8a58a48 Signed-off-by: Axel Richard <>
2015-01-26Allow to load resources in NotLoadingResourceSet after comparison step.Axel Richard2-2/+29
Change-Id: Ibaefcc2339bb371b6e8d7352b95eaffa1ea5b9e0 Signed-off-by: Axel Richard <>
2015-01-26Deactivate Match content tests for git suite in performances testsAxel Richard2-3/+3
Change-Id: I59280d40577233ef42d6914a153a4da2a38aa4e8 Signed-off-by: Axel Richard <>
2015-01-24Fix performance large git profileAxel Richard1-1/+1
Change-Id: I95846daeb2686ffcdad32b79945492c76d43695b Signed-off-by: Axel Richard <>
2015-01-23Add new profile: performance large gitAxel Richard1-0/+33
Change-Id: Ib12ee42382b235334fbc1a20369b2946b4076375 Signed-off-by: Axel Richard <>
2015-01-23Add large uml size git performances testsAxel Richard19-13/+605
Change-Id: If9b96aa12fb3dabdc8c10c2c53ce29b18ecff220 Signed-off-by: Axel Richard <>
2015-01-23Add large split uml models to performances testsAxel Richard3693-201/+1436318
Change-Id: I6e61e1d347acce74aa7126e03e89e32acb64d2ad Signed-off-by: Axel Richard <>
2015-01-23Revert "Fix csv files for performances tests (dirty temporary commit)"Axel Richard2-84/+1
This reverts commit 886cb9f3484680ddbda9cdf6983ec37fc4b42b30.
2015-01-23Fix csv files for performances tests (dirty temporary commit)Axel Richard2-1/+84
Change-Id: I80a9b3ec6cf433dc13edc49064d344fe8ec9ef1c Signed-off-by: Axel Richard <>
2015-01-23Remove Closing Welcome Page step from git performances testsAxel Richard10-110/+0
Change-Id: If6e3d951049ce7de198b8f14543cd5e6afc3ac9c Signed-off-by: Axel Richard <>

Back to the top