Difference between revisions of "Jetty/Contributor/DevelopingWithGit"

Revision as of 17:05, 24 February 2012

Obtaining code via GIT

Jetty has its source control on dev.eclipse.org, which is accessible via two different urls.

• (Anonymous, read-only access) http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/
• (Developers, read-write, requires account on dev.eclipse.org) svn+ssh://{userid}@dev.eclipse.org/svnroot/rt/org.eclipse.jetty/

Choose your access technique and follow along ...

1. To start, you'll want to make sure you have git-svn installed. You can do that by checking if there is help for you:
   

   git svn --help

2. Next, you'll want to use the git-svn to clone the subversion tree to your local disk. The command line is a bit long, so here is a helper bash script to make this task a bit easier:

#!/bin/bash
JETTYSVNROOT=http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty
git svn clone -r HEAD \
 --branches $JETTYSVNROOT/branches \
 --tags $JETTYSVNROOT/tags \
 --trunk $JETTYSVNROOT/trunk \
 $JETTYSVNROOT

This pulls the jetty tree from subversion, from the HEAD revision, via git-svn, to your local disk as a directory called "jetty".

You now have the codebase in git format to work with.

Recommended Eclipse Plugins

Maven Integration - m2eclipse Update Site: http://m2eclipse.sonatype.org/update

GIT Team Provider - jgit Update Site: http://www.jgit.org/updates

Import into Eclipse

Tip: build the checked out codebase on the command line to make the various dependencies available for use eclipse. See Building for details. (This is likely to improve in the future with more m2eclipse plugin releases)

To import Jetty into Eclipse do the following ...

1. Start Eclipse
2. Ensure above Recommended Eclipse Plugins are installed.
3. Open the "Import Maven Projects" dialog by going to File > Import ... > General > Maven Projects
4. Browse to the 'git-svn' cloned directory for Jetty and import all projects.

GIT From a Subversion Users Point of View

Git, like subversion, is at home on the command line. However, unlike subversion, git can operate entirely without network access.

When you modify files and commit them, you are only commiting them to the local Git repository that you have recently checked out. Those changes do not exist outside of your own personal git repository.

The Git - SVN Crash Course is a good references for those familiar with subversion, but are new to git. The crash course gives a comparison of popular Subversion commands and what their Git equivalents are.

The "git svn clone" command you did at the beginning of this article is only done once. From here on out, here's a few of the most common commands.

git svn rebase

Performs an update from the subversion repository at dev.eclipse.org to your local git repository, of the active branch, followed by a merge of active content into your local changes.

git svn dcommit

Performs a push of the changes in your active git repository branch to the subversion repository at dev.eclipse.org

git commit

Performs a local commit of changes to your local git repository

git status

Shows a status of the changes made in your working directory (pending commits, modified files, untracked files, etc...)

git log

Shows a log of changes in your local git repository.

NOTE: Your local changes will always be at the top of this log, other entries below your changes will show a 'git-svn-id' message indicating that it is content being tracked from the Subversion repository.

git add {filename}

Adds a file to the pending commit to your local git repository.