1. Code Matters
Eclipse Hackers Git Guide
EclipseCon France 2014
http://eclipse.org/jgit
http://eclipse.org/egit
http://code.google.com/p/gerrit
Matthias Sohn
(SAP)
Mickael Istria
(Red Hat)

2. Introduction
Exercises
Setup & Cloning a Repository
Local Development with EGit
Gerrit Code Review
Q & A
Agenda

3. Version Control
Distributed
Created 2005 for Linux Kernel
Enables collaborative Workflows

4. Git at Eclipse
2010 2011 2012 2014
EGit and JGit
use Git and
Gerrit
Projects could
move to git
Gerrit
available for
all projects
CVS support
ended
2013
SVN support
ends

5. Development with Git
and Eclipse

6. Developer PC
Gerrit
git git
gitgit
Developer PC
git
git
clone repository

7. Sample Application

8. 1 Setup & Clone the example repository
2 Develop a feature
3 Work on branches in parallel
Git Exercises

9. Git in a nutshell

10. Storage

11. Create/checkout commit

12. Commits

13. Branches

14. Branches

15. 4 Merging, Rebasing, Resolving Conflicts
5 History view
6 Interactive rebase
7 Git blame
Git Exercises

16. Gerrit code review

17. Started by Google
for code review
of the Android OS project

18. Gerrit Code Review @ Eclipsehttps://git.eclipse.org/r/ is activated for most projects
Gerrit at Eclipse
Enabled for most projects

19. What is Gerrit ?
Git server
Access control
Code review
Plugins

20. Roles in a Gerrit project
Contributor
Reviewer
Committer
Admin

21. master
Contributor
Reviewer
Fetch / Push
Fetch
CI Build
Server
Fetch
Vote
Gerrit
code review
branches
Fetch
Comment
Vote
Review Process
Submit

22. Commenting

23. Copyright © S. Lay, M. Sohn
Discuss and Improve

24. CI Build
Server
Fetch
Gerrit
Committer
Code Review
+2 approve
+1 ok, not sure
-1 needs improvement
-2 veto
Fetch
Verified
+1 build & test ok
-1 build or test broken
Voting

25. +1 Build / test ok
-1 Build / test failed
+2 Accepted (committer)
+1 Looks ok
-1 Please improve
-2 Veto (committer)
Review feedback

26. Review each commit separately
Amend the commit to react on
feedback -> clean history
Latest commit can be submitted

27. Pushing to Gerrit

28. Demo

29. Gerrit Exercises
1 Configure push to Gerrit
2 Fetch the latest state
3 Push change to Gerrit
4 Review change
5 Improve a change
6 Submit a change
7 New Changescreen
8 View Gerrit review notes

30. New Change Screen

31. Questions ?

32. Evaluate This Session
Visit the voting machine
Use your badge to vote
1
2
http://blog.benjamin-cabe.com/2014/06/10/powering-eclipsecon-france-with-iot-magic