eac_git 0.1.0 → 0.2.0

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

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

@@ -0,0 +1,58 @@
+#!/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:
+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-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"; 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 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
+    git subrepo pull bar
+  )" \
+    "Subrepo 'bar' is up to date." \
+    'subrepo detects that we dont need to pull'
+}
+
+done_testing
+
+teardown

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

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

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

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

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

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

@@ -0,0 +1,99 @@
+#!/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 '../../../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`"
+}
+
+# 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