Skip to content

Commit

Permalink
Merge pull request #2480 from mbeddr/feature/checking_handler
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderpann committed Aug 20, 2024
2 parents afc49b9 + 5610449 commit f3ea1c4
Show file tree
Hide file tree
Showing 8 changed files with 4,110 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

## com.mbeddr.platform

### Added

- A new language `com.mbeddr.mpsutil.checkinHandler` was added that can be used to execute pre-commit handlers which can approve or reject commits or execute arbitrary code before the checkin happens.

### Removed

- The tests build script (`com.mbeddr.platform.tests.ts.build`) is no longer part of the `com.mbeddr.platform` build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20901,6 +20901,10 @@
<ref role="m_rDy" node="3lcj7hzsuXf" resolve="com.mbeddr.mpsutil.logicalChild" />
<node concept="pUk6x" id="3lcj7hzsE8a" role="pUk7w" />
</node>
<node concept="m$_wl" id="SUkpD3RkHU" role="39821P">
<ref role="m_rDy" node="2hNr1jFzOYG" resolve="com.mbeddr.mpsutil.checkinHandler" />
<node concept="pUk6x" id="SUkpD3Rllc" role="pUk7w" />
</node>
</node>
<node concept="m$_wf" id="64SK4bcO2rO" role="3989C9">
<property role="m$_wk" value="com.mbeddr.mpsutil.projectview.favourites" />
Expand Down Expand Up @@ -21209,6 +21213,112 @@
<ref role="m$f5T" node="3lcj7hzsgVW" resolve="com.mbeddr.mpsutil.logicalChild" />
</node>
</node>
<node concept="2G$12M" id="2hNr1jFzOYr" role="3989C9">
<property role="TrG5h" value="com.mbeddr.mpsutil.checkinHandler" />
<node concept="1E1JtA" id="2hNr1jFzSEf" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mbeddr.mpsutil.checkinHandler" />
<property role="3LESm3" value="5e43bd52-71f1-484a-90fa-e1e624f7e44b" />
<node concept="398BVA" id="2hNr1jFzSXU" role="3LF7KH">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="2hNr1jFzSXV" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2hNr1jFzSXW" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.checkinHandler" />
<node concept="2Ry0Ak" id="5mHD6CprAVT" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.checkinHandler.msd" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="2hNr1jFzUtA" role="3bR37C">
<node concept="3bR9La" id="2hNr1jFzUtB" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="2hNr1jFzUtC" role="3bR37C">
<node concept="3bR9La" id="2hNr1jFzUtD" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="2hNr1jFzUtE" role="3bR37C">
<node concept="3bR9La" id="2hNr1jFzUtF" role="1SiIV1">
<ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
</node>
</node>
<node concept="1SiIV0" id="2hNr1jFzUtG" role="3bR37C">
<node concept="3bR9La" id="2hNr1jFzUtH" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
</node>
</node>
<node concept="1SiIV0" id="2hNr1jFzUtI" role="3bR37C">
<node concept="3bR9La" id="2hNr1jFzUtJ" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1SiIV0" id="2hNr1jFzUtK" role="3bR37C">
<node concept="3bR9La" id="2hNr1jFzUtL" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1BupzO" id="2hNr1jFzUtX" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="2hNr1jFzUtY" role="1HemKq">
<node concept="398BVA" id="2hNr1jFzUtM" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="2hNr1jFzUtN" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2hNr1jFzUtO" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.checkinHandler" />
<node concept="2Ry0Ak" id="2hNr1jFzUtP" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="2hNr1jFzUtZ" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="2hNr1jFzOYG" role="3989C9">
<property role="m$_wk" value="com.mbeddr.mpsutil.checkinHandler" />
<node concept="m$_yC" id="2hNr1jFzOYH" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
</node>
<node concept="3_J27D" id="2hNr1jFzOYI" role="m$_yQ">
<node concept="3Mxwew" id="2hNr1jFzOYJ" role="3MwsjC">
<property role="3MwjfP" value="com.mbeddr.mpsutil.checkinHandler" />
</node>
</node>
<node concept="3_J27D" id="2hNr1jFzOYK" role="m_cZH">
<node concept="3Mxwew" id="2hNr1jFzOYL" role="3MwsjC">
<property role="3MwjfP" value="com.mbeddr.mpsutil.checkinHandler" />
</node>
</node>
<node concept="3_J27D" id="2hNr1jFzOYM" role="m$_w8">
<node concept="3Mxwew" id="2hNr1jFzOYN" role="3MwsjC">
<property role="3MwjfP" value="mbeddr" />
</node>
</node>
<node concept="2iUeEo" id="2hNr1jFzOYO" role="2iVFfd">
<property role="2iUeEt" value="mbeddr" />
<property role="2iUeEu" value="http://mbeddr.com" />
</node>
<node concept="m$f5U" id="2hNr1jFzOYP" role="m$_yh">
<ref role="m$f5T" node="2hNr1jFzOYr" resolve="com.mbeddr.mpsutil.checkinHandler" />
</node>
<node concept="3_J27D" id="2hNr1jFzWjE" role="3s6cr7">
<node concept="3Mxwew" id="2hNr1jFzWjF" role="3MwsjC">
<property role="3MwjfP" value="helper plugin to create version control pre-commit handlers" />
</node>
</node>
</node>
</node>
<node concept="1l3spW" id="6ucYLjosbT2">
<property role="TrG5h" value="com.mbeddr.platform.distribution" />
Expand Down
5 changes: 4 additions & 1 deletion code/languages/com.mbeddr.mpsutil/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<project version="4">
<component name="MPSProject">
<projectModules>
<modulePath path="$PROJECT_DIR$/2023-12-07T13:42:50.640931Z/2023-12-07T13:42:50.640931Z.msd" folder="" />
<modulePath path="$PROJECT_DIR$/devkits/com.mbeddr.commenting.devkit" folder="staging.margincell_review" />
<modulePath path="$PROJECT_DIR$/devkits/com.mbeddr.mpsutil.guides/com.mbeddr.mpsutil.guides.devkit" folder="staging.editingGuide" />
<modulePath path="$PROJECT_DIR$/languages/EcoreImporter_TestLanguage1/EcoreImporter_TestLanguage1.mpl" folder="testlanguages" />
Expand All @@ -14,6 +13,8 @@
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.ccmenu.reftarget/com.mbeddr.mpsutil.ccmenu.reftarget.mpl" folder="rest.ccmenu" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.ccmenu.sandboxlang/com.mbeddr.mpsutil.ccmenu.sandboxlang.mpl" folder="rest.ccmenu" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.ccmenu/com.mbeddr.mpsutil.ccmenu.mpl" folder="rest.ccmenu" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.checkinHandler.demo/com.mbeddr.mpsutil.checkinHandler.demo.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.checkinHandler/com.mbeddr.mpsutil.checkinHandler.mpl" folder="" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.compare.pattern.baselang/com.mbeddr.mpsutil.compare.pattern.baselang.mpl" folder="staging.comparator" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.compare.pattern.generator/com.mbeddr.mpsutil.compare.pattern.generator.mpl" folder="staging.comparator" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.compare.pattern/com.mbeddr.mpsutil.compare.pattern.mpl" folder="staging.comparator" />
Expand Down Expand Up @@ -108,6 +109,8 @@
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ccmenu.reftarget.runtime/com.mbeddr.mpsutil.ccmenu.reftarget.runtime.msd" folder="rest.ccmenu" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ccmenu.runtime/com.mbeddr.mpsutil.ccmenu.runtime.msd" folder="rest.ccmenu" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/com.mbeddr.mpsutil.ccmenu.sandbox.msd" folder="rest.ccmenu" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/com.mbeddr.mpsutil.checkinHandler.demo.plugin.msd" folder="checkinHandler" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.checkinHandler/com.mbeddr.mpsutil.checkinHandler.msd" folder="checkinHandler" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.msd" folder="staging.common" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd" folder="staging.comparator.demo" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd" folder="staging.comparator.demo" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="com.mbeddr.mpsutil.checkinHandler.demo.plugin" uuid="d6e92aa0-3505-4109-85fa-4d99aa283ca4" moduleVersion="0" compileInMPS="true">
<models>
<modelRoot type="default" contentPath="${module}">
<sourceRoot location="models" />
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="yes" type="java">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
<sourcePath />
<dependencies>
<dependency reexport="false">5e43bd52-71f1-484a-90fa-e1e624f7e44b(com.mbeddr.mpsutil.checkinHandler)</dependency>
<dependency reexport="false">f57286e3-4e19-4d8d-8045-3900761f6530(jetbrains.mps.git4idea.stubs)</dependency>
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
<dependency reexport="false">019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="5" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="5e43bd52-71f1-484a-90fa-e1e624f7e44b(com.mbeddr.mpsutil.checkinHandler)" version="0" />
<module reference="d6e92aa0-3505-4109-85fa-4d99aa283ca4(com.mbeddr.mpsutil.checkinHandler.demo.plugin)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
<module reference="f57286e3-4e19-4d8d-8045-3900761f6530(jetbrains.mps.git4idea.stubs)" version="0" />
<module reference="019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)" version="0" />
<module reference="25092e07-e655-497c-92fb-558a8e3080ed(jetbrains.mps.ide.ui)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
</dependencyVersions>
</solution>

Loading

0 comments on commit f3ea1c4

Please sign in to comment.