Linus Torvalds inventor of Linux wanted a better source control system so he wrote one

Transcription

1 Constellations on i Orion, Git and RPG Jesse Gorzinski jgorzins@us.ibm.com IBM i Emerging Solutions Git what is it? Linus Torvalds inventor of Linux wanted a better source control system so he wrote one Very popular in the open source community and increasingly in enterprises Distributed Version Control System Some distinctives NOT a server! Just a simple executable Stores all of its meta data in one.git directory at the root of your repository Very fast! 1

2 Snapshots, Not Differences -> Nearly every operation local -> FAST!! Other VCS store deltas from the original Git stores full copies (links, compressed) Everyone has a full repository Nearly every operation is local Full redundancy with all other repositories From Hash codes All content is check-summed into a SHA-1 hash code From then on the file is referred to by that hash code Probability of collision is very small ~ # of sand grains on earth => the content is tracked so empty directories are not Commits are also referred to by a hash code 2

3 Small & Fast! source: High-level flow 3

4 Staging area? Before the commit, files get "staged" Why? Commit only one of several changed files Commit only a portion of a changed file! Branching and Merging image source= 4

5 Cherry-picking source: Cherry-picking source: 5

6 Git hooks To install a git hook, just put an executable file in the hooks directory The name of the file is the hook Example, to install a post-receive hook, do this from the.git/hooks directory (depending on how you created the repository, the hooks directory may need to be created) Then, populate the file with the commands needed git hooks ( applypatch-msg pre-applypatch post-applypatch pre-commit prepare-commit-msg commit-msg post-commit pre-rebase post-checkout post-merge pre-push pre-receive update post-receive post-update push-to-checkout pre-auto-gc post-rewrite rebase 6

7 Git hook example SSH To communicate with repository via SSH, you need to give them your public SSH key for password-less authentication. ssh-keygen creates necessary files $ ssh-keygen $ ls ~/.ssh authorized_keys id_rsa known_hosts id_rsa.pub Copy/paste id_rsa.pub into GitHub/Bitbucket web interface $ cat ~/.ssh/id_rsa.pub ssh-rsa AAAABxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxpomipqnexxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxlump4zhi4bqghil team@litmis.com ssh-keygen contained in 5733SC1 IBM Portable Utilities for i5/os *BASE & Option 1 bit.ly/5733sc1-op1-5733sc1 instructions 7

8 Where can I get Git? Can download to your PC Can add to your Eclipse Can use right now and have it hosted in the cloud this how a lot of open source is developed Or Install it on your IBM i! 5733-OPS option 6 And then install PTF Coming soon Follow DeveloperWork Page on 5733OPS Orion Zero install runs in the browser on any platform cheaper, easier than SEU Powerful Web Editor - Supports open source languages AND free form RPG Compact Git UI - Strong git source control support in elegant and powerful single page layout Versatile theming editor can be light, dark by customization or importing themes 8

9 Free form RPG in Orion! Industry pundits have already published articles Aaron Bartell published an article just recently on Orion/RPG He told me that he had the most screen caps in any article he has ever written Detailed scenario of how to develop in RPG using Orion 9

10 Think through the implications of editing RPG in a browser You can now edit RPG on any device that has a browser Windows Linux Mac Tablet Phone Etc. It requires no installation per user Orion - Language Support First class editor support for JavaScript HTML CSS Basic editing for Free form RPG Python PHP C/C++ Ruby Etc. 10

11 Orion is actively being developed key part of IBM s strategic BlueMix Where can I get Orion? See Can download to your PC Can use right now and have it hosted in the cloud Or Install it on your IBM i! 5733-OPS option 8 And then install PTF Coming soon Follow DeveloperWork Page on 5733OPS Only this version supports free form RPG 11

12 RDi and Git Eclipse has a free extension to support Git called EGit Anyone with Eclipse can install it from the Help->Eclipse Marketplace If you have RDi Java Modernization Edition it is an optional component Think through the implications of Orion + Git Here's a scenario: Jesse is travelling. He's at the airport and just has a tablet and his phone. He receives an urgent call from Edmund that there's a bug in his code and Sam's pay is incorrect. He logs onto Orion, fixes the bug, and pushes the change back to Git. Back at the office, Edmund fetches the change from Git into an i Project in RDi and recompiles the program. Sam's pay is fixed and the problem didn't have to wait until Jesse returned from his trip. 12

13 Edit RPG to change Sam s pay original pay Sam s pay is edited now

14 Git view to commit the change Push change using Git 14

15 Change is now in the Git repository history Fetch from Git into RDi 15

16 Change made in tablet is now in RDi iproject where it can be built and run! 16

17 Demo 17