The Intro. Aaron Bartell Director of IBM i Innovation. Copyright 2015 Aaron Bartell

Transcription

1 The Intro Aaron Bartell Director of IBM i Innovation albartell@krengeltech.com Copyright 2015 Aaron Bartell

2 This session brought to you by... Consulting - Jumpstart your open source pursuit. Small and big projects. Free Educational Content on everything open source for IBM i at litmis.com spaces.litmis.com provides open source development via browser on IBM i machine in the cloud. albartell@krengeltech.com

3 Agenda - What is Git? - Real-world example - Install - Create repository - Tutorials: common commands - Connecting to GitHub and Bitbucket - Common workflow - Further Configuration - Tools - Live tutorial

4 what is Git? Layman: Retain history of source code changes Distributed version control (full repo exists locally) client and server are both equal Git repos Free and open source Created by Linus Torvalds as a better alternative to Subversion/other Easy to install Operates in the IFS on *STMFs (can work with RPG) Many commands for change management, communication, diffs, etc. Note: Git commands and syntax aren't immediately intuitive (they tried). Google is your friend. Graphical tools are even better (ungit, the best). rogerdudler.github.io/git-guide - High-level overview

5 real-world IBM i Project: ibmichroot (IBM i Chroot) Descr: Used for creating isolated environments on IBM i for open source development. All managed with Git on Bitbucket. Loc: bitbucket.org/litmis/ibmichroot wikipedia.org/wiki/chroot - Definition of chroot

6 installation 1 - Visit bit.ly/yips-ibmiperzl 2 - Download file download-2.0.tar.zip, unzip on desktop, FTP to IBM i in directory /QOpenSys/download 3 - Run the below from a PASE shell (i.e. CALL QP2TERM) $ cd /QOpenSys/download $./wwwperzl.sh aix61 wget git $./wwwperzl.sh aix61 rpm git $ export PATH=/opt/freeware/bin:$PATH $ which git /opt/freeware/bin/git $ git --version git version bit.ly/how-to-contribute-to-open-source-on-ibmi - Full tutorial Alternative: ibmichroot (git v2.2.2)

7 config Tell git about you $ git config --global user.name "John Doe" $ git config --global user. johndoe@example.com user.name and user. are used to document who made changes. Turn colored diffs off $ git config --global color.diff false By default color.diff is true and that makes for a messy screen because color-escape chars don't render correctly. git-scm.com/docs/git-config - Config file docs stackoverflow.com/questions/ /git-diff-odd-characters-on-ibm-i-operating-system - Colored diffs

8 demo time Interactive demo. Covers slides up to "fork and pull"

9 tutorial: init(ialize) repo(sitory) Command git init creates an empty Git repository in the current directory. $ pwd /home/aaron $ mkdir website1 $ cd website1 All repository info is stored in the.git directory. $ git init $ ls -all drwxr-sr-x 7 aaron Sep 22 21:00.git No additional directories or files are stored below the root of the repository. Keeps from muddying up your directory structure. git-scm.com/docs/git-init - Docs

10 tutorial: commit Use git commit to save a version of the code base into the local repository. $ echo "<title>ibm i wins in the end</title>" > index.html $ git commit -am "initial commit, added a title." working directory: Your IFS directory and the files you are currently editing. Edits are not managed until you commit them to the repository. repository: Stores all commits since repo creation. Command git commit is used to place staged files into repository. Repository is in.git directory of repo root directory. git-scm.com/docs/git-commit - Docs git-scm.com/docs/git-add - Docs Note: Command git commit -a is a shortcut to skip staging and directly commit working directory files.

11 tutorial: staging Use git add to stage changed files. For when you don't want to commit all changed files. $ git add index.html $ git add main.css $ git commit -m "Changed heading color" staging area: Copy of IFS file placed into separate area in prep for git commit. Think of staging as using the mouse to select 3 out of 10 files in Windows Explorer and right-clicking to select Copy. git-scm.com/docs/git-commit - Docs git-scm.com/docs/git-add - Docs Note: Command git commit -a is a shortcut to skip staging and directly commit working directory files.

12 create central repo Best practice to set up a central Git repo where everyone pushes and pulls. Create new repo on Bitbucket** or GitHub. Keep it private if you don't want the world to see. Note: IBM i can act as the central repository. Put it in a directory like /git in the IFS (or anywhere outside of all /home directories). ** We (KrengelTech) use BitBucket because it has unlimited private repositories. bitbucket.org - Free Git repo hosting

13 tutorial: connect local to remote Command git remote adds a named remote server; origin in this case. $ cd /home/aaron/website1 $ git remote add origin git@bitbucket.org:aaronbartell/website1.git Command git remote -v displays existing remote servers. $ git remote -v origin git@bitbucket.org:aaronbartell/website1.git (fetch) origin git@bitbucket.org:aaronbartell/website1.git (push) git-scm.com/docs/git-remote - Docs

14 tutorial: push Make local commits to your heart's content. To share, you git push to the remote server. Name of remote Name of branch $ git push origin master Counting objects: 4, done. Delta compression using up to 2 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (4/4), 500 bytes 0 bytes/s, done. Total 4 (delta 0), reused 0 (delta 0) To git@bitbucket.org:aaronbartell/website1.git 05911c9..8f11b00 master -> master git-scm.com/docs/git-remote - Docs git-scm.com/docs/git-push - Docs The master branch is created for you by default.

15 ssh to communicate To communicate with Bitbucket via SSH you must provide your public SSH key. Password-less authentication. ssh-keygen creates necessary files $ ssh-keygen $ ls ~/.ssh authorized_keys id_rsa known_hosts id_rsa.pub SSH Copy/paste id_rsa.pub into Bitbucket web interface $ cat ~/.ssh/id_rsa.pub ssh-rsa AAAABxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxpomipqnexxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxlump4zhi4bqghil team@litmis.com ssh-keygen is contained in 5733SC1 IBM Portable Utilities for i5/os *BASE & Option 1 bit.ly/5733sc1-op1-5733sc1 instructions

16 tutorial: pull Command git pull will SSH to the named server (origin) and retrieve all existing commits into your local repo. $ git pull origin master remote: Counting objects: 3, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From bitbucket.org:aaronbartell/website1 * branch master -> FETCH_HEAD 8f11b00..2e4fa85 master -> origin/master Updating 8f11b00..2e4fa85 Fast-forward index.html file changed, 1 insertion(+) master is the "branch" name and is created by default when git init is run. We will not be covering branches as that is not necessarily an intro topic. git-scm.com/docs/git-commit - Docs

17 tutorial: pull and merge conflict When you git pull it automatically merges the remote commits with local ones. Excellent! "Merge Conflicts" are when developers change the same line of code and manual decisions need to be made as to what should be kept. $ git pull origin master From bitbucket.org:aaronbartell/website1 * branch master -> FETCH_HEAD Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. $ cat index.html <<<<<<< HEAD <title>ibm i wins in the end. This much I know.</title> ======= <title>ibm i wins in the end. And so do you.</title> >>>>>>> 05911c9cdcc9a35bab362f9c1937b8b395d9a3b0 Red signifies the delimiters Git added. Manually remove delimiters and the code you DON'T want to keep. Lastly, run git add index.html and git commit to complete the merge conflict. git-scm.com/docs/git-commit - Docs

18 tutorial - log Command git log can be used to display commits that have taken place. $ git log --date-order commit 8f11b0025af864a734c57913a089bb19bbe0e78c Merge: f85cd c9 Author: Aaron Bartell <aaronbartell@gmail.com> Date: Wed Sep 23 20:39: Fixed merge conflict commit f85cd89d3f215abf53ef8652c9949ece48b295a0 Author: Aaron Bartell <aaronbartell@gmail.com> Date: Wed Sep 23 19:02: Added "This much I know." commit 05911c9cdcc9a35bab362f9c1937b8b395d9a3b0 Author: Aaron Bartell <aaronbartell@gmail.com> Date: Wed Sep 23 16:59: Added "And so do you." commit b4cfb9fe2ffd2c8bb10e567fb97c5f1368f30f5f Author: Aaron Bartell <aaronbartell@gmail.com> Date: Wed Sep 23 18:55: git-scm.com/docs/git-log - Docs initial commit

19 tutorial - show Command git show can be used to display one or more commits and their details. $ git show 05911c9cd commit 05911c9cdcc9a35bab362f9c1937b8b395d9a3b0 Author: Aaron Bartell <aaronbartell@gmail.com> Date: Wed Sep 23 16:59: Added "And so do you." diff --git a/index.html b/index.html index d..01dacd a/index.html <title>ibm i wins in the end</title> +<title>ibm i wins in the end. And so do you.</title> Shows changes to file in this commit git-scm.com/docs/git-show - Docs

20 tutorial - diff Command git diff can be used to review the changes in one or many files. I typically do git status to learn what files have changed and then git diff to see the changes. $ git diff index.html diff --git a/index.html b/index.html index e8d66c4..c a/index.html ,2 <title>ibm i wins in the end. And so do you.</title> -<p>something else</p> \ No newline at end of file +<h1>cloud</h1> +<p>ibm i has been doing cloud since before there was rain.</p> + +<p>get Git on your i</p> \ No newline at end of file git-scm.com/docs/git-diff - Docs

21 tutorial: status The git status is great for learning where things are currently at. I use it after I've been editing code for awhile to see what's been changed (including by code generators). $ echo "<title>ibm i wins in the end</title>" > index.html $ git status On branch master Initial commit Untracked files: (use "git add <file>..." to include in what will be committed) index.html nothing added to commit but untracked files present (use "git add" to track) $ git add index.html $ git status On branch master Initial commit Changes to be committed: (use "git rm --cached <file>..." to unstage) Git supplies in-line context sensitive help. new file: index.html git-scm.com/docs/git-status - Docs

22 tutorial - stashes Middle of a change? Get interrupted and asked to work on something else? Stash it. Command git stash is like a big clipboard (i. e. Ctrl+C in Windows). It will take your current "dirty" files and save them and revert back to the most recent commit (aka HEAD). $ echo "an edit" >> index.html $ git status On branch master Changes not staged for commit: modified: index.html $ git stash Saved working directory and index state WIP on master: 2e4fa85 HEAD is now at 2e4fa85 $ git status On branch master nothing to commit, working directory clean $ git stash pop On branch master Changes not staged for commit: modified: index.html Dropped refs/stash@{0} (1b2cb0b2fe94974af444b20ea516c8daf22703ed) git-scm.com/docs/git-stash - Docs

23 fork and pull request litmis/ibmichroot fork Fork: Make a copy of repository and place in my profile on Bitbucket/Github Pull Request: Request my changes be accepted back into parent repository Why?: Allows formal review and integrates process flow. Not everyone should be allowed core comitter status. pull request aaronbartell/ibmichroot Steps: - Fork project - Make changes in your version and commit changes - Issue pull request ibmsystemsmag.com/ibmi/developer/general/how-to-contribute-to-open-source-projects - Example

24 (free) tooling Visual tooling makes all the aforementioned commands much simpler. Regardless, good to have foundation in the command. ungit - Uses Node.js runtime and resides on IBM i (what I use) SourceTree - Runs on laptop. GitHub Desktop - Runs on laptop github.com/fredriknoren/ungit - UnGit sourcetreeapp.com - SourceTree desktop.github.com - GitHub Desktop

25 ungit The ungit tool simplifies Git repositories in visual fashion. No more typing commands. Runs on IBM i. We use ungit on spaces.litmis.com github.com/fredriknoren/ungit - Repo

26 ungit Easily see what you are putting into a commit. github.com/fredriknoren/ungit - Repo

27 ungit See full history of past commits

28 ungit Context sensitive actions (i.e. Checkout, Delete) Here we also see our local repo is behind the central repository This dotted line goes down to the most recent local commit. This is how we know the remote server is further ahead than the local repo.

29 directory structure NOTE: To start using Git you don't need to know how its internals work. The.git directory sits at the root of a Git controlled directory and holds the object database. The object database has four types of objects: commit: Stores who made the commit, references to the tree and blob files tree: blob: Stores your actual code, an image file, etc. tag: Allows you to mark a particular commit with a name (i.e. v1.0.1) commit, tree or blob; compressed with zlib $ find.git/.git/objects/39/37f47bff964feb7936fd2ea8a7a3c3dab4e25e.git/objects/ca/cac6e781a28d761bbd13663ce546f2fc8ae25b.git/objects/ca/3db7182f5b01b8f0f9c19dc3c23d1af76a161b.git/objects/28/0be8e595afc9d4427e16e b874e20b.git/objects/28/ bf47b7413f6a6dab91148bd8a3758fd.git/objects/57/e1b4e6cd88a461349c9e4243c20f26580ceb50.git/objects/ae/804bc6df269484a74df9e9ac6c0a73832f5c35 nfarina.com/post/ /git-is-simpler - Understanding how git stores things

30 resources litmis.com/articles has the most up to date resources Git to Bit(bucket), MC Press Online on 8/28/15 Installing Git on IBM i, MC Press Online on 7/31/15 How to Contribute to Open Source Projects, IBM Systems Magazine on 7/14/15 IBM i Toolkit for Ruby iit for short, IT Jungle on 4/7/15 Git to GitHub, IT Jungle on 3/3/15 Git To It, IT Jungle on 2/10/15 Common Git commands from community member:

31 We Have Reached The End! Now...Get Engaged! 1. Visit litmis.com regularly for new content 2. on Twitter 3. Contact me directly for assistance jumpstarting any open source development projects on IBM i at albartell@krengeltech.com