From dc950bed9e031245fc11df8ed1cf0c0762cb2181 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 30 Jul 2014 11:27:27 -0700 Subject: [PATCH] Add tests for git branch checkout There is now a git repository (with .git renamed to "git" to avoid confusing git on the command line) in the test resources. The git environment reporitory tests use it to test checking out labels. Fixes gh-2 --- .../platform/config/Environment.java | 6 + .../platform/config/PropertySource.java | 9 + .../server/JGitEnvironmentRepository.java | 42 ++++- .../JGitEnvironmentRepositoryTests.java | 31 +++- .../resources/config-repo/application.yml | 3 + .../test/resources/config-repo/bar.properties | 1 + .../resources/config-repo/git/COMMIT_EDITMSG | 1 + .../src/test/resources/config-repo/git/HEAD | 1 + .../src/test/resources/config-repo/git/config | 5 + .../resources/config-repo/git/description | 1 + .../git/hooks/applypatch-msg.sample | 15 ++ .../config-repo/git/hooks/commit-msg.sample | 24 +++ .../config-repo/git/hooks/post-update.sample | 8 + .../git/hooks/pre-applypatch.sample | 14 ++ .../config-repo/git/hooks/pre-commit.sample | 49 +++++ .../config-repo/git/hooks/pre-push.sample | 54 ++++++ .../config-repo/git/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../git/hooks/prepare-commit-msg.sample | 36 ++++ .../config-repo/git/hooks/update.sample | 128 +++++++++++++ .../src/test/resources/config-repo/git/index | Bin 0 -> 192 bytes .../resources/config-repo/git/info/exclude | 6 + .../test/resources/config-repo/git/logs/HEAD | 3 + .../config-repo/git/logs/refs/heads/master | 1 + .../config-repo/git/logs/refs/heads/raw | 2 + .../6f/6575624c9446c064fa83cc8c32d2dd5fafcca3 | Bin 0 -> 99 bytes .../7d/aacd5db8d36bc6df962d1d01cb98d8713fe5c4 | Bin 0 -> 23 bytes .../7d/f4a26d5437d9d4090cd5809967f870444cde8f | Bin 0 -> 158 bytes .../87/91c22849104e1c8795747ccb678879a7c16771 | Bin 0 -> 32 bytes .../9f/01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 | 3 + .../bf/2861eb6e56b7560b825c010c61353353695b33 | Bin 0 -> 98 bytes .../d6/acc4059dae71916bc26e3092f08b24e4d7acae | Bin 0 -> 42 bytes .../config-repo/git/refs/heads/master | 1 + .../resources/config-repo/git/refs/heads/raw | 1 + 33 files changed, 608 insertions(+), 6 deletions(-) create mode 100644 spring-platform-config-server/src/test/resources/config-repo/application.yml create mode 100644 spring-platform-config-server/src/test/resources/config-repo/bar.properties create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/HEAD create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/config create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/description create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/applypatch-msg.sample create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/commit-msg.sample create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/post-update.sample create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-applypatch.sample create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-commit.sample create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-push.sample create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-rebase.sample create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/prepare-commit-msg.sample create mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/update.sample create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/index create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/info/exclude create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/6f/6575624c9446c064fa83cc8c32d2dd5fafcca3 create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/7d/aacd5db8d36bc6df962d1d01cb98d8713fe5c4 create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/7d/f4a26d5437d9d4090cd5809967f870444cde8f create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/87/91c22849104e1c8795747ccb678879a7c16771 create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/9f/01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/bf/2861eb6e56b7560b825c010c61353353695b33 create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/d6/acc4059dae71916bc26e3092f08b24e4d7acae create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/master create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/raw diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/config/Environment.java b/spring-platform-config-client/src/main/java/org/springframework/platform/config/Environment.java index e3ad1b5c..265dfbb6 100644 --- a/spring-platform-config-client/src/main/java/org/springframework/platform/config/Environment.java +++ b/spring-platform-config-client/src/main/java/org/springframework/platform/config/Environment.java @@ -58,4 +58,10 @@ public class Environment { return label; } + @Override + public String toString() { + return "Environment [name=" + name + ", label=" + label + ", propertySources=" + + propertySources + "]"; + } + } diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/config/PropertySource.java b/spring-platform-config-client/src/main/java/org/springframework/platform/config/PropertySource.java index 5ecb04e2..1f8ff661 100644 --- a/spring-platform-config-client/src/main/java/org/springframework/platform/config/PropertySource.java +++ b/spring-platform-config-client/src/main/java/org/springframework/platform/config/PropertySource.java @@ -21,6 +21,10 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +/** + * @author Dave Syer + * + */ /** * @author Dave Syer * @@ -46,4 +50,9 @@ public class PropertySource { return source; } + @Override + public String toString() { + return "PropertySource [name=" + name + "]"; + } + } diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java index c3ef14f6..12954992 100644 --- a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java +++ b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java @@ -19,10 +19,15 @@ package org.springframework.platform.config.server; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.eclipse.jgit.api.CheckoutCommand; +import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.util.FileUtils; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.platform.config.Environment; @@ -74,8 +79,16 @@ public class JGitEnvironmentRepository implements EnvironmentRepository { this.uri = uri; } + public String getUri() { + return uri; + } + public void setBasedir(File basedir) { - this.basedir = basedir; + this.basedir = basedir.getAbsoluteFile(); + } + + public File getBasedir() { + return basedir; } @Override @@ -102,7 +115,16 @@ public class JGitEnvironmentRepository implements EnvironmentRepository { Environment result; synchronized (this) { SpringApplicationEnvironmentRepository environment = new SpringApplicationEnvironmentRepository(); - git.checkout().setName(label).call(); + git.fetch().call(); + git.getRepository().getConfig().setString("branch", label, "merge", label); + CheckoutCommand checkout = git.checkout(); + if (!containsBranch(git, label)) { + trackBranch(git, checkout, label); + } + else { + checkout.setName(label); + } + checkout.call(); if (git.status().call().isClean()) { git.pull().call(); } @@ -117,6 +139,22 @@ public class JGitEnvironmentRepository implements EnvironmentRepository { } } + private void trackBranch(Git git, CheckoutCommand checkout, String label) { + checkout.setCreateBranch(true).setName(label) + .setUpstreamMode(SetupUpstreamMode.TRACK) + .setStartPoint("origin/" + label); + } + + private boolean containsBranch(Git git, String label) throws GitAPIException { + List branches = git.branchList().call(); + for (Ref ref : branches) { + if (ref.getName().equals("refs/heads/" + label)) { + return true; + } + } + return false; + } + private Environment clean(Environment value) { Environment result = new Environment(value.getName(), value.getLabel()); for (PropertySource source : value.getPropertySources()) { diff --git a/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java b/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java index 1e7876bd..1fe55798 100644 --- a/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java +++ b/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java @@ -21,24 +21,38 @@ import static org.junit.Assert.assertTrue; import java.io.File; +import org.eclipse.jgit.transport.JschConfigSessionFactory; +import org.eclipse.jgit.transport.OpenSshConfig.Host; +import org.eclipse.jgit.transport.SshSessionFactory; import org.eclipse.jgit.util.FileUtils; import org.junit.Before; import org.junit.Test; import org.springframework.core.env.StandardEnvironment; import org.springframework.platform.config.Environment; +import com.jcraft.jsch.Session; + /** * @author Dave Syer * */ public class JGitEnvironmentRepositoryTests { - private JGitEnvironmentRepository repository = new JGitEnvironmentRepository(new StandardEnvironment()); + private StandardEnvironment environment = new StandardEnvironment(); + private JGitEnvironmentRepository repository = new JGitEnvironmentRepository(environment); private File basedir = new File("target/config-repo"); @Before public void init() throws Exception { + SshSessionFactory.setInstance(new JschConfigSessionFactory() { + @Override + protected void configure(Host hc, Session session) { + session.setConfig("StrictHostKeyChecking", "no"); + } + }); + new File("target/test-classes/config-repo/git").renameTo(new File("target/test-classes/config-repo/.git")); + repository.setUri(environment.resolvePlaceholders("${user.name}@localhost:${user.dir}/target/test-classes/config-repo")); if (basedir.exists()) { FileUtils.delete(basedir, FileUtils.RECURSIVE); } @@ -49,7 +63,16 @@ public class JGitEnvironmentRepositoryTests { repository.findOne("bar", "staging", "master"); Environment environment = repository.findOne("bar", "staging", "master"); assertEquals(2, environment.getPropertySources().size()); - assertEquals(JGitEnvironmentRepository.DEFAULT_URI + "/bar.properties", + assertEquals(repository.getUri() + "/bar.properties", + environment.getPropertySources().get(0).getName()); + } + + @Test + public void branch() { + repository.setBasedir(basedir); + Environment environment = repository.findOne("bar", "staging", "raw"); + assertEquals(2, environment.getPropertySources().size()); + assertEquals(repository.getUri() + "/bar.properties", environment.getPropertySources().get(0).getName()); } @@ -59,7 +82,7 @@ public class JGitEnvironmentRepositoryTests { repository.findOne("bar", "staging", "master"); Environment environment = repository.findOne("bar", "staging", "master"); assertEquals(2, environment.getPropertySources().size()); - assertEquals(JGitEnvironmentRepository.DEFAULT_URI + "/bar.properties", + assertEquals(repository.getUri() + "/bar.properties", environment.getPropertySources().get(0).getName()); } @@ -71,7 +94,7 @@ public class JGitEnvironmentRepositoryTests { repository.findOne("bar", "staging", "master"); Environment environment = repository.findOne("bar", "staging", "master"); assertEquals(2, environment.getPropertySources().size()); - assertEquals(JGitEnvironmentRepository.DEFAULT_URI + "/bar.properties", + assertEquals(repository.getUri() + "/bar.properties", environment.getPropertySources().get(0).getName()); } diff --git a/spring-platform-config-server/src/test/resources/config-repo/application.yml b/spring-platform-config-server/src/test/resources/config-repo/application.yml new file mode 100644 index 00000000..d6acc405 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/application.yml @@ -0,0 +1,3 @@ +info: + foo: bar +raw: true diff --git a/spring-platform-config-server/src/test/resources/config-repo/bar.properties b/spring-platform-config-server/src/test/resources/config-repo/bar.properties new file mode 100644 index 00000000..7daacd5d --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/bar.properties @@ -0,0 +1 @@ +foo: bar \ No newline at end of file diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG b/spring-platform-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG new file mode 100644 index 00000000..5cda8c49 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG @@ -0,0 +1 @@ +Raw diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/HEAD b/spring-platform-config-server/src/test/resources/config-repo/git/HEAD new file mode 100644 index 00000000..9d474425 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/raw diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/config b/spring-platform-config-server/src/test/resources/config-repo/git/config new file mode 100644 index 00000000..515f4836 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/config @@ -0,0 +1,5 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/description b/spring-platform-config-server/src/test/resources/config-repo/git/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/applypatch-msg.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/applypatch-msg.sample new file mode 100755 index 00000000..8b2a2fe8 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/commit-msg.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/commit-msg.sample new file mode 100755 index 00000000..b58d1184 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/post-update.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/post-update.sample new file mode 100755 index 00000000..ec17ec19 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-applypatch.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-applypatch.sample new file mode 100755 index 00000000..b1f187c2 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-commit.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-commit.sample new file mode 100755 index 00000000..68d62d54 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-push.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-push.sample new file mode 100755 index 00000000..1f3bcebf --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-rebase.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-rebase.sample new file mode 100755 index 00000000..33730ca6 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/prepare-commit-msg.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/prepare-commit-msg.sample new file mode 100755 index 00000000..f093a02e --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/update.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/update.sample new file mode 100755 index 00000000..d8475837 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/index b/spring-platform-config-server/src/test/resources/config-repo/git/index new file mode 100644 index 0000000000000000000000000000000000000000..f71470a6ea5ece3fcf530acfbb336d3bdd0ee798 GIT binary patch literal 192 zcmZ?q402{*U|<5_;G1T@ENe`^foL<;?LQb8IG7pujD9gNG%jIaV15C?3^Lc&9ATZi zu5e=Zp*(|0AG%eZTwk+}fj_aJASW|9u_QA;Pp>jJ2WVjMO$~XSxsR1#G{ijSD`@6% z)UG-kyW?{9vHR0>Wf@P;xKU{T^aulAQeu%_K~a7|YEemMYBA6_hLWW@w~{JFR%F$v OGx)7|9B8#NWikMuRYZ&c literal 0 HcmV?d00001 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/info/exclude b/spring-platform-config-server/src/test/resources/config-repo/git/info/exclude new file mode 100644 index 00000000..a5196d1b --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD b/spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD new file mode 100644 index 00000000..ba7baee4 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406744306 -0700 commit (initial): Initial +9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406744327 -0700 checkout: moving from master to raw +9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 7df4a26d5437d9d4090cd5809967f870444cde8f Dave Syer 1406744330 -0700 commit: Raw diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master b/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master new file mode 100644 index 00000000..74322838 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406744306 -0700 commit (initial): Initial diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw b/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw new file mode 100644 index 00000000..1316a4f1 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406744327 -0700 branch: Created from HEAD +9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 7df4a26d5437d9d4090cd5809967f870444cde8f Dave Syer 1406744330 -0700 commit: Raw diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/6f/6575624c9446c064fa83cc8c32d2dd5fafcca3 b/spring-platform-config-server/src/test/resources/config-repo/git/objects/6f/6575624c9446c064fa83cc8c32d2dd5fafcca3 new file mode 100644 index 0000000000000000000000000000000000000000..c4142794b701c9804815965fc387d954c914f2d1 GIT binary patch literal 99 zcmV-p0G$7L0V^p=O;xZkWiT`_Ff%bxNGvGG$xKcx$;{8wtIW+|xVGj9>)dsP6SEKH z8BF@nt@7mhnsrd6Nr^>z1x5JAUjSxy50cH;>6 literal 0 HcmV?d00001 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/7d/f4a26d5437d9d4090cd5809967f870444cde8f b/spring-platform-config-server/src/test/resources/config-repo/git/objects/7d/f4a26d5437d9d4090cd5809967f870444cde8f new file mode 100644 index 0000000000000000000000000000000000000000..c579fd0693371fa60336afdf79bc513ef5da145d GIT binary patch literal 158 zcmV;P0Ac@l0hNy12?8+?0R2uCX+X(ilUzW=4=d0L_BOjJc;-0ciQStP{2CY-7^>5B zZ`xVdw1rtmi6MpPfHFWN6G3qBL<4zOTq!|Nh|sGU7k)OK#aJ10awFwv69Z$&5@=xd z#A6T%Hc&AN-|bcxeZrOX<;#oSmsiK}TIc&(8$Nbar-Qa&Vgm5q=&eb{sBZgU>%rft MI^#$E0989gS3bE(GXMYp literal 0 HcmV?d00001 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/87/91c22849104e1c8795747ccb678879a7c16771 b/spring-platform-config-server/src/test/resources/config-repo/git/objects/87/91c22849104e1c8795747ccb678879a7c16771 new file mode 100644 index 0000000000000000000000000000000000000000..1a77413759dc159a662981fec3bee2bed799b42b GIT binary patch literal 32 ocmb4GbG;8.D8GGQaWmp  NOU !rm UPzwKfs3!zGr5{vW-it-Cmi%K$6iy3NHosHdbIs4fCX}YqEr)S(Kw10X802D(d EMO_>$>;M1& literal 0 HcmV?d00001 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/d6/acc4059dae71916bc26e3092f08b24e4d7acae b/spring-platform-config-server/src/test/resources/config-repo/git/objects/d6/acc4059dae71916bc26e3092f08b24e4d7acae new file mode 100644 index 0000000000000000000000000000000000000000..fc51db398b9047f7c2546eb9633282ab65e27c39 GIT binary patch literal 42 zcmV+_0M-9^0ZYosPf{?lV93l%%ePYCQcy_C2hvH2MO;ORZq#ik(> ALjV8( literal 0 HcmV?d00001 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/master b/spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/master new file mode 100644 index 00000000..8ee07e38 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/master @@ -0,0 +1 @@ +9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/raw b/spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/raw new file mode 100644 index 00000000..4389eb3a --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/refs/heads/raw @@ -0,0 +1 @@ +7df4a26d5437d9d4090cd5809967f870444cde8f