eac_tools 0.84.2 → 0.85.0

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

@@ -1,56 +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
-) &> /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 '../../../tmp/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 '../../../tmp/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,176 +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 '../../../tmp/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:
-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 '../../../tmp/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 '../../../tmp/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/reclone.t

@@ -1,45 +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/"
-
-export XYZ=1
-is "$(
-  cd $OWNER/foo
-  git subrepo --force clone ../../../$UPSTREAM/bar
-)" \
-  "Subrepo 'bar' is up to date." \
-  "No reclone if same commit"
-
-(
-  cd $OWNER/foo
-  git subrepo --quiet clone --force ../../../$UPSTREAM/bar --branch=refs/tags/A
-)
-
-test-exists \
-  "!$OWNER/foo/bar/bard/"
-
-(
-  cd $OWNER/foo
-  git subrepo --quiet clone -f ../../../$UPSTREAM/bar --branch=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

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

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

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

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

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

@@ -1 +0,0 @@
-e21291a1ad392a9d4c51dd9586804f1467b28afd

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

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

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

@@ -1,5 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true

data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/32/5180321750a21cd7a4e7ecda319e557a4f6a09

@@ -1,2 +0,0 @@
-x
���M�0E9��i`W����B�=�x&�qPv���j(��JP
�'=�?��uY��	Ím�4VK�)I������"�C.�F�{�M�A��Ap�5d,���$M�9�Z2sF�������������Q
-�e_*\�,m;�oE�Zf

data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/75/fa6584e748f57eff06eebdc55e9ac21d4fcbf2

@@ -1 +0,0 @@
-x
-�A�09���N}@���6�!��%n+~��*�qf6�F\o��0��F�X��!<w�f�X�0�+��͆~������2�|	a4oԱ�L��gM��(��/�©`gDr��∹���1�

data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/95/e1f2df3f4d5f3d7a60588c25a7ca8a913d3c2a

@@ -1 +0,0 @@
-x
+)JMU06g040031Q���,�+.��eѺ��M���_s���Nҧc]�k
Ga1

data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/c8/b0bffbc405ef3fad7354ff833fbec36d67ddfa

@@ -1,3 +0,0 @@
-x
-�Q
-�0P���
-"���[�&Y��6+����

data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/dd/8bdb934ec848137f011fe423b185505c343626

@@ -1,2 +0,0 @@
-x
5N�
-1�_�PA���^��a;X[i�,���A!�!�<b���ywM�A4yW!�0/j�#:�Em>N�M�j�x����Sm���K9�C���`�C��Ɠ�'R�����d_�]^�T�l�����CM�� 

data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/e2/9be58c767cfeb27235c995d293a7d71aac0135

@@ -1,2 +0,0 @@
-x
5N�
-1�ܯ����^�հ

data/sub/eac_git/vendor/git-subrepo/test/repo/init/objects/ee/1224401fc6aac595145fa727dcf6706ac8aec1

@@ -1 +0,0 @@
-x
+)JMU06a040031QJML�Me�xF*�Z�!Ɓ?�Ԫ����Ļ�
ru

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

@@ -1 +0,0 @@
-325180321750a21cd7a4e7ecda319e557a4f6a09