Git For Garage

(cut old information, can be archived somewhere later on)
Line 1: Line 1:
-
The purpose of this page is to describe details of the "Git for [http://garage.maemo.org garage]" project that is being kicked off at the beginning of December 2008.
+
[http://git-scm.com/ Git] is available as an alternative version control system to Subversion for Garage projects.
-
 
+
-
== Background ==
+
-
 
+
-
Garage has been a successful hosting environment for Maemo projects since [http://test.maemo.org/#date_25052006 2006]. The tool that powers garage is [http://gforge.org/ GForge] with [https://garage.maemo.org/projects/garage some modifications] done by the Maemo team. Software projects coming to garage can only use one source code revision control system, that is [http://subversion.tigris.org/ subversion, aka SVN].
+
-
Ever since the [http://kernel.org Linux kernel] has been maintained by [http://git.or.cz/ Git] we have been asked to offer Git for garage projects as well. The time has finally come and we are now developing the changes.
+
-
 
+
-
The [http://gforge.com GForge team] has developed a [http://gforge.com/gf/project/scmgit/ Git plugin] which provides the functionality we are trying to achieve, but their plugin is meant for the [http://gforgegroup.com/es/ Advanced Server edition] of GForge. GForge AS is not in line (both code- and license wise) with the [http://gforge.org/projects/gforge/ open source version] we have at garage. Therefore we decided to write a free plugin for garage, which could be used by 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]. [http://git.or.cz/course/svn.html This great page] helps subversion users to get started with Git commands.
+
-
 
+
-
* In the second phase we will create a web interface for browsing Git trees, viewing commits and diffs. The features will be similar to those available for [https://garage.maemo.org/plugins/scmsvn/viewcvs.php/?root=garage subversion repositories today].
+
-
 
+
-
We will reuse features and probably source codes from existing, open source projects, such as [http://git.or.cz/gitwiki/Gitweb gitweb] or [http://people.proekspert.ee/peeter/git/git.php?p=git-php.git git-php]. The new interface will be seamlessly integrated with the rest of GForge.
+
-
 
+
-
* In the last phase we will try to provide a mechanism for SVN to Git migration. This will help existing projects to convert their repository into Git. Details of this phase is still to be worked out.
+
-
 
+
-
All the software and documentation will be hosted as [http://garage.maemo.org/projects/ggit ggit on garage].
+
-
 
+
-
== Phase 1 ==
+
-
 
+
-
This phase requires a server that for hosting the git repositories. Each project on garage will have its own, dedicated git repository. A repository can have two different operation modes:
+
-
 
+
-
* 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 (i.e. code commits) from anyone (including project members)
+
-
* or it 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, as well as source code that belongs to "hidden garage projects".
+
-
 
+
-
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 the existing HTTP Basic Authentication schema we have for subversion users.
+
-
 
+
-
=== Prerequisites ===
+
-
 
+
-
* Dedicated host for Git repositories and bidirectional SSH and HTTPS connections to garage.
+
-
* DNS entry for the server (suggestion: git.maemo.org)
+
-
 
+
-
=== Estimated Time of Completion ===
+
-
 
+
-
End of week 50, 2008
+
-
+
-
=== Completion ===
+
-
 
+
-
End of week 1, 2009
+
-
 
+
-
== 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.
+
-
 
+
-
=== Prerequisites ===
+
-
 
+
-
* Phase 1 completed
+
-
 
+
-
=== Estimated Time of Completion  ===
+
-
 
+
-
End of week 51, 2008.
+
-
 
+
-
=== Completion ===
+
-
 
+
-
January, 2009.
+
-
 
+
-
== 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 into a Git tree. After the migration is completed the projects can disable their subversion repository and continue their work in Git.
+
-
 
+
-
=== Prerequisites ===
+
-
 
+
-
* Phase 1 and Phase 2 completed
+
-
 
+
-
=== Estimated Time of Completion ===
+
-
 
+
-
End of week 3, 2009.
+
-
 
+
-
=== Completion ===
+
-
 
+
-
Still open.
+
-
 
+
-
== Acronyms ==
+
-
 
+
-
{| border="1" cellpadding="2" cellspacing="0"
+
-
|-
+
-
! Acronym
+
-
! Meaning
+
-
|-
+
-
| git
+
-
| British English slang for a stupid or unpleasant person [http://en.wikipedia.org/wiki/Git_(software)#Name]
+
-
|-
+
-
| GForge AS
+
-
| GForge Advanced Server Edition [http://gforgegroup.com/es/]
+
-
|-
+
-
| SVN
+
-
| subversion
+
-
|-
+
-
| VCS
+
-
| Version Control System
+
-
|-
+
-
| WebDAV
+
-
| Web-based Distributed Authoring and Versioning
+
-
|-
+
-
| HTTPS
+
-
| Hypertext Transfer Protocol over Secure Socket Layer
+
-
|-
+
-
|}
+
-
 
+
[[Category:Community]]
[[Category:Community]]
[[Category:Development]]
[[Category:Development]]
[[Category:maemo.org]]
[[Category:maemo.org]]

Revision as of 10:59, 2 February 2010

Git is available as an alternative version control system to Subversion for Garage projects.