eac_git 0.1.0 → 0.2.0

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

@@ -0,0 +1,51 @@
+#!/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:
+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/vendor/git-subrepo/test/push-force.t

@@ -0,0 +1,56 @@
+#!/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/vendor/git-subrepo/test/push-new-branch.t

@@ -0,0 +1,61 @@
+#!/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/vendor/git-subrepo/test/push-no-changes.t

@@ -0,0 +1,29 @@
+#!/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/vendor/git-subrepo/test/push-squash.t

@@ -0,0 +1,56 @@
+#!/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/vendor/git-subrepo/test/push.t

@@ -0,0 +1,176 @@
+#!/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/vendor/git-subrepo/test/reclone.t

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