eac_tools 0.86.1 → 0.86.3

data/sub/eac_git/vendor/git-subrepo/test/error.t

@@ -0,0 +1,171 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+export GIT_SUBREPO_TEST_ERRORS=true
+
+note "Test all error message conditions in git-subrepo"
+
+clone-foo-and-bar
+
+{
+  is "$(
+      cd $OWNER/bar
+      git subrepo --quiet clone ../../../$UPSTREAM/foo
+      add-new-files foo/file
+      git subrepo --quiet branch foo
+      catch git subrepo branch foo
+    )" \
+    "git-subrepo: Branch 'subrepo/foo' already exists. Use '--force' to override." \
+    "Error OK: can't create a branch that exists"
+
+  (
+    cd $OWNER/bar
+    git subrepo --quiet clean foo
+    git reset --quiet --hard HEAD^
+  )
+}
+
+{
+  like "$(catch git subrepo clone --foo)" \
+    "error: unknown option \`foo" \
+    "Error OK: unknown command option"
+}
+
+{
+  is "$(catch git subrepo main 1 2 3)" \
+    "git-subrepo: 'main' is not a command. See 'git subrepo help'." \
+    "Error OK: unknown command"
+}
+
+{
+  is "$(catch git subrepo pull --update)" \
+    "git-subrepo: Can't use '--update' without '--branch' or '--remote'." \
+    "Error OK: --update requires --branch or --remote options"
+}
+
+{
+  is "$(catch git subrepo clone --all)" \
+    "git-subrepo: Invalid option '--all' for 'clone'." \
+    "Error OK: Invalid option '--all' for 'clone'"
+}
+
+{
+  like "$(
+      cd $OWNER/bar
+      catch git subrepo pull /home/user/bar/foo
+    )" \
+    "git-subrepo: The subdir '.*/home/user/bar/foo' should not be absolute path." \
+    "Error OK: check subdir is not absolute path"
+}
+
+{
+  # XXX add 'commit' to cmds here when implemented:
+  for cmd in pull push fetch branch commit clean; do
+    is "$(
+        cd $OWNER/bar
+        catch git subrepo $cmd
+      )" \
+      "git-subrepo: Command '$cmd' requires arg 'subdir'." \
+      "Error OK: check that '$cmd' requires subdir"
+  done
+}
+
+{
+  is "$(
+      cd $OWNER/bar
+      catch git subrepo clone foo bar baz quux
+    )" \
+    "git-subrepo: Unknown argument(s) 'baz quux' for 'clone' command." \
+    "Error OK: extra arguments for clone"
+}
+
+{
+  is "$(
+      cd $OWNER/bar
+      catch git subrepo clone .git
+    )" \
+    "git-subrepo: Can't determine subdir from '.git'." \
+    "Error OK: check error in subdir guess"
+}
+
+{
+  is "$(
+      cd $OWNER/bar
+      catch git subrepo pull lala
+    )" \
+    "git-subrepo: No 'lala/.gitrepo' file." \
+    "Error OK: check for valid subrepo subdir"
+}
+
+{
+  is "$(
+      cd $OWNER/bar
+      git checkout --quiet $(git rev-parse master)
+      catch git subrepo status
+    )" \
+    "git-subrepo: Must be on a branch to run this command." \
+    "Error OK: check repo is on a branch"
+  (
+    cd $OWNER/bar
+    git checkout --quiet master
+  )
+}
+
+{
+  is "$(
+      cd .git
+      catch git subrepo status
+    )" \
+    "git-subrepo: Can't 'subrepo status' outside a working tree." \
+    "Error OK: check inside working tree"
+}
+
+{
+  like "$(
+      cd $OWNER/bar
+      touch me
+      git add me
+      catch git subrepo clone ../../../$UPSTREAM/foo
+    )" \
+    "git-subrepo: Can't clone subrepo. Working tree has changes." \
+    "Error OK: check no working tree changes"
+  (
+    cd $OWNER/bar
+    git reset --quiet --hard
+  )
+}
+
+{
+  is "$(
+      cd lib
+      catch git subrepo status
+    )" \
+    "git-subrepo: Need to run subrepo command from top level directory of the repo." \
+    "Error OK: check cwd is at top level"
+}
+
+{
+  is "$(
+      cd $OWNER/bar
+      catch git subrepo clone dummy bard
+    )" \
+    "git-subrepo: The subdir 'bard' exists and is not empty." \
+    "Error OK: non-empty clone subdir target"
+}
+
+{
+  is "$(
+      cd $OWNER/bar
+      catch git subrepo clone dummy-repo
+    )" \
+    "git-subrepo: Command failed: 'git ls-remote dummy-repo'." \
+    "Error OK: clone non-repo"
+}
+
+done_testing
+
+teardown

data/sub/eac_git/vendor/git-subrepo/test/fetch.t

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+
+subrepo-clone-bar-into-foo
+
+(
+  cd $OWNER/bar
+  add-new-files Bar2
+  git tag -a CoolTag -m "Should stay in subrepo"
+  git push
+) &> /dev/null || die
+
+
+# Fetch information
+{
+  is "$(
+    cd $OWNER/foo
+    git subrepo fetch bar
+  )" \
+    "Fetched 'bar' from '../../../tmp/upstream/bar' (master)." \
+    'subrepo fetch command output is correct'
+}
+
+# Check that there is no tags fetched
+{
+  is "$(
+    cd $OWNER/foo
+    git tag -l 'CoolTag'
+  )" \
+    "" \
+    'No tag is available'
+}
+
+done_testing
+
+teardown

data/sub/eac_git/vendor/git-subrepo/test/gitignore.t

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+
+subrepo-clone-bar-into-foo
+
+(
+  cd $OWNER/bar
+  add-new-files Bar2
+  git push
+) &> /dev/null || die
+
+(
+  cd $OWNER/foo
+  echo ".*" >> .gitignore
+  git add .gitignore
+  git commit -m "Add gitignore"
+  git push
+) &> /dev/null || die
+
+
+
+# Do the pull and check output:
+{
+  is "$(
+    cd $OWNER/foo
+    git subrepo pull bar
+  )" \
+    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    'subrepo pull command output is correct'
+}
+
+# Test subrepo file content:
+gitrepo=$OWNER/foo/bar/.gitrepo
+{
+  test-exists \
+    "$OWNER/foo/bar/Bar2" \
+    "$gitrepo"
+}
+
+# Test foo/bar/.gitrepo file contents:
+{
+  foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
+  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
+  test-gitrepo-comment-block
+  test-gitrepo-field "remote" "../../../$UPSTREAM/bar"
+  test-gitrepo-field "branch" "master"
+  test-gitrepo-field "commit" "$bar_head_commit"
+  test-gitrepo-field "parent" "$foo_pull_commit"
+  test-gitrepo-field "cmdver" "`git subrepo --version`"
+}
+
+done_testing
+
+teardown

data/sub/eac_git/vendor/git-subrepo/test/init.t

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+git clone $UPSTREAM/init $OWNER/init &>/dev/null
+
+gitrepo=$OWNER/init/doc/.gitrepo
+
+# Test that the initial repo look ok:
+{
+  test-exists \
+    "$OWNER/init/.git/" \
+    "$OWNER/init/ReadMe" \
+    "$OWNER/init/doc/" \
+    "$OWNER/init/doc/init.swim" \
+    "!$gitrepo"
+}
+
+output="$(
+  cd "$OWNER/init"
+  git subrepo init doc
+)"
+
+is "$output" "Subrepo created from 'doc' (with no remote)." \
+  'Command output is correct'
+
+{
+  test-exists \
+    "$gitrepo"
+}
+
+# Test init/doc/.gitrepo file contents:
+{
+  init_clone_commit="$(cd $OWNER/init; git rev-parse HEAD^)"
+  test-gitrepo-comment-block
+  test-gitrepo-field "remote" "none"
+  test-gitrepo-field "branch" "master"
+  test-gitrepo-field "commit" ""
+  test-gitrepo-field "parent" ""
+  test-gitrepo-field "method" "merge"
+  test-gitrepo-field "cmdver" "`git subrepo --version`"
+}
+
+rm -fr "$OWNER/init"
+git clone $UPSTREAM/init $OWNER/init &>/dev/null
+(
+  cd "$OWNER/init"
+  git subrepo init doc -r git@github.com:user/repo -b foo -M rebase
+) >/dev/null
+
+test-gitrepo-field "remote" "git@github.com:user/repo"
+test-gitrepo-field "branch" "foo"
+test-gitrepo-field "commit" ""
+test-gitrepo-field "parent" ""
+test-gitrepo-field "method" "rebase"
+test-gitrepo-field "cmdver" "`git subrepo --version`"
+
+done_testing
+
+teardown

data/sub/eac_git/vendor/git-subrepo/test/issue29.t

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+# if [[ $1 == ReRun ]]; then
+#   set -x
+# else
+#   "$0" ReRun 2>&1 | tee log
+#   exit 0
+# fi
+
+cd "$TMP"
+
+# Make 3 new repos:
+(
+  mkdir share main1 main2
+  git init share
+  git init main1
+  git init main2
+) > /dev/null
+
+# Add an empty 'readme' to the share repo:
+(
+  cd share
+  echo '* text eol=lf' > .gitattributes
+  touch readme
+  git add readme .gitattributes
+  git commit -m "Initial share"
+  # To push into here later we must not have working copy on master branch:
+  git checkout -b temp
+) &> /dev/null
+
+# `subrepo clone` the share repo into main1:
+(
+  cd main1
+  touch main1
+  git add main1
+  git commit -m "Initial main1"
+  git subrepo clone ../share share -b master
+) > /dev/null
+
+# `subrepo clone` the share repo into main2:
+(
+  cd main2
+  touch main2
+  git add main2
+  git commit -m "Initial main2"
+  git subrepo clone ../share share -b master
+) > /dev/null
+
+
+# Make a change to the main1 subrepo and push it:
+msg_main1="main1 initial add to subrepo"
+( set -x
+  cd main1
+  echo "$msg_main1" >> share/readme
+  git add share/readme
+  git commit -m "$msg_main1"
+
+  git subrepo push share
+) &> /dev/null
+
+ok "`! git:branch-exists "subrepo-push/share"`" \
+  "The subrepo-push/share branch was deleted after push"
+
+# TODO Check the state of refs made
+
+# Pull in the subrepo changes from above into main2.
+# Make a local change to the main2 subrepo and push it:
+msg_main2="main2 initial add to subrepo"
+( set -x
+  cd main2
+  git subrepo pull share
+  echo "$msg_main2" >> share/readme
+  git add share/readme
+  git commit -m "$msg_main2"
+
+  git subrepo push share
+) &> /dev/null || die
+
+# Go back into main1 and pull the subrepo updates:
+( set -x
+  cd main1
+  git subrepo pull share
+) &> /dev/null || die
+
+# The readme file should have both changes:
+is "$(cat main1/share/readme)" \
+  "$msg_main1"$'\n'"$msg_main2" \
+  "The readme file in the share repo has both subrepo commits"
+
+done_testing
+
+teardown

data/sub/eac_git/vendor/git-subrepo/test/issue95.t

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+{
+    cd "$TMP"
+
+    # Make two new repos
+    (
+        mkdir host sub
+        git init host
+        git init sub
+    ) > /dev/null
+
+    # Initialize host repo
+    (
+        cd host
+        touch host
+        git add host
+        git commit -m "host initial commit"
+    ) > /dev/null
+
+    # Initialize sub repo
+    (
+        cd sub
+        git init
+        touch subrepo
+        git add subrepo
+        git commit -m "subrepo initial commit"
+    ) > /dev/null
+
+    # Make sub a subrepo of host
+    (
+        cd host
+        git subrepo clone ../sub sub
+    ) > /dev/null
+
+    # Create a branch in host and make some changes in it
+    (
+        cd host
+        git checkout -b feature
+        touch feature
+        git add feature
+        git commit -m "feature added"
+        git checkout master
+    ) &> /dev/null
+
+    # Commit directly to subrepo
+    (
+        cd sub
+        echo "direct change in sub" >> subrepo
+        git commit -a -m "direct change in sub"
+    ) > /dev/null
+
+    # pull subrepo changes
+    (
+        cd host
+        git subrepo pull sub
+    ) > /dev/null
+
+    # commit directly to subrepo
+    (
+        cd sub
+        echo "another direct change in sub" >> subrepo
+        git commit -a -m "another direct change in sub"
+    ) > /dev/null
+
+    # commit to host/sub
+    (
+        cd host
+        echo "change from host" >> sub/subrepo-host
+        git add sub/subrepo-host
+        git commit -m "change from host"
+    ) > /dev/null
+
+    # merge previously created feature branch
+    (
+        cd host
+        git merge --no-ff --no-edit feature
+    ) > /dev/null
+
+    # pull subrepo changes
+    # expected: successful pull without conflicts
+    is "$(
+            cd host
+            git subrepo pull sub
+    )" \
+        "Subrepo 'sub' pulled from '../sub' (master)."
+
+}
+
+done_testing 1
+
+teardown

data/sub/eac_git/vendor/git-subrepo/test/issue96.t

@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+    cd "$TMP"
+
+    # Make two new repos
+    (
+        mkdir host sub
+        git init host
+        git init sub
+    ) > /dev/null
+
+    # Initialize host repo
+    (
+        cd host
+        touch host
+        git add host
+        git commit -m "host initial commit"
+    ) > /dev/null
+
+    # Initialize sub repo
+    (
+        cd sub
+        git init
+        touch subrepo
+        git add subrepo
+        git commit -m "subrepo initial commit"
+    ) > /dev/null
+
+    # Make sub a subrepo of host
+    (
+        cd host
+        git subrepo clone ../sub sub
+    ) > /dev/null
+
+    # Commit some changes to the host repo
+    (
+        cd host
+        touch feature
+        git add feature
+        git commit -m "feature added"
+    ) &> /dev/null
+
+    # Commit directly to subrepo
+    (
+        cd sub
+        echo "direct change in sub" >> subrepo
+        git commit -a -m "direct change in sub"
+    ) > /dev/null
+
+    # Pull subrepo changes
+    (
+        cd host
+        git subrepo pull sub
+    ) > /dev/null
+
+    # Commit directly to subrepo
+    (
+        cd sub
+        echo "another direct change in sub" >> subrepo
+        git commit -a -m "another direct change in sub"
+        git checkout -b temp # otherwise push to master will fail
+    ) &> /dev/null
+
+    # Commit to host/sub
+    (
+        cd host
+        echo "change from host" >> sub/subrepo-host
+        git add sub/subrepo-host
+        git commit -m "change from host"
+    ) > /dev/null
+
+    # Pull subrepo changes
+    # expected: successful pull without conflicts
+    is "$(
+            cd host
+            git subrepo pull sub
+    )" \
+        "Subrepo 'sub' pulled from '../sub' (master)."
+
+    # Push subrepo changes
+    # expected: successful push without conflicts
+    is "$(
+            cd host
+            git subrepo push sub -b master -u
+    )" \
+       "Subrepo 'sub' pushed to '../sub' (master)."
+
+done_testing 2
+
+teardown

data/sub/eac_git/vendor/git-subrepo/test/pull-all.t

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+
+(
+  cd $OWNER/foo
+  git subrepo clone ../bar bar1
+  git subrepo clone ../bar bar2
+) &> /dev/null || die
+
+(
+  cd $OWNER/bar
+  modify-files Bar
+) &> /dev/null || die
+
+(
+  cd $OWNER/foo
+  git subrepo pull --all
+) &> /dev/null || die
+
+{
+  is "$(cat $OWNER/foo/bar1/Bar)" \
+    "a new line" \
+    'bar1/Bar content correct'
+  is "$(cat $OWNER/foo/bar2/Bar)" \
+    "a new line" \
+    'bar2/Bar content correct'
+}
+
+done_testing
+
+teardown