{"push_id":612517734,"size":13,"distinct_size":13,"ref":"refs/heads/master","head":"3f192c9800a775818225ff0d2cba642bd59635c9","before":"99a0739458bcaebd7de99463ac1e3b9b0ca8f9f6","commits":[{"sha":"d4a5a7b29c16c4f9e3ff22e1ebabb1d0edb437d7","author":{"email":"4069ba76f8571020ec24da4a9524e5ab201efdc3@obeo.fr","name":"Axel Richard"},"message":"[wip] Introduce internal API to integrate Team merging\n\nTeam provides a number of APIs to provide access to merge,\ncomparison and synchronization features. This introduces a\ngit-specific Subscriber implementation that can retrieve\ninformation from three different sources, along with\nimplementations to use the index or a TreeWalk to populate\nthese three 'sources'.\n\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nAlso-by: Axel Richard <axel.richard@obeo.fr>\nChange-Id: I41a5f737c1055037ca58b60c66997669c2c3abf8","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/d4a5a7b29c16c4f9e3ff22e1ebabb1d0edb437d7"},{"sha":"c08d25ceed7a4e2158b1ef8d55d7c7c6979662d1","author":{"email":"076bd0ed220f9d6fe5391ff7fa85242a1119eca1@obeo.fr","name":"Laurent Goubet"},"message":"[wip] Reduce duplication from the synchronize code\n\nUse the newly introduced GitResourceVariantTreeProvider\nfrom the synchronization code to reduce duplication.\n\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nChange-Id: I338060cb1bb252124aee866dcd22334ad4428b4b","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/c08d25ceed7a4e2158b1ef8d55d7c7c6979662d1"},{"sha":"9977f30aa157a80926be79c694ff72af44c63d07","author":{"email":"4069ba76f8571020ec24da4a9524e5ab201efdc3@obeo.fr","name":"Axel Richard"},"message":"[wip] Use a workspace-aware merging strategy when working from EGit\n\nThis introduces an Eclipse-specific sub-class of the\nRecursiveMerger that will make use of the mergers provided\nby ModelProviders instead of ignoring them to always use\nEGit's custom merging algorithms.\n\nAny file which does not have a specific merger (or which\nmerger cannot be found, such as for files outside of the\nworkspace) is still handled as it would by the\nRecursiveMerger.\n\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nAlso-by: Axel Richard <axel.richard@obeo.fr>\nChange-Id: I1b27061ab215ebe600baef56f4e19a038c4b31a8","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/9977f30aa157a80926be79c694ff72af44c63d07"},{"sha":"39e4d5966ad70267f98f6fe4f5fe7d08d14ca07c","author":{"email":"076bd0ed220f9d6fe5391ff7fa85242a1119eca1@obeo.fr","name":"Laurent Goubet"},"message":"[wip] Enable logical merge support for projects not at repository root.\n\nMerging of logical models located within projects that were not at the\nrepository's root was failing due to erroneous handling of file paths.\n\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nChange-Id: Id91a91e498258280d534a75ee506f0b296b4444d","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/39e4d5966ad70267f98f6fe4f5fe7d08d14ca07c"},{"sha":"2d9beddb8ecd4f904148c4e0dd74f16063981fe4","author":{"email":"076bd0ed220f9d6fe5391ff7fa85242a1119eca1@obeo.fr","name":"Laurent Goubet"},"message":"[wip] Allow pre-merging from Mapping Mergers in case of conflicts\n\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nChange-Id: I70210975e79263f3ecbdc7665970c1d58b4f0f78","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/2d9beddb8ecd4f904148c4e0dd74f16063981fe4"},{"sha":"6d80d58ef30c7a3d1b5bcce5a8f4fae2027f3cb0","author":{"email":"076bd0ed220f9d6fe5391ff7fa85242a1119eca1@obeo.fr","name":"Laurent Goubet"},"message":"[wip] Fix random InterruptedException on merges\n\nUILockListener#interruptUI() will  interrupt \"joining\" threads when a\nsyncExec tries and take the lock. This protects our joining so that it\nwill loop itself in case of interruptions until it's reached its goal.\n\nChange-Id: Ia3825057479aa37be7c755719bba4aaf192b7a4a\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/6d80d58ef30c7a3d1b5bcce5a8f4fae2027f3cb0"},{"sha":"ee3ca49de1ea8adb7dfcd8fa09f0380afdb988dd","author":{"email":"4069ba76f8571020ec24da4a9524e5ab201efdc3@obeo.fr","name":"Axel Richard"},"message":"[wip] Comparison with refs should allow merging when local data is used\n\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nAlso-by: Axel Richard <axel.richard@obeo.fr>\nChange-Id: I2551e411d759f4c1e16a416b2652c9d49dbe0ea0\n\n# Conflicts:\n# \torg.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/ee3ca49de1ea8adb7dfcd8fa09f0380afdb988dd"},{"sha":"e56c19888c8ce61df94b496fbb9452e8cb10c36e","author":{"email":"4069ba76f8571020ec24da4a9524e5ab201efdc3@obeo.fr","name":"Axel Richard"},"message":"[wip] Let the ModelProviders compare their own file formats.\n\nTeam allows ModelProviders to provide their own means of\ncomparing their supervised files. This changes EGit's merge\ntool so that it uses this information instead of always\ncomputing its own \"textual\" differences between files.\n\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nAlso-By: Axel Richard <axel.richard@obeo.fr>\nChange-Id: Ie38c9e6d8de0d9b6a8194c48ff0aa9e33489b243","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/e56c19888c8ce61df94b496fbb9452e8cb10c36e"},{"sha":"a61fff6ae63036b2bf02364b1ed5f81ed31e1877","author":{"email":"076bd0ed220f9d6fe5391ff7fa85242a1119eca1@obeo.fr","name":"Laurent Goubet"},"message":"[wip] Fix regression when calling the merge tool on folders\n\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nChange-Id: Iadc891d4a028e58c50f9ad44aac5ce536e072838","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/a61fff6ae63036b2bf02364b1ed5f81ed31e1877"},{"sha":"88e1282acf1d871a91bc45247f7d5c1edb665d6b","author":{"email":"076bd0ed220f9d6fe5391ff7fa85242a1119eca1@obeo.fr","name":"Laurent Goubet"},"message":"[wip] Introduce tests for the logical merging\n\nChange-Id: Ie965807567efe5a1de45c523dd96fee10f02b5b7\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/88e1282acf1d871a91bc45247f7d5c1edb665d6b"},{"sha":"54b9ab806ae5842eda44b6d1bc953c50aab9944e","author":{"email":"e89ab3d2a7582fdb11dd4891a1facace33441f3c@obeo.fr","name":"Laurent Delaigue"},"message":"Provide access to the absolute path of the git storages.\n\nIStorage#getFullPath() was implemented in such a way that the\nunderlying resource is unresolveable for any client not aware of git\ninnards. This opens a new API to allow clients to access the path if the\nneeds arises.\n\nChange-Id: I70724413c79f4756cdaffaa4229f4d9a1d8082e5\nAlso-by: Laurent Goubet <laurent.goubet@obeo.fr>\nAlso-by: Axel Richard <axel.richard@obeo.fr>\nSigned-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/54b9ab806ae5842eda44b6d1bc953c50aab9944e"},{"sha":"ffe611d80315bcfb2181191a690f6d57ebf157e4","author":{"email":"83fee285365a1a1f8afef72d5f026cce5dda395c@obeo.fr","name":"Arthur Daussy"},"message":"[DRAFT][Mailist discussion support] Solution 1.\n\nThis review is intented to support the discussion on the mailist\nregarding the logical model.\n\nChange-Id: Iba967102da2118fcf795bdd3e4bc56c9ef8abec2\nSigned-off-by: Arthur Daussy <arthur.daussy@obeo.fr>\n\n# Conflicts:\n# \torg.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncCache.java","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/ffe611d80315bcfb2181191a690f6d57ebf157e4"},{"sha":"3f192c9800a775818225ff0d2cba642bd59635c9","author":{"email":"42242780430d3653fc08c401d94f102195bbc111@eclipsesource.com","name":"Alexandra Buzila"},"message":"[wip] Provide a remote mapping context to ModelProviders\n\nAllow model providers to use remote information when trying\nto determine whether a file is a part of a logical model or\nnot. When a file has been deleted locally, or when a file\nhas been created on one of the remote sides, the local side\nis not enough to compute a full model. ModelProviders will\nneed access to the remote file data to take these \"unknown\"\nfiles into account.\n\nChange-Id: I956dfb13093781accca36142cd87cf01b479fe1a\nSigned-off-by: Laurent Goubet <laurent.goubet@obeo.fr>\nSigned-off-by: Axel Richard <axel.richard@obeo.fr>\nSigned-off-by: Alexandra Buzila <abuzila@eclipsesource.com>\nAlso-by: Axel Richard <axel.richard@obeo.fr>\nAlso-by: Alexandra Buzila <abuzila@eclipsesource.com>","distinct":true,"url":"https://api.github.com/repos/collaborative-modeling/egit/commits/3f192c9800a775818225ff0d2cba642bd59635c9"}]}