eac_tools 0.123.1 → 0.124.0

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

@@ -1,99 +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:
-{
-  is "$(
-    cd "$OWNER/foo"
-    git subrepo pull bar
-  )" \
-    "Subrepo 'bar' pulled from '$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)"
-}
-
-# Check commit messages
-{
-  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
-  like "$foo_new_commit_message" \
-      "git subrepo pull bar" \
-      "Subrepo pull commit message OK"
-  bar_commit_short=$(git rev-parse --short "$bar_head_commit")
-  like "$foo_new_commit_message" \
-      "merged:   \"$bar_commit_short" \
-      "Pull commit contains merged"
-}
-
-# Check that we detect that we don't need to pull
-{
-  is "$(
-    cd "$OWNER/foo"
-    git subrepo pull bar
-  )" \
-    "Subrepo 'bar' is up to date." \
-    'subrepo detects that we dont need to pull'
-}
-
-# Test pull if we have rebased the original subrepo so that our clone
-# commit is no longer present in the history
-(
-  cd "$OWNER/bar"
-  git reset --hard master^^
-  add-new-files Bar3
-  git push --force
-) &> /dev/null || die
-
-{
-  test-exists \
-    !"$OWNER/foo/pull_failed"
-}
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar || touch pull_failed
-) &> /dev/null || die
-
-# We check that the control file was created
-{
-  test-exists \
-    "$OWNER/foo/pull_failed"
-}
-
-done_testing # 9
-
-teardown

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

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-# Create directory and init git locally as this will test some corner
-# cases when you don't have any previous commits to rely on
-# see issue/122
-(
-  mkdir -p "$OWNER/init"
-  cd "$OWNER/init"
-  git init
-  mkdir doc
-  add-new-files doc/FooBar
-  git subrepo init doc || die
-  mkdir ../upstream
-  git init --bare ../upstream || die
-) &> /dev/null
-
-output=$(
-  cd "$OWNER/init"
-  git subrepo push doc --remote=../upstream
-)
-
-is "$output" "Subrepo 'doc' pushed to '../upstream' (master)." \
-  'Command output is correct'
-
-# Test init/doc/.gitrepo file contents:
-# shellcheck disable=2034
-gitrepo=$OWNER/init/doc/.gitrepo
-{
-  test-gitrepo-field "remote" "../upstream"
-  test-gitrepo-field "branch" "master"
-}
-
-(
-  cd "$OWNER"
-  git clone upstream up
-) &>/dev/null
-
-{
-  test-exists \
-    "$OWNER/up/.git/" \
-    "!$OWNER/up/.gitrepo"
-}
-
-done_testing
-
-teardown

data/sub/eac_git/vendor/git-subrepo/test/push-after-push-no-changes.t

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-clone-foo-and-bar
-subrepo-clone-bar-into-foo
-
-{
-  message=$(
-    cd "$OWNER/foo"
-    git subrepo push bar > /dev/null
-    add-new-files bar/Bar1
-    catch git subrepo push bar
-  )
-
-  is "$message" \
-    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
-    "Output OK: Check that 'push' after an empty push works."
-}
-
-done_testing 1
-
-teardown

data/sub/eac_git/vendor/git-subrepo/test/push-force.t

@@ -1,57 +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/Foo1
-  git subrepo push bar --force
-) &> /dev/null || die
-
-(
-  cd "$OWNER/foo"
-  git subrepo pull bar
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/foo/bar/Foo1" \
-  !"$OWNER/foo/bar/Bar2" \
-
-# Pull here will actually merge the old master with the new one
-(
-  set +x
-  cd "$OWNER/bar"
-  git pull --rebase=false
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/bar/Bar2" \
-  "$OWNER/bar/Foo1" \
-
-
-# Test that a fresh repo is not contaminated
-(
-  git clone "$UPSTREAM/bar" "$OWNER/newbar"
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/newbar/Foo1" \
-  !"$OWNER/foo/bar/Bar2" \
-
-done_testing
-
-teardown

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

@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-clone-foo-and-bar
-
-# Make various changes to the repos for testing subrepo push:
-(
-  # In the main repo:
-  cd "$OWNER/foo"
-
-  # Clone the subrepo into a subdir
-  git subrepo clone "$UPSTREAM/bar"
-
-  # Make a commit:
-  add-new-files bar/FooBar
-) &> /dev/null || die
-
-# Do the subrepo push to another branch:
-{
-  message=$(
-    cd "$OWNER/foo"
-    git subrepo push bar --branch newbar
-  )
-
-  # Test the output:
-  is "$message" \
-    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (newbar)." \
-    'First push message is correct '
-}
-
-# Do the subrepo push to another branch again:
-{
-  message=$(
-    cd "$OWNER/foo"
-    git subrepo push bar --branch newbar
-  )
-
-  # Test the output:
-  is "$message" \
-    "Subrepo 'bar' has no new commits to push." \
-    'Second push message is correct'
-}
-
-# Pull the changes from UPSTREAM/bar in OWNER/bar
-(
-  cd "$OWNER/bar"
-  git fetch
-  git checkout newbar
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/bar/FooBar" \
-
-done_testing
-
-teardown

data/sub/eac_git/vendor/git-subrepo/test/push-no-changes.t

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-note "Test output from successful git-subrepo commands"
-
-clone-foo-and-bar
-
-{
-  is "$(
-    cd "$OWNER/bar"
-    git subrepo --quiet clone "$UPSTREAM/foo"
-    catch git subrepo push foo
-  )" \
-    "Subrepo 'foo' has no new commits to push." \
-    "Output OK: Check that 'push' requires changes to push"
-  (
-    cd "$OWNER/bar"
-    git subrepo --quiet clean foo
-  )
-}
-
-done_testing 1
-
-teardown

data/sub/eac_git/vendor/git-subrepo/test/push-squash.t

@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-clone-foo-and-bar
-
-# Make various changes to the repos for testing subrepo push:
-(
-  # In the main repo:
-  cd "$OWNER/foo"
-
-  # Clone the subrepo into a subdir
-  git subrepo clone "$UPSTREAM/bar"
-
-  # Make a series of commits:
-  add-new-files bar/FooBar1
-  add-new-files bar/FooBar2
-  modify-files bar/FooBar1
-  add-new-files ./FooBar
-  modify-files ./FooBar bar/FooBar2
-) &> /dev/null || die
-
-# Do the subrepo push and test the output:
-{
-  message=$(
-    cd "$OWNER/foo"
-    git subrepo push bar --squash
-  )
-
-  # Test the output:
-  is "$message" \
-    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
-    'push message is correct'
-}
-
-(
-  cd "$OWNER/bar"
-  git pull
-) &> /dev/null || die
-
-# Check that all commits arrived in subrepo
-test-commit-count "$OWNER/bar" HEAD 3
-
-test-exists \
-  "$OWNER/bar/Bar" \
-  "$OWNER/bar/FooBar1" \
-  "$OWNER/bar/FooBar2" \
-  "!$OWNER/bar/.gitrepo" \
-
-done_testing
-
-teardown

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

@@ -1,177 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-unset GIT_{AUTHOR,COMMITTER}_{EMAIL,NAME}
-
-clone-foo-and-bar
-
-# Make various changes to the repos for testing subrepo push:
-(
-  # In the main repo:
-  cd "$OWNER/foo"
-
-  # Clone the subrepo into a subdir
-  git subrepo clone "$UPSTREAM/bar"
-
-  # Make a series of commits:
-  add-new-files bar/FooBar
-  add-new-files ./FooBar
-  modify-files bar/FooBar
-  modify-files ./FooBar
-  modify-files ./FooBar bar/FooBar
-) &> /dev/null || die
-
-(
-  cd "$OWNER/bar"
-  add-new-files bargy
-  git push
-) &> /dev/null || die
-
-# Do the subrepo push and test the output:
-{
-  message=$(
-    cd "$OWNER/foo"
-    git config user.name 'PushUser'
-    git config user.email 'push@push'
-    git subrepo pull --quiet bar
-    git subrepo push bar
-  )
-
-  # Test the output:
-  is "$message" \
-    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
-    'push message is correct'
-}
-
-(
-  cd "$OWNER/bar"
-  git pull
-) &> /dev/null || die
-
-{
-  pullCommit=$(
-    cd "$OWNER/bar"
-    git log HEAD -1 --pretty='format:%an %ae %cn %ce'
-  )
-
-  is "$pullCommit" \
-    "PushUser push@push PushUser push@push" \
-    "Pull commit has PushUser as both author and committer"
-}
-
-{
-  subrepoCommit=$(
-    cd "$OWNER/bar"
-    git log HEAD^ -1 --pretty='format:%an %ae %cn %ce'
-  )
-
-  is "$subrepoCommit" \
-    "FooUser foo@foo PushUser push@push" \
-    "Subrepo commits has FooUser as author but PushUser as committer"
-}
-
-# Check that all commits arrived in subrepo
-test-commit-count "$OWNER/bar" HEAD 7
-
-# Test foo/bar/.gitrepo file contents:
-# shellcheck disable=2034
-gitrepo=$OWNER/foo/bar/.gitrepo
-{
-  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
-  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
-  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)"
-}
-
-(
-  # In the main repo:
-  cd "$OWNER/foo"
-  add-new-files bar/FooBar2
-  modify-files bar/FooBar
-) &> /dev/null || die
-
-{
-  message=$(
-    cd "$OWNER/foo"
-    git subrepo push bar
-  )
-
-  # Test the output:
-  is "$message" \
-    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
-    'push message is correct'
-}
-
-# Pull the changes from UPSTREAM/bar in OWNER/bar
-(
-  cd "$OWNER/bar"
-  git pull
-) &> /dev/null || die
-
-test-exists \
-  "$OWNER/bar/Bar" \
-  "$OWNER/bar/FooBar" \
-  "$OWNER/bar/bard/" \
-  "$OWNER/bar/bargy" \
-  "!$OWNER/bar/.gitrepo" \
-
-(
-  # In the main repo:
-  cd "$OWNER/foo"
-  add-new-files bar/FooBar3
-  modify-files bar/FooBar
-  git subrepo push bar
-  add-new-files bar/FooBar4
-  modify-files bar/FooBar3
-) &> /dev/null || die
-
-{
-  message=$(
-    cd "$OWNER/foo"
-    git subrepo push bar
-  )
-
-  # Test the output:
-  is "$message" \
-    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
-    'Seqential pushes are correct'
-}
-
-(
-  # In the subrepo
-  cd "$OWNER/bar"
-  git pull
-  add-new-files barBar2
-  git push
-) &> /dev/null || die
-
-(
-  # In the main repo:
-  cd "$OWNER/foo"
-  add-new-files bar/FooBar5
-  modify-files bar/FooBar3
-) &> /dev/null || die
-
-{
-  message=$(
-    cd "$OWNER/foo"
-    git subrepo push bar 2>&1 || true
-  )
-
-  # Test the output:
-  is "$message" \
-    "git-subrepo: There are new changes upstream, you need to pull first." \
-    'Stopped by other push'
-}
-
-done_testing
-
-teardown

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

@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-# Setup foo with 2 branches, one before the subrepo
-# is added and one after so that we can rebase
-# thus destroying the parent in two ways. The first
-# destroys the second parent, but leave a reference to
-# a merge point. The second such that no history of
-# a merge point exists.
-
-clone-foo-and-bar
-
-(
-    cd "$OWNER/foo"
-    git switch -c branch1
-    add-new-files foo1
-    subrepo-clone-bar-into-foo
-    git branch branch2
-    add-new-files foo2
-) &> /dev/null || die
-
-(
-    cd "$OWNER/bar"
-    add-new-files bar2
-    git push
-) &> /dev/null || die
-
-(
-    cd "$OWNER/foo"
-    # Rebasing onto this merge point will still
-    # be able to find the merge point at branch1
-    git subrepo pull bar
-)
-
-(
-    cd "$OWNER/foo"
-    git switch branch2
-    add-new-files foo-branch2
-    git switch branch1
-    git rebase branch2
-) &> /dev/null || die
-
-# Force subrepo to search of the parent SHA,
-# validate it found the prevous merge point
-{
-    output=$(
-      cd "$OWNER/foo"
-      git subrepo clean --force --all
-      catch git subrepo branch bar
-    )
-
-    like "$output" "caused by a rebase" \
-      "subrepo detected merge point"
-}
-
-done_testing 1
-
-teardown

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

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-source test/setup
-
-use Test::More
-
-clone-foo-and-bar
-
-(
-  cd "$OWNER/foo"
-  git subrepo --quiet clone "$UPSTREAM/bar"
-)
-
-test-exists \
-  "$OWNER/foo/bar/bard/"
-
-# Test that reclone is not done if not needed.
-export XYZ=1
-is "$(
-  cd "$OWNER/foo"
-  git subrepo --force clone "$UPSTREAM/bar"
-)" \
-  "Subrepo 'bar' is up to date." \
-  "No reclone if same commit"
-
-# Test that reclone of a different ref works.
-(
-  cd "$OWNER/foo"
-  git subrepo --quiet clone --force "$UPSTREAM/bar" --branch=refs/tags/A
-)
-
-is "$(git -C "$OWNER"/foo subrepo config bar branch)" \
-  "Subrepo 'bar' option 'branch' has value 'refs/tags/A'."
-test-exists \
-  "!$OWNER/foo/bar/bard/"
-
-# Test that reclone back to (implicit) master works.
-(
-  cd "$OWNER/foo"
-  git subrepo --quiet clone -f "$UPSTREAM/bar"
-)
-
-is "$(git -C "$OWNER"/foo subrepo config bar branch)" \
-  "Subrepo 'bar' option 'branch' has value 'master'."
-test-exists \
-  "$OWNER/foo/bar/bard/"
-
-done_testing
-
-teardown

data/sub/eac_git/vendor/git-subrepo/test/repo/bar/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/master

data/sub/eac_git/vendor/git-subrepo/test/repo/bar/config

@@ -1,4 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = true

data/sub/eac_git/vendor/git-subrepo/test/repo/bar/refs/heads/master

@@ -1 +0,0 @@
-94c86ffc745232d89f78c6f895e11e71272518db

data/sub/eac_git/vendor/git-subrepo/test/repo/bar/refs/tags/A

@@ -1 +0,0 @@
-f62a8ff3feadf39b0a98f1a86ec6d1eb33858ee9