Vedanshu Jain 7:44 pm on February 27, 2019
Tags: wordcamp ( 41 )

Replacing SVN with Git for wordcamp.org’s code

WordCamp.org’s code currently uses SVNSVN Apache Subversion (often abbreviated SVN, after its command name svn) is a software versioning and revision control system. Software developers use Subversion to maintain current and historical versions of files such as source code, web pages, and documentation. Its goal is to be a mostly compatible successor to the widely used Concurrent Versions System (CVS). WordPress core and the wordpress.org released code are all centrally managed through SVN. https://subversion.apache.org/. as the primary tool of version control hosted on the Meta SVN repo. For the last several months we have also been experimenting with GitGit Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Git is easy to learn and has a tiny footprint with lightning fast performance. Most modern plugin and theme development is being done with this version control system. https://git-scm.com/. to see if it improves the development workflow.

Currently there is a GitHub repo which is set up as the mirror of the official SVN repo of WordCamp.org’s code. This repo is used to hold code reviews, and sync with SVN with every new commit.

So far this setup has been a big help in making it easier to get and give reviews, therefore improving code quality. Many basic features in Git like commit, stash, branch etc have been a delight to use in place of their SVN counterparts because of Git’s decentralized nature.

At this point it’s worth discussing removing SVN altogether, from at least the local development flow. Right now the process is prone to errors, not easy to set up, and has an extra step of manually syncing Git with latest changes in SVN.

New proposed process

It seems like a good idea to change the version control system as follows:

Make the GithubGitHub GitHub is a website that offers online implementation of git repositories that can easily be shared, copied and modified by other developers. Public repositories are free to host, private repositories require a paid subscription. GitHub introduced the concept of the ‘pull request’ where code changes done in branches by contributors can be reviewed and discussed before being merged be the repository owner. https://github.com/ repo the primary destination for code reviews. It will be configured on the local system of whoever wants to contribute to WordCamp.org’s code, and will be the primary place to work and develop.

Keep SVN as part of the release process. That is, whenever code is deployedDeploy Launching code from a local development environment to the production web server, so that it's available to visitors. changes will be synced from Git to SVN and start the deployDeploy Launching code from a local development environment to the production web server, so that it's available to visitors. process. This process will be manual (or at least will be triggered manually) and SVN will be used only as a release tool (i.e. aim is not to preserve commit metadata like author, commit message etc). This approach has two main benefits:
1. No changes to deploy scripts will be necessary to use Git. These script are used while pushing code from latest SVN revision to WordCamp.org’s server. They would continue using SVN as before.
2. No dependence on an external tool in order to deploy changes. For example, Github going down will not affect us in case we want to push an emergency fix.

Commits with their authors have already been imported from the SVN repo into the Github repo.

Share your thoughts

Do you have any technical concerns about moving from SVN to Git? Do you suggest any changes to the process?

If the development process is indeed changed, it might be a good idea to also think about importing issues from MetaMeta Meta is a term that refers to the inside workings of a group. For us, this is the team that works on internal WordPress sites like WordCamp Central and Make WordPress. TracTrac Trac is the place where contributors create issues for bugs or feature requests much like GitHub.https://core.trac.wordpress.org/. to Github that are reported for WordCamp.org and its components. Do you have any concerns about importing issues into Github, or should they continue to exist in Trac?

Please leave your suggestions and feedback in a comment on this post.

#wordcamp

Ian Dunn 8:00 pm on February 27, 2019

cc @barry
Stephen Edgar 2:26 am on February 28, 2019

GitGit Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Git is easy to learn and has a tiny footprint with lightning fast performance. Most modern plugin and theme development is being done with this version control system. https://git-scm.com/. mirrors already exist for the metaMeta Meta is a term that refers to the inside workings of a group. For us, this is the team that works on internal WordPress sites like WordCamp Central and Make WordPress. repo at:
> git://meta.git.wordpress.orgWordPress.org The community site where WordPress code is created and shared by the users. This is where you can download the source code for WordPress core, plugins and themes as well as the central location for community conversations and organization. https://wordpress.org//

Via https://make.wordpress.org/core/2014/01/15/git-mirrors-for-wordpress/

Is it worth exploring switching all of meta to Git at the same time instead of just one part thereof?

And, if so, is it just a matter of enabling commit by Git to the existing meta.git.wordpress.org repo?

** Note: Not that flicking that enable Git commit switch is all that would be required, lots of other tasks would be required to switching everything to Git first, SVNSVN Apache Subversion (often abbreviated SVN, after its command name svn) is a software versioning and revision control system. Software developers use Subversion to maintain current and historical versions of files such as source code, web pages, and documentation. Its goal is to be a mostly compatible successor to the widely used Concurrent Versions System (CVS). WordPress core and the wordpress.org released code are all centrally managed through SVN. https://subversion.apache.org/., second.
- Vedanshu Jain 10:37 am on February 28, 2019
  
  GitGit Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Git is easy to learn and has a tiny footprint with lightning fast performance. Most modern plugin and theme development is being done with this version control system. https://git-scm.com/. mirrors already exist for the metaMeta Meta is a term that refers to the inside workings of a group. For us, this is the team that works on internal WordPress sites like WordCamp Central and Make WordPress. repo at:
  > git://meta.git.wordpress.orgWordPress.org The community site where WordPress code is created and shared by the users. This is where you can download the source code for WordPress core, plugins and themes as well as the central location for community conversations and organization. https://wordpress.org//
  
  Is it worth exploring switching all of meta to Git at the same time instead of just one part thereof?
  
  I think we should only switch one component this time because, as you said, there are a lot of task that will be required to make Git first and SVNSVN Apache Subversion (often abbreviated SVN, after its command name svn) is a software versioning and revision control system. Software developers use Subversion to maintain current and historical versions of files such as source code, web pages, and documentation. Its goal is to be a mostly compatible successor to the widely used Concurrent Versions System (CVS). WordPress core and the wordpress.org released code are all centrally managed through SVN. https://subversion.apache.org/. second.
  
  This is also one of the reason for a different GithubGitHub GitHub is a website that offers online implementation of git repositories that can easily be shared, copied and modified by other developers. Public repositories are free to host, private repositories require a paid subscription. GitHub introduced the concept of the ‘pull request’ where code changes done in branches by contributors can be reviewed and discussed before being merged be the repository owner. https://github.com/ repo, since mirror is for all meta sites and not just WordCamp.org.
Pascal Casier 4:52 pm on March 4, 2019

Hi, most of us already have our code on GitHubGitHub GitHub is a website that offers online implementation of git repositories that can easily be shared, copied and modified by other developers. Public repositories are free to host, private repositories require a paid subscription. GitHub introduced the concept of the ‘pull request’ where code changes done in branches by contributors can be reviewed and discussed before being merged be the repository owner. https://github.com/, so switching there would be awesome. Please make sure to keep all the info for the local sandboxes aligned if anything changes: https://make.wordpress.org/community/handbook/wordcamp-organizer/first-steps/web-presence/contributing-to-wordcamp-org/setting-up-a-local-wordcamp-org-sandbox/

Oh BTW, the link there still points to ‘iandunn’ but is then autoredirecting.
Timi Wahalahti 5:05 pm on March 4, 2019

Moving to GitGit Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Git is easy to learn and has a tiny footprint with lightning fast performance. Most modern plugin and theme development is being done with this version control system. https://git-scm.com/. and GithubGitHub GitHub is a website that offers online implementation of git repositories that can easily be shared, copied and modified by other developers. Public repositories are free to host, private repositories require a paid subscription. GitHub introduced the concept of the ‘pull request’ where code changes done in branches by contributors can be reviewed and discussed before being merged be the repository owner. https://github.com/ sounds really good from the perspective of time-to-time contributor on wc.org sites and components. It would really help, make contributing easier and hopefully attract some new contributors also.

It might be a good idea to also think about importing issues from MetaMeta Meta is a term that refers to the inside workings of a group. For us, this is the team that works on internal WordPress sites like WordCamp Central and Make WordPress. TracTrac Trac is the place where contributors create issues for bugs or feature requests much like GitHub.https://core.trac.wordpress.org/. to Github that are reported for WordCamp.org and its components. Do you have any concerns about importing issues into Github, or should they continue to exist in Trac?

Is there a tool for making that import? How does importing a patch etc technically work?

Also if the tickets will be imported, could we have a ticket-scrub before the import? For marking some obsolete tickets, so that un-necessary issues will not come up.
- Vedanshu Jain 8:12 am on March 5, 2019
  
  Is there a tool for making that import? How does importing a patch etc technically work?
  
  A reasonable solution could be to upload patch file as an attachment, or just add a link to the patch as part of the issue description. There are some tools that can do that, but from my reading its not very clear how will they handle a patch.
  
  Also if the tickets will be imported, could we have a ticket-scrub before the import? For marking some obsolete tickets, so that un-necessary issues will not come up.
  
  +1
David Ryan 5:17 pm on March 4, 2019

I love, love, love the idea of switching to GitGit Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Git is easy to learn and has a tiny footprint with lightning fast performance. Most modern plugin and theme development is being done with this version control system. https://git-scm.com/. for WC.org!

My only two cents:
In discussion with moving CoreCore Core is the set of software required to run WordPress. The Core Development Team builds WordPress. to git, one requirement is keeping read-only SVNSVN Apache Subversion (often abbreviated SVN, after its command name svn) is a software versioning and revision control system. Software developers use Subversion to maintain current and historical versions of files such as source code, web pages, and documentation. Its goal is to be a mostly compatible successor to the widely used Concurrent Versions System (CVS). WordPress core and the wordpress.org released code are all centrally managed through SVN. https://subversion.apache.org/. (because of how many systems rely on it). Many fewer external servers will rely on SVN for this repository, but if it’s fairly simple/manageable to maintain, we should keep read-only SVN. But, if read-only SVN is a cumbersome nightmare… think it’s probably fine to fully cleave SVN 🙂
- Vedanshu Jain 8:15 am on March 5, 2019
  
  In the current approach, the plan is to keep current SVNSVN Apache Subversion (often abbreviated SVN, after its command name svn) is a software versioning and revision control system. Software developers use Subversion to maintain current and historical versions of files such as source code, web pages, and documentation. Its goal is to be a mostly compatible successor to the widely used Concurrent Versions System (CVS). WordPress core and the wordpress.org released code are all centrally managed through SVN. https://subversion.apache.org/. as part of the release approach exactly because of many system relying on it. But hopefully SVN will not be there in local development flow.
  So I guess if we move, then the current SVN repo can be thought of as a ready-only repo.
  - Ian Dunn 11:30 pm on March 13, 2019
    
    We’d want to keep the `wordcampWordCamp WordCamps are casual, locally-organized conferences covering everything related to WordPress. They're one of the places where the WordPress community comes together to teach one another what they’ve learned throughout the year and share the joy. Learn more.` repo for deploys, but I’m not sure about the `wordcamp.org` folder inside the `metaMeta Meta is a term that refers to the inside workings of a group. For us, this is the team that works on internal WordPress sites like WordCamp Central and Make WordPress.` repo. The only reason I can see to keep it would be the issue with external things that David mentioned. I’m guessing it’s small enough that it wouldn’t be an issue, though. Since GitHubGitHub GitHub is a website that offers online implementation of git repositories that can easily be shared, copied and modified by other developers. Public repositories are free to host, private repositories require a paid subscription. GitHub introduced the concept of the ‘pull request’ where code changes done in branches by contributors can be reviewed and discussed before being merged be the repository owner. https://github.com/ supports SVNSVN Apache Subversion (often abbreviated SVN, after its command name svn) is a software versioning and revision control system. Software developers use Subversion to maintain current and historical versions of files such as source code, web pages, and documentation. Its goal is to be a mostly compatible successor to the widely used Concurrent Versions System (CVS). WordPress core and the wordpress.org released code are all centrally managed through SVN. https://subversion.apache.org/., it’d be pretty simple for anyone to migrate as well.
Ulrich 6:06 pm on March 4, 2019

How would current open tracTrac Trac is the place where contributors create issues for bugs or feature requests much like GitHub.https://core.trac.wordpress.org/. ticket be handled? Are GitHubGitHub GitHub is a website that offers online implementation of git repositories that can easily be shared, copied and modified by other developers. Public repositories are free to host, private repositories require a paid subscription. GitHub introduced the concept of the ‘pull request’ where code changes done in branches by contributors can be reviewed and discussed before being merged be the repository owner. https://github.com/ Issues going to be used in the future or will they be disabled in the time being and trac used instead?

Generally support the idea to switch.

It might be good to think about the administrative side of things too. Issue Templates or PR merging best practices.
- Vedanshu Jain 8:18 am on March 5, 2019
  
  How would current open tracTrac Trac is the place where contributors create issues for bugs or feature requests much like GitHub.https://core.trac.wordpress.org/. ticket be handled? Are GitHubGitHub GitHub is a website that offers online implementation of git repositories that can easily be shared, copied and modified by other developers. Public repositories are free to host, private repositories require a paid subscription. GitHub introduced the concept of the ‘pull request’ where code changes done in branches by contributors can be reviewed and discussed before being merged be the repository owner. https://github.com/ Issues going to be used in the future or will they be disabled in the time being and trac used instead?
  
  This is also part of the discussion. On one hand it would be cleaner to move open Trac tickets to Github, and this will also prevent going back and forth from Trac to Github.
  
  But on another hand, this adds some more work, which admittedly we would have to do at some point of time if we go ahead with Github.
Robin Chalia 12:38 pm on May 8, 2023

I guess we can pretty easily achieve this by having it automated in git CI/CD. 🙂

Welcome to the MetaMeta Meta is a term that refers to the inside workings of a group. For us, this is the team that works on internal WordPress sites like WordCamp Central and Make WordPress. Team!

Contact

Replacing SVN with Git for wordcamp.org’s code

Welcome to the MetaMeta Meta is a term that refers to the inside workings of a group. For us, this is the team that works on internal WordPress sites like WordCamp Central and Make WordPress. Team!

Contact

Share this: