Updated: Comment #6
Problem/Motivation
There a re multiple git related modules for Aegir and Devshop
https://drupal.org/project/hosting_platform_git
https://drupal.org/project/hosting_site_git
Devshop has devshop_pull
Proposed resolution
Create a new project 'hosting_git' to merge them starting at the D7 port.
Remaining tasks
Merge sources into the new repoDo the D7 port- cleanup
User interface changes
The basic git tasks should become available for both sites and platforms.
We currently have code for
- Create a platform from a git repo by cloning
- pull task on a platform
- pull task on a site
- pull a site or platform based on a incomming webhook request
- pull a site or platform on a regular basis - queue
checkout (switch branch)- postponed pending #2123211: Support branch creationclone ( less tested )- postponed pending #2123211: Support branch creation
Original report by @username
We have:
https://drupal.org/project/hosting_platform_git
https://drupal.org/project/hosting_site_git
Devshop has devshop_pull
What if we were to combine them as hosting_git (or hosting_vcs ?)
It is tempting, and probably quicker, to merge it completely into the core. But ... I do prefer to keep it optional, and a separate module leaves room for another vcs integration in the future.
Some mention: #2180053: Include more "golden" contrib
My idea is to definitely add a git supporting module to the hostmaster makefile.
Comments
Comment #1
ergonlogicGood idea. Git support is a common request, and contrib efforts are currently fragmented.
While it'd be nice to have a generic VCS module with engines for git, svn, etc., I don't think it'd be worth the extra work and complexity at this point.
Comment #2
helmo CreditAttribution: helmo commentedI've opened https://drupal.org/project/hosting_git and added the active Aegir maintainers. And would like to invite other active users ....
I've already invited cweagans and Jon Pugh in #2123233: Thoughts on integration with Aegir itself, or Provision Git?
Comment #3
gboudrias CreditAttribution: gboudrias commentedhttps://drupal.org/project/valkyrie is our attempt to adapt devshop for individual sites. It's not finished but hopefully contains some useful code, seeing as one of the ideas is "the option to do a 'git pull' in a site directory".
That said we should be refactoring it soon.
Comment #4
helmo CreditAttribution: helmo commentedI've heard very little about other vcs's ... so lets focus on git here for now.
Comment #5
helmo CreditAttribution: helmo commentedMade some progress, git pull seems functional in sites and platforms.
Comment #6
helmo CreditAttribution: helmo commentedDid some more cleanup.
Started working on a 7.x-1.x branch of provision_git for #2226797: Support platform from git
This is now mostly functional ... some early testing would be welcome.
Comment #7
helmo CreditAttribution: helmo commentedgboudrias now has git access on https://drupal.org/project/hosting_git