Jump to: navigation, search

Difference between revisions of "CDT/git"

< CDT
(Using Gerrit for CDT)
(Using Gerrit for CDT)
Line 172: Line 172:
 
Once you have setup your gerrit remote you should:  
 
Once you have setup your gerrit remote you should:  
  
#Commit the code you want to review to a branch. That branch does not need to be the master branch, but it should have the latest code (rebased to master). When doing the commit, make sure the gerrit ChangeId is added at the end of the commit comment, to allow to link further commits to this commit review.  With EGit simply press the "Compute ChangeId for Gerrit code review button" when doing your commit, as shown below (don't worry if the change id is all zeros at first, it will get filled in once the commit is done):
+
*Commit the code you want to review to a branch. That branch does not need to be the master branch, but it should have the latest code (rebased to master). When doing the commit, make sure the gerrit ChangeId is added at the end of the commit comment, to allow to link further commits to this commit review.  With EGit simply press the "Compute ChangeId for Gerrit code review button" when doing your commit, as shown below (don't worry if the change id is all zeros at first, it will get filled in once the commit is done):
 
<br>
 
<br>
 
[[Image:Changeid.png]]
 
[[Image:Changeid.png]]
 
<br>
 
<br>
#Right-click on the repo in the Git Repositories view and select "Push..."  
+
*Right-click on the repo in the Git Repositories view and select "Push..."  
#Select the gerrit remote and press Next  
+
*Select the gerrit remote and press Next  
#The push should be from the branch that has the changes towards /refs/for/master. Complete the push.  
+
*The push should be from the branch that has the changes towards /refs/for/master. Complete the push.  
#Go to https://git.eclipse.org/r/#/q/status:open+project:cdt/org.eclipse.cdt,n,z and you should see the change you just pushed (assuming you are watching the CDT project; if not, you can find it in the All section).
+
*Go to https://git.eclipse.org/r/#/q/status:open+project:cdt/org.eclipse.cdt,n,z and you should see the change you just pushed (assuming you are watching the CDT project; if not, you can find it in the All section).
  
 
=== Miscellaneous  ===
 
=== Miscellaneous  ===

Revision as of 14:56, 16 April 2012

To make it easier for adoptors and contributors to work with the CDT source, we moved to GIT source control system June 24th 2011. Old CVS repo is read only now.

This document will ultimately be the guide for using git and egit with CDT.

Source Repositories

CDT is now broken into two git repos. You can view repos at http://git.eclipse.org/c/. Core cdt org.eclipse.cdt.git, EDC repo is org.eclipse.cdt.edc.git. If you want to practice there are also test repos, test3/*...

Committers will want to access the master repository via ssh

  ssh://userid@git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git

where "userid" is your Commiter login name (what you used with CVS and what you use with My Foundation Portal).

Everyone else will use either of the following URLs

  git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git
  http://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git

Click here for further information on the Git repos available to CDT developers

Screencasts

Doug Schaefer has posted numerous screencasts on using git with Eclipse

Setting up your workspace with the CDT Repo

Follow these instructions to get working with the CDT repo out on eclipse.org.

Main CDT

  • Eclipse Setup
  • Check out build dependencies
    • (Optional) If you are using lp-parsers: from anonymous@dev.eclipse.org:/cvsroot/tools, org.eclipse.orbit, checkout the 1.1 version of net.sourceforge.lpg.lpgjavaruntime
    • (Optional) If you are using test plugins: anonymous@dev.eclipse.org:/cvsroot/eclipse, checkout the following
      • org.eclipse.test.performance
  • Setup Git credentials
    • eGit wiki says that it would pop-up dialog for e-mail and name of committer. I did not see it. You have to set it up manually if you did not see the dialog
    • Windows->Preferences search Git, select Configuration->User Settings
    • Click New Entry... add key[user.name] value[your name]
    • Click New Entry... add key[user.email] value[your committer e-mail]
    • Click ok
  • Clone the repo. See either Doug's video http://www.youtube.com/watch?v=O4rDgx6-B6Q here or instructions below:
    • From the Git perspective, select clone repo action
      • Cut & Paste url below in the first page of wizard for cloning
      • Enter your committer credentials or anonymous (for permanent credentials use ssh keys see below).
      • It will ask you what branches to import. If you only care about head select master, if you want to work with other branches select a corresponding branch, for example cdt_8_0.
      • Press Next. As location where files are stored select a folder inside your workspaces, for example workspace/cdt-git
      • Press Finish (skip Gerrit page)
      • This should take about 3-5 minutes
    • From the repo, select Import Projects...
      • Select all the projects or individual. Project filter does not seems to work. It maybe easier select all, then close projects you don't need
    • Let the build run. To build properly you should have set API baseline, see comment above about API baseline.
  • Another video http://www.youtube.com/user/cdtdoug#p/a/u/1/I5uq6dWdi0w


And that's it. One way to test you have everything is to try and Export the master feature. That'll give you everything our official builds do.

Please also read CDT/policy if you are new committer or want to contribute to CDT. Also check CDT/contributing wiki on how to contribute a patch.

There is also wiki for eclipse/git marriage here - http://wiki.eclipse.org/Git

EDC

More for EDC soon.

Setting up SSH keys for committers

Doug has video about setting up ssh keys http://www.youtube.com/watch?v=WU9xYP_NScQ&feature=related.

  • To make it work first send request to webmaster@eclipse.org and ask for unrestricted shell, they will give you shell for 24 hours.
  • Generate ssh keys using puttygen or ssh-keygen tools (mingw for windows, native for mac and linux)
  • In Windows->Preferences search for SSH and load you key (private one) in the private key list

Upload keys using web page

Manually upload key using shell (you may require to contact admin to get a shell access first)

  • Login to git.eclipse.org using your committer login and password
mkdir .ssh
chmod 700 .ssh
cd .ssh
cat >> authorized_keys #or open in vi
<paste your public key here>
^D
chmod 600 authorized_keys
  • You can use more than one key if you want to login from diffrent hosts (or you can save key on diffrent hosts - up to you)
  • If you do all this stuff eGit won't ask 10 times for your password anymore!

Updating

  • Analog of svn update is git pull, you can use Pull from git repo
  • However it creates spaghetti like history, so if you only apply one bug a time, cleaner "update" is
    • Fetch
    • Rebase
  • Since it is ugly to do two commands instead of one, you can set up Pull to do that instead of Fetch/Merge
    • You need to set branch.autosetuprebase=always and branch.<name>.rebase=true in git configuration to achieve that

Committing to remote repository

  • Checkout the branch you want to commit changes, for example local:master -> remote:master
  • If it is already checked out, try Fetch to make sure it is in sync
  • Apply patch
  • Commit. Specify Author - contributor of the patch, and yourself as Committer
  • Push.
    • If push failed, you may not be having latest version. In this case Rebase to respective remote branch. It will undo your patch, then fetch, then apply your patch.
  • Fetch. This will synchronize your local branch with latest "push" which is kind of stupid because it was your own push that you just did.

In history view you should see

[master][origin/master][HEAD] Bug xxx - your fix

Committing to two branches

Let say we have a patch and we want to commit fix to cdt_8_0 branch and master

  • Make sure you have both branches in your Local branches list
    • If not create another missing one (from respective remote one)
  • Checkout cdt_8_0
  • Fetch
  • Apply patch
  • Commit patch
  • Checkout master
  • Open History view
  • Make sure button "Show all branches" checked
  • Find your commit
  • Right click on it and Select Cherry Pick, that should apply it to master branch
  • Push (make sure both branches are selected in the dialog to push). Both changes would be pushed now.
  • Fetch
  • Checkout cdt_8_0

At the end of this beauty your history view should show

[master][origin/master] Bug xxx - your fix
[cdt_8_0][origin/cdt_8_0][HEAD] Bug xxx - your fix

Using Gerrit for CDT

This section is currently a work in progress

Create a Gerrit account:

  1. Go to https://git.eclipse.org/r
  2. If you are a committer, click Sign In. You will be asked to upload you SSH public key.
  3. If you are not a committer, click Register and create an account.

Setup a Gerrit remote on your local git repo of CDT. Below is the procedure using EGit:

  1. Open 'git repositories' view
  2. Expand the repo that corresponds to the CDT repo
  3. Right-click on 'Remotes' and select "Create remote..."
  4. Give it a name like "gerrit_eclipse" and leave "configure push" selected
  5. Click on the 'Change...' button, next to the 'URI' text box
  6. Use one of the following URI, depending on if you are a committer, and/or you have firewall limitation:
ssh://<commiterId>@git.eclipse.org:29418/cdt/org.eclipse.cdt.git
https://git.eclipse.org/r/p/cdt/org.eclipse.cdt.git
    • In the Ref mapping section, add a RefSpec specification of
HEAD:refs/for/master

Once you have setup your gerrit remote you should:

  • Commit the code you want to review to a branch. That branch does not need to be the master branch, but it should have the latest code (rebased to master). When doing the commit, make sure the gerrit ChangeId is added at the end of the commit comment, to allow to link further commits to this commit review. With EGit simply press the "Compute ChangeId for Gerrit code review button" when doing your commit, as shown below (don't worry if the change id is all zeros at first, it will get filled in once the commit is done):


Changeid.png

  • Right-click on the repo in the Git Repositories view and select "Push..."
  • Select the gerrit remote and press Next
  • The push should be from the branch that has the changes towards /refs/for/master. Complete the push.
  • Go to https://git.eclipse.org/r/#/q/status:open+project:cdt/org.eclipse.cdt,n,z and you should see the change you just pushed (assuming you are watching the CDT project; if not, you can find it in the All section).

Miscellaneous

  • Cancelling a review
    • If you have submitted a patch set for review but want cancel that submission you should 'Abandon' it. The 'Abandon' button is only available to the submitter and is located below each patch set entry within the review as shown below:


Abandon.png

  • Un-marking a file that was automatically marked as reviewed
    • Select the file
    • Select the 'Preferences' menu at the top of the page
    • The right-most option is 'review'. You can uncheck that.


CDT Gerrit Unreview.png

Posting patches on Bugzilla

Until Eclipse provides a Gerrit instance for all projects to use, the mechanism for community contributions remains patches attached to Bugzilla items. So, if you are interested in developing a fix for a particular bug, follow these simple steps:

  1. Clone the CDT repo as per above if you haven't already done so.
  2. Create a branch for your bug.
  3. Develop the fix. Commit changes to your branch as required. Note that to create a patch, you can only use a single commit; therefore, if you want to make changes after that first commit, you should select the 'Amend previous commit' button, on the right-top side of the commit dialog.
  4. Once your work is stable and ready to go, create the patch. This is easiest done in the History view. Be aware that a patch can only be created for a single commit.
    1. Be sure to be looking at the History of the entire CDT repository (in the Git Repositories view, select the top element of the repo and choose 'Show in -> History')
    2. Select the commit from which you want to create the patch. Probably this is the last on your branch.
      Create patch menu
    3. In the dialog, save the patch to a file.
      Save to a file
    4. Make sure that the option to save in Git format is selected; this is on the next wizard page. This provides more useful context about the patch, including the commit on which it was based.
      Git format
  5. Now, you have a patch file that you can attach to a Bugzilla as before in when CDT was hosted in a CVS repo.