ERP5VCS: Add support for submodules
This MR will help to be able to do basic VCS tasks (commit, diff, merge, etc.) with submodules Business Template in ERP5. This is particularly useful as we are migrating some BT5(s) such as erp5_notebook to act as submodule which are getting large due to data files. We already have support for submodules in slapos gitclone recipe.
This MR can also be used to discuss the naming convention for submodules. As mentioned by @jerome in the comment here , we will be using it for external javascripts also, hence we will be having 2 basic cases. Feel free to add more:
- Business Templates as submodule
- External Libraries as submodule
TODO:
- Changes in submodule Business Template should reflect properly in the diff (f75b7c3b)
New Issues:
- Checkout from branch with to without submodule and vice-versa is creating issue. (Use post-checkout hook https://ttboj.wordpress.com/2014/05/06/keeping-git-submodules-in-sync-with-your-branches/)
-
-
resolved all discussions
Toggle commit list -
resolved all discussions
Toggle commit list -
added 1 commit
- 02b31f35 - ERP5VCS: Fix removal of hidden files while exporting Business Template
Toggle commit list -
Edited
In ERP5VCS, we use commit changes to commit the BT5 changes in 1 step, like here:
But with submodule it needs to be done in 2 steps:
- Commit the changes in the bt5 repository
- Commit the version up for the bt5 (acting as submodule) in erp5 repo.
With @jm we discussed that we can provide an extra checkbox in
BusinessTemplate_doVcsCommitto version up the submodule commit in erp5 repository. Something like this(with better naming):
This will allow to again keep the commit process in single step, difference being that now we will have 2 commits.
For example in ERP5 repo, we will have something like
erp5.git <parent_revision_1> bt5/ erp5_notebook @ <submodule_revision_1>/ (submodule pointing to bt5-erp5_notebook.git)Now changes in
erp5_notebookBT5 and commiting it with ERP5 VCS UI will change the revisions to:erp5.git <version up erp5_notebook BT5 to submodule_revision_2> bt5/ erp5_notebook @ <submodule_revision_2>/ (submodule pointing to bt5-erp5_notebook.git)What are your opinions on this
-
added 40 commits
-
02b31f35...85d5fd91 - 39 commits from branch
nexedi:master - ad603c74 - [erp5_forge] Add create commit option by default for submodule changes
Toggle commit list -
02b31f35...85d5fd91 - 39 commits from branch
-
added 1 commit
- 357b39b6 - [erp5_forge] Add interaction workflow for creating commit for submodule version up
Toggle commit list -
Toggle commit list
-
Please register or sign in to post a comment