Add rest of slides

Author: andrewdotn

.gitignore

@@ -4,3 +4,54 @@ presentation.sh
 presentation.stdout
 presentation.stderr
 *.include
+
+*~
+.DS_Store
+*.aux
+*.bbl
+*.blg
+*.nav
+*.snm
+*.vrb
+*.log
+*.toc
+*-skim.pdf
+
+*.rej
+*.orig
+.*.sw?
+.sw?
+.vagrant/
+
+x1
+x1.*
+*.pyc
+*.aux
+*.bbl
+*.blg
+*.dvi
+*.synctex.gz
+*.log
+*.o
+*.so
+*.so.dSYM
+*.dylib
+Thumbs.db
+*.orig
+*.rej
+tmp/
+.kitchen/
+binstubs/
+.gradle/
+!.gradle/init.d
+
+notes.txt
+Makefile.local
+
+.idea/
+*.ipr
+*.iws
+.rakeTasks
+.generators
+
+.hg/

Makefile

@@ -43,21 +43,13 @@ PYTHON_FILES = $(wildcard *.py)
 
 presentation.pdf: $(PYTHON_FILES:%.py=%.py.include)
 
-%.py.include: %.py ./python-interpret
-	echo -n > $@
-	echo '\begin{verbatim}' >> $@
-	./python-interpret < $*.py >> $@
-	echo '\end{verbatim}' >> $@
-
-%.py.out: %.py
-	(echo 'import datetime'; cat $<) | python > $@
-
 clean::
 	rm -f *.out *.include
 
 GH_CURL = curl -sSH "Authorization: token $$(grep oauth_token ~/.config/hub  | head -n1 | awk '{print $$2}')"
 
 upload: presentation.pdf
+	git tag -f v0.0.0 && git push -f --tags github.com/py-yyc/git-init
 	EXISTING_RELEASE_ID=$$(${GH_CURL} https://api.github.com/repos/py-yyc/git-init/releases/tags/v0.0.0 | jq .id); \
 	if [ -n "$$EXISTING_RELEASE_ID" ]; then \
 	    ${GH_CURL} -X DELETE https://api.github.com/repos/py-yyc/git-init/releases/$$EXISTING_RELEASE_ID; \

commits1

@@ -0,0 +1,15 @@
+git init
+echo hi > foo
+git status
+git add foo
+git status
+git commit -m 'Add foo'
+
+git rev-parse HEAD
+git cat-file -p HEAD
+git cat-file -p HEAD^{tree}
+git cat-file -p 45b983be36b73c0788dc9cbcb76cbb80fc7bb057
+
+git cat-file commit HEAD | hexdump -C
+git cat-file tree HEAD^{tree} | hexdump -C
+git cat-file blob 45b983be36b73c0788dc9cbcb76cbb80fc7bb057 | hexdump -C

compute-hash

@@ -4,20 +4,12 @@ import os
 import sys
 import time
 from hashlib import sha1
-from subprocess import check_call
+from fake_git import check_call, commit_metadata
 from tempfile import TemporaryDirectory
 
 os.environ['GIT_PAGER'] = ''
 
 commit_message = 'Add foo'
-commit_metadata = {
-    'name': 'Andrew',
-    'email': '[email protected]',
-    'date': time.strftime('%s %z')
-}
-git_env = {('GIT_%s_%s' % (who.upper(), what.upper()), value)
-        for who in ['author', 'committer']
-           for what, value in commit_metadata.items()}
 
 def hash(object_type, contents):
     return sha1(b'%s %d\0%s' % (object_type, len(contents), contents))
@@ -51,7 +43,5 @@ with TemporaryDirectory() as t:
     check_call(['git', 'init'])
     check_call(['git', 'add', 'foo'])
 
-    env = os.environ.copy()
-    env.update(git_env)
-    check_call(['git', 'commit', '-m', commit_message], env=env)
+    check_call(['git', 'commit', '-m', commit_message])
     check_call(['git', 'log', '-m', 'foo'])

fake_git.py

@@ -0,0 +1,16 @@
+import os
+import subprocess
+
+commit_metadata = {
+    'name': 'Andrew',
+    'email': '[email protected]',
+    'date': '1515151515 -0700' # time.strftime('%s %z')
+}
+git_env = {('GIT_%s_%s' % (who.upper(), what.upper()), value)
+        for who in ['author', 'committer']
+           for what, value in commit_metadata.items()}
+
+def check_call(args):
+    env = os.environ.copy()
+    env.update(git_env)
+    return subprocess.check_call(args, env=env)

foo

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+from tempfile import TemporaryDirectory
+
+os.environ['GIT_PAGER'] = ''
+from fake_git import check_call
+
+with TemporaryDirectory() as t:
+    os.chdir(t)
+    for line in sys.stdin.read().split('\n'):
+        if len(line) == 0:
+            continue
+        print('$ ' + line)
+        sys.stdout.flush()
+        check_call(['sh', '-c', line])

git-vs-hg.pdf

@@ -2,30 +2,50 @@
 
 = Version Control
 
-Basics of version control
-- Tracking who made what changes, when, and why, gets very complicated
-- [Excel icon] budget.q4updated.final_FINAL_with_fixes_from_jim.xls
-- [Python logo] Imagine website.beta2.final_FINAL_with_bug_fix_from_susan.py,
-  distributed by email :(
+What is version control and why should you use it?
+
+Version control:
+  - every code change is a distinct entity called a commit
+    it has an attached record of who made the change, when they made it, and
+    why they said they made the change
+
+Why?
+  - diff: show you what you’ve changed so you can review it
+  - backups: can go back to a known good state if things start crashing,
+    or an idea turns out not to work
+  - undo: can selectively roll back individual changes
+  - history: safely delete code to keep things clean instead of commenting
+    it out, knowing you can get it back later if you want
+  - context: commit messages can explain design decisions, link to bug
+    reports
+  - merges: if you make unrelated changes to different files, the version
+    control system will merge them instead
+  - fast way of sharing code: syncing with someone else only requires
+    transmitting recent changes, not the complete source code
+  - annotate: show who originally wrote the code, or changed it recently,
+    so you know can ask them for help
+  - bisect: find source of bugs by checking different versions to see when
+    the bug first shows up
+
+A nice orderly way of storing and managing source code
+whose only real competitor is complete chaos
 
-Wouldn’t it be nice if computers tracked that automatically?
+- Indispensable when working with others: automatic merges
+- Useful even if the only other people working on the project are past you
+  and future you: the code was working 10 minutes ago. What did I just
+  change?
+
+= Version control with git
+
+GitHub does everything we talked about, in a nice Web UI
 - [Screenshots of github for everything here]
 - Commit log
 - Commit details
 - Tags attached to commits
 - Blame
 
-Is it worth it?
-- Indispensable when working with others: automatic merges
-- Useful even if the only other people working on the project are past
-  you and future you
-- The code was working 10 minutes ago. What did I just change?
-- Check older versions to see if the bug was always there, or you
-  accidentally added it last week
-
-= Version control with git
-
 To use Github, you have to use git
+- Originally written by Linus Torvalds to store linux source code
 Can get very complicated very quickly
 - Used to use Mercurial
 - Found git ridiculously complicated