eac_tools 0.123.1 → 0.124.0

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

@@ -1,96 +0,0 @@
-#!/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' ($DEFAULTBRANCH)."
-
-    # Push subrepo changes
-    # expected: successful push without conflicts
-    is "$(
-            cd host
-            git subrepo push sub -b "$DEFAULTBRANCH" -u
-    )" \
-       "Subrepo 'sub' pushed to '../sub' ($DEFAULTBRANCH)."
-
-done_testing 2
-
-teardown

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

@@ -1,38 +0,0 @@
-#!/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

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

@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-clone-foo-and-bar
-
-subrepo-clone-bar-into-foo
-
-note "Pull - Conflict - Merge ours/theirs - Push"
-
-(
-  cd "$OWNER/bar"
-  add-new-files Bar2
-  git push
-) &> /dev/null || die
-
-# shellcheck disable=2034
-gitrepo=$OWNER/foo/bar/.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-field "commit" "$bar_head_commit"
-  test-gitrepo-field "parent" "$foo_pull_commit"
-}
-
-foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD)
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar
-  modify-files-ex bar/Bar2
-  git push
-) &> /dev/null || die
-
-(
-  cd "$OWNER/bar"
-  modify-files-ex Bar2
-  git push
-) &> /dev/null || die
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar || {
-      cd .git/tmp/subrepo/bar
-      echo "Merged Bar2" > Bar2
-      git add Bar2
-      git commit --file ../../../../.git/worktrees/bar/MERGE_MSG
-      cd ../../../..
-      git subrepo commit bar
-      git subrepo clean bar
-  }
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/foo/bar/Bar2" \
-  "$OWNER/bar/Bar2" \
-
-is "$(cat "$OWNER/foo/bar/Bar2")" \
-  "Merged Bar2" \
-  "The readme file in the mainrepo is merged"
-
-# Check commit messages
-{
-  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
-  like "$foo_new_commit_message" \
-      "git subrepo commit \(merge\) bar" \
-      "subrepo pull should have merge message"
-}
-
-# Test foo/bar/.gitrepo file contents:
-{
-  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
-  test-gitrepo-field "commit" "$bar_head_commit"
-  test-gitrepo-field "parent" "$foo_pull_commit"
-}
-
-(
-  cd "$OWNER/foo"
-  git subrepo push bar
-) &> /dev/null || die
-
-# Check commit messages
-{
-  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
-  like "$foo_new_commit_message" \
-      "git subrepo push bar" \
-      "subrepo push should not have merge message"
-}
-
-(
-  cd "$OWNER/bar"
-  git pull
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/foo/bar/Bar2" \
-  "$OWNER/bar/Bar2" \
-
-is "$(cat "$OWNER/foo/bar/Bar2")" \
-  "Merged Bar2" \
-  "The readme file in the mainrepo is merged"
-
-is "$(cat "$OWNER/bar/Bar2")" \
-  "Merged Bar2" \
-  "The readme file in the subrepo is merged"
-
-done_testing
-
-teardown

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

@@ -1,88 +0,0 @@
-#!/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
-
-
-# Do the pull and check output, use -m:
-{
-  is "$(
-    cd "$OWNER/foo"
-    git subrepo pull -m 'Hello World' bar
-  )" \
-    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
-    'subrepo pull command output is correct'
-}
-
-# Check -m commit messages
-{
-  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
-  like "$foo_new_commit_message" \
-      "Hello World" \
-      "subrepo pull commit message"
-}
-
-(
-  cd "$OWNER/bar"
-  add-new-files Bar3
-  git push
-) &> /dev/null || die
-
-# Do the pull and check output, use -e:
-{
-  is "$(
-    cd "$OWNER/foo"
-    GIT_EDITOR='echo cowabunga >' git subrepo pull -e bar
-  )" \
-    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
-    'subrepo pull command output is correct'
-}
-
-# Check -e commit messages
-{
-  foo_new_commit_message="$(cd "$OWNER/foo"; git log --format=%B -n 1)"
-  like "$foo_new_commit_message" \
-      "cowabunga" \
-      "subrepo pull edit commit message"
-}
-
-(
-  cd "$OWNER/bar"
-  add-new-files Bar4
-  git push
-) &> /dev/null || die
-
-# Do the pull and check output, use -e and -m:
-{
-  is "$(
-    cd "$OWNER/foo"
-    GIT_EDITOR=true git subrepo pull -e -m original bar
-  )" \
-    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
-    'subrepo pull command output is correct'
-}
-
-# Check -e commit messages
-{
-  foo_new_commit_message="$(cd "$OWNER/foo"; git log --format=%B -n 1)"
-  like "$foo_new_commit_message" \
-      "original" \
-      "subrepo pull edit and message commit message"
-}
-
-done_testing
-
-teardown

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

@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-source test/setup
-
-use Test::More
-
-clone-foo-and-bar
-
-subrepo-clone-bar-into-foo
-
-(
-  cd "$OWNER/bar"
-  git checkout -b branch1
-  git push --set-upstream origin branch1
-) &> /dev/null || die
-
-# Test subrepo file content:
-# shellcheck disable=2034
-gitrepo=$OWNER/foo/bar/.gitrepo
-
-{
-  foo_pull_commit=$(cd "$OWNER/foo" || exit; git rev-parse HEAD^)
-  bar_head_commit=$(cd "$OWNER/bar" || exit; 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)"
-}
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar -b branch1 -u
-) &> /dev/null || die
-
-{
-  foo_pull_commit=$(cd "$OWNER/foo" || exit; git rev-parse HEAD^)
-  bar_head_commit=$(cd "$OWNER/bar" || exit; git rev-parse HEAD)
-  test-gitrepo-comment-block
-  test-gitrepo-field remote "$UPSTREAM/bar"
-  test-gitrepo-field branch branch1
-  test-gitrepo-field commit "$bar_head_commit"
-  test-gitrepo-field parent "$foo_pull_commit"
-  test-gitrepo-field cmdver "$(git subrepo --version)"
-}
-
-{
-  is "$(
-    cd "$OWNER/foo" || exit
-    git subrepo pull bar
-  )" \
-    "Subrepo 'bar' is up to date." \
-    'subrepo detects that we dont need to pull'
-}
-
-done_testing
-
-teardown

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

@@ -1,90 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-clone-foo-and-bar
-
-subrepo-clone-bar-into-foo
-
-note "Pull - Conflict - Use ours - Push"
-
-#
-# When you perform rebase ours/theirs are reversed, so this test case will
-# test using local change (ours) although in the step below
-# we actually use git checkout --theirs to accomplish this
-#
-
-(
-  cd "$OWNER/bar"
-  add-new-files Bar2
-  git push
-) &> /dev/null || die
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar
-  modify-files-ex bar/Bar2
-  cat bar/Bar2
-  git push
-) &> /dev/null || die
-
-(
-  cd "$OWNER/bar"
-  modify-files-ex Bar2
-  git push
-) &> /dev/null || die
-
-before=$(date -r "$OWNER/foo/Foo" '+%s')
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar || {
-      cd .git/tmp/subrepo/bar
-      git checkout --ours Bar2
-      git add Bar2
-      git commit --file ../../../../.git/worktrees/bar/MERGE_MSG
-      cd ../../../..
-      git subrepo commit bar
-      git subrepo clean bar
-  }
-) &> /dev/null || die
-
-sleep 1
-after=$(date -r "$OWNER/foo/Foo" '+%s')
-
-is "$before" "$after" \
-  "No modification on Foo"
-
-test-exists \
-  "$OWNER/foo/bar/Bar2" \
-  "$OWNER/bar/Bar2" \
-
-is "$(cat "$OWNER/foo/bar/Bar2")" \
-  "new file Bar2"$'\n'"bar/Bar2" \
-  "The readme file in the mainrepo is ours"
-
-(
-  cd "$OWNER/foo"
-  git subrepo push bar
-) &> /dev/null || die
-
-(
-  cd "$OWNER/bar"
-  git pull
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/foo/bar/Bar2" \
-  "$OWNER/bar/Bar2" \
-
-is "$(cat "$OWNER/bar/Bar2")" \
-  "new file Bar2"$'\n'"bar/Bar2" \
-  "The readme file in the subrepo is ours"
-
-done_testing
-
-teardown

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

@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-clone-foo-and-bar
-
-subrepo-clone-bar-into-foo
-
-note "Pull - Conflict - Use theirs - Push"
-
-#
-# When you perform rebase ours/theirs are reversed, so this test case will
-# test using the subrepo change (theirs) although in the step below
-# we actually use git checkout --ours to accomplish this
-#
-
-(
-  cd "$OWNER/bar"
-  add-new-files Bar2
-  git push
-) &> /dev/null || die
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar
-  modify-files-ex bar/Bar2
-  git push
-) &> /dev/null || die
-
-(
-  cd "$OWNER/bar"
-  modify-files-ex Bar2
-  git push
-) &> /dev/null || die
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar || {
-      cd .git/tmp/subrepo/bar
-      git checkout --theirs Bar2
-      git add Bar2
-      git commit --file ../../../../.git/worktrees/bar/MERGE_MSG
-      cd ../../../..
-      git subrepo commit bar
-      git subrepo clean bar
-  }
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/foo/bar/Bar2" \
-  "$OWNER/bar/Bar2" \
-
-is "$(cat "$OWNER/foo/bar/Bar2")" \
-  "new file Bar2"$'\n'"Bar2" \
-  "The readme file in the mainrepo is theirs"
-
-(
-  cd "$OWNER/foo"
-  cat bar/Bar2
-  git subrepo push bar
-) &> /dev/null || die
-
-(
-  cd "$OWNER/bar"
-  git pull
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/foo/bar/Bar2" \
-  "$OWNER/bar/Bar2" \
-
-is "$(cat "$OWNER/bar/Bar2")" \
-  "new file Bar2"$'\n'"Bar2" \
-  "The readme file in the subrepo is theirs"
-
-done_testing
-
-teardown

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

@@ -1,44 +0,0 @@
-#!/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"
-  add-new-files bar/Foo2
-  git push
-  git subrepo pull bar
-) &> /dev/null || die
-
-(
-  cd "$OWNER/bar"
-  add-new-files Bar3
-  git push
-) &> /dev/null || die
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/foo/bar/Bar2" \
-  "$OWNER/foo/bar/Bar3" \
-  "$OWNER/foo/bar/Foo2" \
-
-done_testing
-
-teardown

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

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