From ae98eccb30aa6e062fe40ba90137ecbacd3283ab Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 27 Apr 2017 22:17:04 +0800 Subject: [PATCH 1/3] improve integration test to resue models/fixtures and store git repos with source --- Makefile | 2 +- integrations/gitea-integration.tar.gz | Bin 0 -> 8193 bytes integrations/integration_test.go | 2 +- integrations/view_test.go | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 integrations/gitea-integration.tar.gz diff --git a/Makefile b/Makefile index 4796eb30551ab..76e65a51ef9f8 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ integrations.test: $(SOURCES) go test -c code.gitea.io/gitea/integrations -tags 'sqlite' integrations/gitea-integration: - curl -L https://github.com/ethantkoenig/gitea-integration/archive/v2.tar.gz > integrations/gitea-integration.tar.gz + rm -rf integrations/gitea-integration mkdir -p integrations/gitea-integration tar -xf integrations/gitea-integration.tar.gz -C integrations/gitea-integration --strip-components 1 diff --git a/integrations/gitea-integration.tar.gz b/integrations/gitea-integration.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3a824af36047b5f811c49edd6833a685df7e693e GIT binary patch literal 8193 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 literal 0 HcmV?d00001 diff --git a/integrations/integration_test.go b/integrations/integration_test.go index db78eead8625a..492210530e426 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -48,7 +48,7 @@ func TestMain(m *testing.M) { err := models.InitFixtures( helper, - "integrations/gitea-integration/fixtures/", + "models/fixtures/", ) if err != nil { fmt.Printf("Error initializing test database: %v\n", err) diff --git a/integrations/view_test.go b/integrations/view_test.go index 1314fe3832ebe..d937cdd851960 100644 --- a/integrations/view_test.go +++ b/integrations/view_test.go @@ -16,7 +16,7 @@ import ( func TestViewRepo(t *testing.T) { assert.NoError(t, models.LoadFixtures()) - req, err := http.NewRequest("GET", "/user1/repo1", nil) + req, err := http.NewRequest("GET", "/user2/repo1", nil) assert.NoError(t, err) resp := MakeRequest(req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) @@ -25,7 +25,7 @@ func TestViewRepo(t *testing.T) { func TestViewUser(t *testing.T) { assert.NoError(t, models.LoadFixtures()) - req, err := http.NewRequest("GET", "/user1", nil) + req, err := http.NewRequest("GET", "/user2", nil) assert.NoError(t, err) resp := MakeRequest(req) assert.EqualValues(t, http.StatusOK, resp.HeaderCode) From 6628b1dfd13ab859de626201f6b88202a913e93e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Apr 2017 09:36:20 +0800 Subject: [PATCH 2/3] use gitea-integration-meta dir instead .tar.gz and cleanup every before every test --- .gitignore | 3 +- Makefile | 12 +- integrations/gitea-integration-meta/LICENSE | 21 +++ integrations/gitea-integration-meta/README.md | 2 + .../gitea-repositories/user2/repo1.git/HEAD | 1 + .../gitea-repositories/user2/repo1.git/config | 4 + .../user2/repo1.git/description | 1 + .../repo1.git/hooks/applypatch-msg.sample | 15 ++ .../user2/repo1.git/hooks/commit-msg.sample | 24 +++ .../user2/repo1.git/hooks/post-receive | 7 + .../repo1.git/hooks/post-receive.d/gitea | 2 + .../user2/repo1.git/hooks/post-update.sample | 8 + .../repo1.git/hooks/pre-applypatch.sample | 14 ++ .../user2/repo1.git/hooks/pre-commit.sample | 49 +++++ .../user2/repo1.git/hooks/pre-push.sample | 53 ++++++ .../user2/repo1.git/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../user2/repo1.git/hooks/pre-receive | 7 + .../user2/repo1.git/hooks/pre-receive.d/gitea | 2 + .../repo1.git/hooks/prepare-commit-msg.sample | 36 ++++ .../user2/repo1.git/hooks/update | 7 + .../user2/repo1.git/hooks/update.d/gitea | 2 + .../user2/repo1.git/hooks/update.sample | 128 +++++++++++++ .../user2/repo1.git/info/exclude | 6 + .../user2/repo1.git/info/refs | 1 + .../2a/2f1d4670728a2e10049e345bd7a276468beab6 | Bin 0 -> 54 bytes .../4b/4851ad51df6a7d9f25c979345979eaeb5b349f | Bin 0 -> 42 bytes .../65/f1bf27bc3bf70f64657658635e66094edbcb4d | Bin 0 -> 150 bytes .../user2/repo1.git/objects/info/packs | 1 + .../user2/repo1.git/refs/heads/master | 1 + integrations/gitea-integration.tar.gz | Bin 8193 -> 0 bytes integrations/integration_test.go | 8 + integrations/signup_test.go | 4 +- integrations/version_test.go | 3 +- integrations/view_test.go | 6 +- 34 files changed, 579 insertions(+), 18 deletions(-) create mode 100644 integrations/gitea-integration-meta/LICENSE create mode 100644 integrations/gitea-integration-meta/README.md create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/HEAD create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/config create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/description create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/applypatch-msg.sample create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/commit-msg.sample create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive.d/gitea create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-update.sample create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-applypatch.sample create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-commit.sample create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-push.sample create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-rebase.sample create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive.d/gitea create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/prepare-commit-msg.sample create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.d/gitea create mode 100755 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.sample create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/exclude create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/refs create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/info/packs create mode 100644 integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/refs/heads/master delete mode 100644 integrations/gitea-integration.tar.gz diff --git a/.gitignore b/.gitignore index 8e1689e657c3a..d9e96b75dcf2b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ coverage.out *.log /gitea +/integrations.test /bin /dist @@ -44,4 +45,4 @@ coverage.out /indexers /log /public/img/avatar -/integrations/gitea-integration* +/integrations/gitea-integration \ No newline at end of file diff --git a/Makefile b/Makefile index 76e65a51ef9f8..93ca44818d093 100644 --- a/Makefile +++ b/Makefile @@ -87,27 +87,21 @@ test-vendor: govendor status +outside +unused || exit 1 .PHONY: test-sqlite -test-sqlite: integrations.test integrations/gitea-integration +test-sqlite: integrations.test GITEA_CONF=integrations/sqlite.ini ./integrations.test .PHONY: test-mysql -test-mysql: integrations.test integrations/gitea-integration +test-mysql: integrations.test echo "CREATE DATABASE IF NOT EXISTS testgitea" | mysql -u root GITEA_CONF=integrations/mysql.ini ./integrations.test .PHONY: test-pgsql -test-pgsql: integrations.test integrations/gitea-integration +test-pgsql: integrations.test GITEA_CONF=integrations/pgsql.ini ./integrations.test integrations.test: $(SOURCES) go test -c code.gitea.io/gitea/integrations -tags 'sqlite' -integrations/gitea-integration: - rm -rf integrations/gitea-integration - mkdir -p integrations/gitea-integration - tar -xf integrations/gitea-integration.tar.gz -C integrations/gitea-integration --strip-components 1 - - .PHONY: check check: test diff --git a/integrations/gitea-integration-meta/LICENSE b/integrations/gitea-integration-meta/LICENSE new file mode 100644 index 0000000000000..7c4d7c3be2ba3 --- /dev/null +++ b/integrations/gitea-integration-meta/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Ethan Koenig + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/integrations/gitea-integration-meta/README.md b/integrations/gitea-integration-meta/README.md new file mode 100644 index 0000000000000..f308b51e49fc8 --- /dev/null +++ b/integrations/gitea-integration-meta/README.md @@ -0,0 +1,2 @@ +# gitea-integration +Gitea integration test environment diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/HEAD b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/HEAD new file mode 100644 index 0000000000000..cb089cd89a7d7 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/config b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/config new file mode 100644 index 0000000000000..07d359d07cf1e --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/config @@ -0,0 +1,4 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/description b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/description new file mode 100644 index 0000000000000..498b267a8c781 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/applypatch-msg.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/applypatch-msg.sample new file mode 100755 index 0000000000000..a5d7b84a67345 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.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 +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/commit-msg.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/commit-msg.sample new file mode 100755 index 0000000000000..b58d1184a9d43 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.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/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive new file mode 100755 index 0000000000000..4b3d452abcce2 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +ORI_DIR=`pwd` +SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) +cd "$ORI_DIR" +for i in `ls "$SHELL_FOLDER/post-receive.d"`; do + sh "$SHELL_FOLDER/post-receive.d/$i" +done \ No newline at end of file diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive.d/gitea b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive.d/gitea new file mode 100755 index 0000000000000..2eb3be9836cff --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-receive.d/gitea @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +"$GITEA_ROOT/gitea" hook --config='integrations/app.ini' post-receive diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-update.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/post-update.sample new file mode 100755 index 0000000000000..ec17ec1939b7c --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.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/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-applypatch.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-applypatch.sample new file mode 100755 index 0000000000000..4142082bcb939 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.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 +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-commit.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-commit.sample new file mode 100755 index 0000000000000..68d62d5446d96 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.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/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-push.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-push.sample new file mode 100755 index 0000000000000..6187dbf4390fc --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/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 + +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 >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-rebase.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-rebase.sample new file mode 100755 index 0000000000000..33730ca647cb2 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.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/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive new file mode 100755 index 0000000000000..412701305369c --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +ORI_DIR=`pwd` +SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) +cd "$ORI_DIR" +for i in `ls "$SHELL_FOLDER/pre-receive.d"`; do + sh "$SHELL_FOLDER/pre-receive.d/$i" +done \ No newline at end of file diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive.d/gitea b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive.d/gitea new file mode 100755 index 0000000000000..1933f6cff0529 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/pre-receive.d/gitea @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +"$GITEA_ROOT/gitea" hook --config='integrations/app.ini' pre-receive diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/prepare-commit-msg.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000000000..f093a02ec4991 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.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/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update new file mode 100755 index 0000000000000..c186fe4a18b0f --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +ORI_DIR=`pwd` +SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) +cd "$ORI_DIR" +for i in `ls "$SHELL_FOLDER/update.d"`; do + sh "$SHELL_FOLDER/update.d/$i" $1 $2 $3 +done \ No newline at end of file diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.d/gitea b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.d/gitea new file mode 100755 index 0000000000000..615b4f4b82cd8 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.d/gitea @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +"$GITEA_ROOT/gitea" hook --config='integrations/app.ini' update $1 $2 $3 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.sample b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.sample new file mode 100755 index 0000000000000..80ba94135cc37 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block 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/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/exclude b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/exclude new file mode 100644 index 0000000000000..a5196d1be8fb5 --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.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/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/refs b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/refs new file mode 100644 index 0000000000000..ca1df85e2ebfb --- /dev/null +++ b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/info/refs @@ -0,0 +1 @@ +65f1bf27bc3bf70f64657658635e66094edbcb4d refs/heads/master diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 new file mode 100644 index 0000000000000000000000000000000000000000..0994add2c8a420ba89b9a239de84741d4d00ee02 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bx2y%6F@paY9O=0l%2wWR@KdW}W>d8uz$jVo* MqfO=m05RYX?j~gyApigX literal 0 HcmV?d00001 diff --git a/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f b/integrations/gitea-integration-meta/gitea-repositories/user2/repo1.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f new file mode 100644 index 0000000000000000000000000000000000000000..700a13828e63248a392e4c90d92bbb6e3dd57ba0 GIT binary patch literal 42 ycmb%v7rOCc0q7S-{K(sSa& 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 diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 492210530e426..02a352ce2a3be 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -17,6 +17,8 @@ import ( "code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers/routes" + "github.com/stretchr/testify/assert" + "github.com/unknwon/com" "gopkg.in/macaron.v1" "gopkg.in/testfixtures.v2" ) @@ -57,6 +59,12 @@ func TestMain(m *testing.M) { os.Exit(m.Run()) } +func prepareTestEnv(t *testing.T) { + assert.NoError(t, models.LoadFixtures()) + assert.NoError(t, os.RemoveAll("integrations/gitea-integration")) + assert.NoError(t, com.CopyDir("integrations/gitea-integration-meta", "integrations/gitea-integration")) +} + type TestResponseWriter struct { HeaderCode int Writer io.Writer diff --git a/integrations/signup_test.go b/integrations/signup_test.go index 7d8f27332e4b1..49017b29ff2fd 100644 --- a/integrations/signup_test.go +++ b/integrations/signup_test.go @@ -10,14 +10,14 @@ import ( "net/url" "testing" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" ) func TestSignup(t *testing.T) { - assert.NoError(t, models.LoadFixtures()) + prepareTestEnv(t) + setting.Service.EnableCaptcha = false req, err := http.NewRequest("POST", "/user/sign_up", diff --git a/integrations/version_test.go b/integrations/version_test.go index 58568e22fee58..7243357403851 100644 --- a/integrations/version_test.go +++ b/integrations/version_test.go @@ -10,7 +10,6 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/setting" "code.gitea.io/sdk/gitea" @@ -18,7 +17,7 @@ import ( ) func TestVersion(t *testing.T) { - assert.NoError(t, models.LoadFixtures()) + prepareTestEnv(t) setting.AppVer = "1.1.0+dev" req, err := http.NewRequest("GET", "/api/v1/version", nil) diff --git a/integrations/view_test.go b/integrations/view_test.go index d937cdd851960..26d8348afefe7 100644 --- a/integrations/view_test.go +++ b/integrations/view_test.go @@ -8,13 +8,11 @@ import ( "net/http" "testing" - "code.gitea.io/gitea/models" - "github.com/stretchr/testify/assert" ) func TestViewRepo(t *testing.T) { - assert.NoError(t, models.LoadFixtures()) + prepareTestEnv(t) req, err := http.NewRequest("GET", "/user2/repo1", nil) assert.NoError(t, err) @@ -23,7 +21,7 @@ func TestViewRepo(t *testing.T) { } func TestViewUser(t *testing.T) { - assert.NoError(t, models.LoadFixtures()) + prepareTestEnv(t) req, err := http.NewRequest("GET", "/user2", nil) assert.NoError(t, err) From c397f7ff4d0c1c1caad8ebb6d9a3948766e51884 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Apr 2017 11:11:09 +0800 Subject: [PATCH 3/3] fix import package name --- integrations/integration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 02a352ce2a3be..dc0d41edefd10 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -17,8 +17,8 @@ import ( "code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers/routes" + "github.com/Unknwon/com" "github.com/stretchr/testify/assert" - "github.com/unknwon/com" "gopkg.in/macaron.v1" "gopkg.in/testfixtures.v2" )