eac_git 0.1.0 → 0.2.0

data/vendor/git-subrepo/note/Plugins

@@ -0,0 +1,10 @@
+- https://github.com/nothingmuch/git-svn-abandon
+- https://github.com/schacon?tab=repositories
+- https://github.com/jbalogh/git-tools
+- https://github.com/wesabe/git-tools
+- https://github.com/timcharper/git-helpers
+- https://github.com/schacon/git-pulls
+- https://github.com/node-gh/gh
+- https://github.com/splitbrain/git-pull-request
+- https://github.com/mloughran/git-cleanup
+- https://github.com/seveas/git-hub

data/vendor/git-subrepo/note/Spec

@@ -0,0 +1,39 @@
+= `git-hub` Design Specification
+
+== Main Commands
+
+- `clone`
+
+  git subrepo clone <git-url> <subdir> [<options>]
+
+- `pull`
+
+- `push`
+
+== Worker Commands
+
+- `fetch`
+
+    git subrepo fetch <subdir>
+
+- `branch`
+
+- `checkout`
+
+- `commit`
+
+- `reset`
+
+== Info Commands
+
+- `status`
+
+- `log`
+
+== Other Commands
+
+- `clean`
+
+- `help`
+
+- `version`

data/vendor/git-subrepo/note/Story1

@@ -0,0 +1,57 @@
+== git subrepo clone git@genius --branch=bob ext/genius
+
+- create orphan branch repo/genius
+- fetch git@genius --branch=bob
+- create local branch repo/genius
+- checkout repo/genius into ext/genius
+- SYNC-DANCE:
+  - add ext/genius/.gitrepo
+  - commit the add and prune the commit
+  - merge the pruned commit into mianline
+
+== git subrepo pull ext/genius
+
+- checkout ext/genius
+- fetch git@genius --branch=bob
+- merge/rebase FETCH_HEAD
+- commit if merge successful
+- checkout original branch
+- SYNC-DANCE
+
+== git subrepo branch ext/genius
+- filter-branch subdir ext/genius
+- filter-branch 'rm .gitrepo'
+- add parent of original
+- name the commit subrepo/ext/genius
+
+== git subrepo checkout ext/genius
+- subrepo branch ext/genius
+- checkout subrepo/ext/genius
+
+== git subrepo push ext/genius
+- subrepo branch ext/genius
+- checkout repo/genius
+- merge/rebase subrepo/ext/genius
+- push repo/genius git@genius/bob
+- checkout original
+
+
+= Commands =
+
+git subrepo clone git@github.com:ingydotnet/bashplus.git
+git subrepo clone git@github.com:ingydotnet/bashplus.git ext/bashplus
+git subrepo clone git@github.com:ingydotnet/bashplus.git --branch=devel
+git subrepo clone git@github.com:ingydotnet/bashplus.git --reclone
+
+
+git subrepo pull git@github.com:ingydotnet/bashplus.git
+git subrepo pull git@github.com:ingydotnet/bashplus.git --branch=master
+git subrepo pull git@github.com:ingydotnet/bashplus.git --rebase
+
+git subrepo branch ext/bashplus         # create refs/heads/subrepo/ext/bashplus
+
+git subrepo checkout ext/bashplus
+
+git subrepo push ext/bashplus
+
+

data/vendor/git-subrepo/note/ToDo

@@ -0,0 +1,55 @@
+== Next
+- Write test for push after init
+  - With and without --remote
+  - With --update
+- Write tests for --update
+
+== Development
+
+- Add version commit id to cmdver in .gitrepo.
+  - Update Makefile to install:
+    - git-subrepo.d/remote
+    - git-subrepo.d/commit
+
++ Add remote-url and remote-branch on fetch
+  - unless config.subrepo.auto-remote-add == false
+  - unless config.subrepo.auto-branch-add == false
+
+- Write more tests:
+  - Make simple fixtures
+  - Multiple push sessions
+  - Tests for reported rebase errors and other subtree badness
+
+- Make the 'clean' command remove grafts
+
+- Resolve outstanding github issues:
+  - Allow commands from any subdir.
+
+- Update VERSION to 0.1.1
+  - Tag when ready.
+
+- When .gitrepo is stable:
+  - Delete and re-clone all subrepos in all repos using them
+
+- Rewrite the Intro doc.
+
+== Promotion
+
+- Git Commands
+  - #git-commands
+  - github.com/git-commands
+  - Fork projects
+  - git-commands.hacktive.com
+  - Make a CogWeb site
+
+- Invent a good symbolic system for dags
+  - main and sub repo
+  - users: owner, user, collab
+  - commits: upstream sr head, local sr head, clone, pull, gitrepo
+
+  owner/main: A-----B
+  owner/subr: S-----T
+  git subrepo clone owner/subr foo
+  A-----B-----C
+             /
+      T'--T'+

data/vendor/git-subrepo/note/design.swim

@@ -0,0 +1,137 @@
+git-subrepo Design
+==================
+
+How the subrepo commands should work.
+
+Glossary:
+
+- `subrepo` :: An external repository integrated as a repo subdirectory
+- `subdir` :: The directory in the work tree where the subrepo lives
+- `upstream` :: The remote repo that the subrepo is tracking
+- `local` :: The local parts of the subrepo
+- `.gitrepo` :: The subrepo state file
+- `remote` :: The subrepo url
+- `branch` :: The remote branch the subrepo is tracking
+- `commit` ::  The upstream commit id that we last synced to
+- `former` :: The local commit that we last synced to
+
+== clone
+
+This is the action that adds a new subrepo. It feels very much like a clone,
+so we call it that.
+
+Usages:
+
+  # Add a subrepo into a subdir (track remote HEAD branch):
+  git subrepo clone <remote> <subdir>
+  # Guess subdir from remote url:
+  git subrepo clone <remote>
+  # Use a named branch instead of the remote HEAD:
+  git subrepo clone <remote> [<subdir>] -b <branch>
+
+Steps:
+
+* Assert clean, and chdir to root (adjusting subdir)
+* Determine the remote HEAD
+  * Else error, branch (-b) needed
+* Fetch the remote branch commits
+* Subtree merge the remote subrepo history into the subdir
+* Squash the history to a single commit
+* Merge the subtree commit into the mainline HEAD
+* Add a .gitrepo file to the subdir
+* Amend the .gitrepo into the HEAD merge commit
+* Create a branch .git/refs/subrepo/remote/<subdir>
+* Add a remote called subrepo/<subdir>
+
+== pull
+
+Fetch and merge the remote content. This could be a single operation, or may
+require a manual process: (see checkout)
+
+Usages:
+
+  # Fetch and rebase subdir/subrepo:
+  git subrepo pull --rebase subdir
+  # Strategies: --rebase --ours --theirs --merge (recursive):
+  git subrepo pull --<merge-strategy> subdir
+  # Pull all the subrepos:
+  git subrepo pull --<strategy> --all
+  # Change the tracking branch and pull it:
+  git subrepo pull --<strategy> -b <branch> <subdir>
+  # Pull in the hand merged branch:
+  # git subrepo pull <subdir>
+
+Steps:
+
+* Assert clean, and chdir to root (adjusting subdir)
+* Fetch the remote branch content
+* Update remotes and the refs in .git/
+  * The might not be the same repo that did the clone
+* If not hand merged
+  * Create a branch called subrepo/<subdir>
+  * Checkout the new branch
+  * Apply the merge strategy to the remote branch
+  * If not clean
+    * Error message
+    * Reset to starting state
+* Subtree merge the subrepo/<subdir> branch into repo
+    git subrepo clone <remote> <subdir>
+* Squash the upstream history
+* Merge the subtree into mainline
+* Update the .gitrepo file
+* Amend .gitrepo into HEAD
+* Delete the subrepo/<subdir> branch
+
+== push
+
+Push a merged subrepo history to the remote. This could be a single operation,
+or may require a manual process.
+
+Usages:
+
+  # Fetch, apply strategy, push to remote:
+  git subrepo push <subdir>
+  # Do all subrepos:
+  git subrepo push --all
+
+Steps:
+
+* Assert clean, and chdir to root (adjusting subdir)
+* Update remotes and the refs in .git/
+* Fetch the remote branch content
+* Make sure we have pulled the latest remote changes
+* Checkout subrepo/<subdir> branch
+* Rebase the local change s on top
+* Push it to subrepo/<subdir> remote
+
+== checkout
+
+Create a branch of the local changes to the subrepo and checkout it. Also
+fetch the remote tracking branch, so it can can be used for merges. This
+command is used to do a pull/merge by hand. After you merge, use the `pull`
+command to finish up.
+
+Usages:
+
+  # Checkout a subdir/subrepo
+  git checkout <subdir>
+
+Steps:
+
+* Assert clean, and chdir to root (adjusting subdir)
+* Assert repo is on a branch
+* Update remotes and the refs in .git/
+* Fetch the remote branch content
+* Create a branch of local subrepo changes subrepo/local/<subdir>
+* Checkout the new branch
+
+== status
+
+Give a full status of specific subrepos or all of them.
+
+Usages:
+
+  # Get status for all subrepos:
+  git subrepo status
+  # Get status for specific subrepos:
+  git subrepo status <subdir> [<subdir> ...]

data/vendor/git-subrepo/note/design2.swim

@@ -0,0 +1,85 @@
+git-subrepo Design
+==================
+
+This document details wow the git-subrepo commands should work.
+
+Glossary:
+
+- `subrepo` :: An external repository integrated as a repo subdirectory
+- `subdir` :: The directory in the work tree where the subrepo lives
+- `upstream` :: The remote repo that the subrepo is tracking
+- `local` :: The local parts of the subrepo
+- `.gitrepo` :: The subrepo state file
+- `remote` :: The subrepo url
+- `branch` :: The remote branch the subrepo is tracking
+- `commit` ::  The upstream commit id that we last synced to
+- `former` :: The local commit that we last synced to
+
+= Commands and usages:
+
+There are 4 main commands:
+
+* git subrepo clone
+* git subrepo pull
+* git subrepo push
+* git subrepo checkout
+
+  # Clone forms:
+  git subrepo clone git@github.com:you/foo.git
+  git subrepo clone git@github.com:you/foo.git ext/subfoo
+  git subrepo clone git@github.com:you/foo.git -b alternate-branch
+
+  # Single command pull:
+  git subrepo pull --rebase ext/foo
+  git subrepo pull --merge  ext/foo -b remote-branch
+  git subrepo pull --ours   ext/foo -B remote-branch  # change .gitrepo
+  git subrepo pull --rebase --all
+
+  # Manual pull:
+  git subrepo checkout ext/foo
+  git rebase subrepo/remote/ext/foo subrepo/ext/foo
+  make test
+  git subrepo pull ext/foo --continue
+
+  # Push forms:
+  git subrepo push ext/foo
+  git subrepo push ext/foo -b remote-branch
+  git subrepo push ext/foo -B remote-branch
+  git subrepo push --all
+
+  # Manual push:
+  git subrepo checkout ext/foo --rebase
+  <maybe rewrite commit info>
+  make test
+  git subrepo push ext/foo --continue
+
+  # Checkout forms:
+  git subrepo checkout ext/foo
+  git subrepo checkout ext/foo --<merge-straegy>
+  git subrepo checkout ext/foo --fetch
+  git subrepo checkout -b create-local-branch-name
+  git subrepo checkout --all
+
+= Command Logic
+
+This section goes over all the things that a command needs to do:
+
+== Setup
+
+There are certain steps that each command must do first:
+
+* Assert that the system commands and git version are correct.
+* Assert that the repository is in a clean state.
+* Assert that the repo is on a branch.
+* Assert that the current dir is top level of repo.
+* Assert the command arguments are valid.
+* Assert the subdir is a valid subrepo dir.
+  * For `clone` make sure subdir does not exist yet.
+* Read the .gitrepo file (not for clone).
+* For `clone`, make sure we know what upstream branch to use.
+* Note the starting point (branch and commit).
+
+== Clone command:
+
+* Fetch upstream content for our tracking branch.
+

data/vendor/git-subrepo/note/init-test

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -ex
+cat $0    # Show this script in the output
+
+REPO=${1:-ingydotnet/djson-pm}
+REPODIR="${REPO#*/}"
+SUBDIR=${2:-test}
+SUBREPO=$REPO-$SUBDIR
+SUBREPODIR="${SUBREPO#*/}"
+
+git hub repo-delete "$SUBREPO" || true
+rm -fr "$REPODIR"
+git hub clone "$REPO"
+(
+  exit
+  cd "$REPODIR"
+  git subrepo init test -r "git@github.com:$SUBREPO" # -b foo
+  git hub repo-new "$SUBREPO"
+  git hub repo "$SUBREPO"
+  cat "$SUBDIR/.gitrepo"
+  git subrepo push "$SUBDIR"
+  git subrepo status "$SUBDIR"
+  git hub clone "$SUBREPO"
+  [[ -e "$SUBREPODIR/decode.t" ]] && echo PASS || echo FAIL
+)
+(
+  cd "$REPODIR"
+  git subrepo init test
+  git hub repo-new "$SUBREPO"
+  git hub repo "$SUBREPO"
+  cat "$SUBDIR/.gitrepo"
+  git subrepo push -u "$SUBDIR" -r "git@github.com:$SUBREPO" -b foo
+  git subrepo status "$SUBDIR"
+  git hub clone "$SUBREPO"
+  [[ -e "$SUBREPODIR/decode.t" ]] && echo PASS || echo FAIL
+  bash -i
+)

data/vendor/git-subrepo/note/pull-dance.txt

@@ -0,0 +1,18 @@
+== Pull Dancing
+
+(
+    git sr pull --rebase ext/bar
+)
+
+(
+    git sr checkout ext/bar --rebase
+    make test
+    git sr pull --continue
+)
+
+(
+    git sr checkout ext/bar
+    git rebase subrepo/remote/ext/bar
+    make test
+    git sr pull --continue
+)