Git For Garage

(Phase 1)
Line 27: Line 27:
== Phase 1 ==
== Phase 1 ==
-
This phase requires a server that is to be used for hosting the git repositories. Each project on garage will have its own, dedicated git repository. The server and the GForge frontend will communicate via [http://www.webdav.org/ WebDAV] over HTTPS. This will ensure a safer way for submitting passwords over the wire. In order to setup this backend we will consult the [http://www.kernel.org/pub/software/scm/git/docs/howto/setup-git-server-over-http.txt instructions from Rutger Nijlunsing] and will reuse our existing HTTP Basic Authentication schema we have for subversion users.
+
This phase requires a server that is to be used for hosting the git repositories. Each project on garage will have its own, dedicated git repository. A repository can have two different modes of operation:  
-
On the GForge side we will create a plugin, that will first offer a web interface for browsing the git repositories. Later this can be extended with other functionality to support more git commands.
+
* it can either be in '''mirror mode''', which is meant for mirroring an existing git repository hosted elsewhere. In this mode the system will automatically mirror the selected git repo using a cron job. This repository will not accept pushes (ie. code commits) from project members
 +
* or can act as a '''push repo''', where project members will be able to directly commit their changes
 +
 
 +
The server and the GForge frontend will communicate via [http://www.webdav.org/ WebDAV] over HTTPS. This will ensure a safer way for submitting passwords over the wire. In order to setup this backend we will consult the [http://www.kernel.org/pub/software/scm/git/docs/howto/setup-git-server-over-http.txt instructions from Rutger Nijlunsing] and will reuse our existing HTTP Basic Authentication schema we have for subversion users.
Estimated Time of Completion: end of week 50, 2008
Estimated Time of Completion: end of week 50, 2008
== Phase 2 ==
== Phase 2 ==
 +
 +
During this phase we will write a GForge plugin in PHP that will offer a web interface for browsing the git repositories. With the help of this tool one can also view syntax highlighted diffs between revisions. Later the plugin can be extended with other functionality to support more git commands, and eventually offer a full web based repository management.
Estimated Time of Completion: end of week 51, 2008
Estimated Time of Completion: end of week 51, 2008
== Phase 3 ==
== Phase 3 ==
 +
 +
The current plan is to offer a web front-end for migrating subversion repositories to git. On the server side we try to use [http://www.kernel.org/pub/software/scm/git/docs/git-svn.html git-svn] to get the selected or all svn revisions and "import" them to a git tree. After the migration is completed the projects can disable the subversion repository and continue the work in git.
Estimated Time of Completion: end of week 3, 2009
Estimated Time of Completion: end of week 3, 2009

Revision as of 20:01, 30 November 2008

Contents

Overview

The purpose of this page is to describe details of the "Git for garage" projects that is being kicked off at the beginning of December, 2008.

Background

Garage have been a successful hosting environment for maemo projects since 2006. The tool that powers garage is GForge with some modifications done by the maemo team. Software projects coming to garage can only use one source code revision control system, that is subversion, aka svn. Ever since the Linux kernel is maintained by git we had been asked to offer git for garage projects as well. The time has finally came and we are now developing the changes.

The GForge team has developed a git plugin which provides the functionality we are trying to achieve, but their plugin is meant for the Advanced Server edition of GForge. GForge AS is not in line (both code- and license wise) with the open source version we have at garage. Therefore we decided to write a free plugin for garage, which could be used by on any GForge 4.5.20+ installations.

Plans

The full git offering for maemo projects will come in 3 phases.

  • In the first phase we will offer git for the new garage projects. These projects may choose git as their VCS. They will get a repository on a maemo server (the name will be probably git.maemo.org) which they can start using immediately. Project members will automatically get commit access, while non-members will be able to pull code using [standard git tools]. This great page helps subversion users to get started with git commends.
  • In the second phase we create a web interface for browsing git trees, viewing commits and diffs. The features will be similar to those available for subversion repositories today.

We will reuse features and probably source codes from existing, open source projects, such as gitweb or git-php. The new interface will be seamlessly integrated with the rest of GForge.

  • In the last phase we try to provide mechanisms for svn to git migration. This will help existing projects to convert their repository into git. Details of this phase still to be worked out.

All the software and documentation will be hosted as ggit on garage.


Phase 1

This phase requires a server that is to be used for hosting the git repositories. Each project on garage will have its own, dedicated git repository. A repository can have two different modes of operation:

  • it can either be in mirror mode, which is meant for mirroring an existing git repository hosted elsewhere. In this mode the system will automatically mirror the selected git repo using a cron job. This repository will not accept pushes (ie. code commits) from project members
  • or can act as a push repo, where project members will be able to directly commit their changes

The server and the GForge frontend will communicate via WebDAV over HTTPS. This will ensure a safer way for submitting passwords over the wire. In order to setup this backend we will consult the instructions from Rutger Nijlunsing and will reuse our existing HTTP Basic Authentication schema we have for subversion users.

Estimated Time of Completion: end of week 50, 2008

Phase 2

During this phase we will write a GForge plugin in PHP that will offer a web interface for browsing the git repositories. With the help of this tool one can also view syntax highlighted diffs between revisions. Later the plugin can be extended with other functionality to support more git commands, and eventually offer a full web based repository management.

Estimated Time of Completion: end of week 51, 2008

Phase 3

The current plan is to offer a web front-end for migrating subversion repositories to git. On the server side we try to use git-svn to get the selected or all svn revisions and "import" them to a git tree. After the migration is completed the projects can disable the subversion repository and continue the work in git.

Estimated Time of Completion: end of week 3, 2009

Acronyms

Acronym Meaning
GForge AS GForge Advanced Server Edition [1]
VCS Version Control System
WebDAV Web-based Distributed Authoring and Versioning
HTTPS Hypertext Transfer Protocol over Secure Socket Layer