From 3186ef554cdbf54e1a3328ffcb35ea18105d7cb1 Mon Sep 17 00:00:00 2001 From: Mura Li Date: Fri, 12 Apr 2019 10:28:44 +0800 Subject: [PATCH] Support search operators for commits search (#6479) * Support searching commits with prefix syntax For now, support auther: committer: When more than one prefix is supplied is presented, the result is the union. When different prefixes are supplied, the result is the intersection. For example, "author:alice author:bob" => the result is all commits authored by Alice OR Bob "hello committer:alice" => the result is all commits committed by Alice AND has the keyword 'hello' in the message. Note that there should NOT have any space after the colon(:) of the prefix. For example, "author:bill" => correct "author: bill" => wrong * Remove unneeded logging * Add missing files of test repository * Add missing repo_unit entries to test fixtures * Update test cases * Add tooltip for commits search button * Update tooltip text I have no idea about how to format it with line breaks. * Make the usage example more real * Add a test case * Add new options struct for SearchCommits * Prefer len(s) > 0 over s != "" * Add NewSearchCommitsOptions --- integrations/api_repo_test.go | 6 +- .../user2/commits_search_test.git/HEAD | 1 + .../user2/commits_search_test.git/config | 8 + .../user2/commits_search_test.git/description | 1 + .../hooks/applypatch-msg.sample | 15 ++ .../hooks/commit-msg.sample | 24 +++ .../hooks/post-update.sample | 8 + .../hooks/pre-applypatch.sample | 14 ++ .../hooks/pre-commit.sample | 49 +++++ .../hooks/pre-push.sample | 53 ++++++ .../hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../hooks/prepare-commit-msg.sample | 36 ++++ .../hooks/update.sample | 128 +++++++++++++ .../commits_search_test.git/info/exclude | 6 + .../0a/8499a22ad32a80beda9d75efe15f9f94582468 | 2 + .../0c/cf1fcd4d1717c22de0707619a5577ea0acebf0 | Bin 0 -> 32 bytes .../3e/a192a6466793d4b7cd8641801ca0c6bec3979c | Bin 0 -> 54 bytes .../3f/6594f108842b7c50772510e53ce113d3583c4a | Bin 0 -> 54 bytes .../58/e97d1a24fb9e1599d8a467ec409430f3d3569e | Bin 0 -> 154 bytes .../67/68c1fc1d9448422f05cc84267d94ee62085fe8 | Bin 0 -> 54 bytes .../6e/8eabd9a7f8d6acd2a1219facfd37415564b144 | 2 + .../85/f46d747a68adf79cc01e2c25ba6a56932d298d | Bin 0 -> 32 bytes .../8d/dd8d1ad1fdc21ab629e906711fa9bc27aa1c52 | Bin 0 -> 32 bytes .../95/fd0c4138480e4b3913e7cf71a90623fb926fe8 | Bin 0 -> 32 bytes .../98/00fe78cabf4fe774fcf376f97fa2a0ed06987b | Bin 0 -> 149 bytes .../9f/cdb7d53bdef786d2e5577948a0c0d4b321fe5a | Bin 0 -> 32 bytes .../c2/0caf78b5f9dd2d0d183876c5cd0e761c13f7f8 | 2 + .../c5/2ba74685f5c8c593efbbb38f62fe024110adef | Bin 0 -> 54 bytes .../d6/ae8023a10ff446b6a4e7f441554834008e99c3 | Bin 0 -> 54 bytes .../user2/commits_search_test.git/packed-refs | 2 + .../commits_search_test.git/refs/heads/master | 1 + integrations/repo_commits_search_test.go | 37 ++++ models/fixtures/repo_unit.yml | 37 +++- models/fixtures/repository.yml | 11 ++ models/fixtures/user.yml | 2 +- models/repo_list_test.go | 10 +- modules/git/commit.go | 43 ++++- modules/git/repo_commit.go | 27 ++- options/locale/locale_en-US.ini | 1 + routers/repo/commit.go | 11 +- templates/repo/commits_table.tmpl | 2 +- 41 files changed, 687 insertions(+), 21 deletions(-) create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/HEAD create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/config create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/description create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/applypatch-msg.sample create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/commit-msg.sample create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/post-update.sample create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/pre-applypatch.sample create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/pre-commit.sample create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/pre-push.sample create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/pre-rebase.sample create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/prepare-commit-msg.sample create mode 100755 integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/update.sample create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/info/exclude create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/0a/8499a22ad32a80beda9d75efe15f9f94582468 create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/0c/cf1fcd4d1717c22de0707619a5577ea0acebf0 create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/3e/a192a6466793d4b7cd8641801ca0c6bec3979c create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/3f/6594f108842b7c50772510e53ce113d3583c4a create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/58/e97d1a24fb9e1599d8a467ec409430f3d3569e create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/67/68c1fc1d9448422f05cc84267d94ee62085fe8 create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/6e/8eabd9a7f8d6acd2a1219facfd37415564b144 create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/85/f46d747a68adf79cc01e2c25ba6a56932d298d create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/8d/dd8d1ad1fdc21ab629e906711fa9bc27aa1c52 create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/95/fd0c4138480e4b3913e7cf71a90623fb926fe8 create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/98/00fe78cabf4fe774fcf376f97fa2a0ed06987b create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/9f/cdb7d53bdef786d2e5577948a0c0d4b321fe5a create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/c2/0caf78b5f9dd2d0d183876c5cd0e761c13f7f8 create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/c5/2ba74685f5c8c593efbbb38f62fe024110adef create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/d6/ae8023a10ff446b6a4e7f441554834008e99c3 create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/packed-refs create mode 100644 integrations/gitea-repositories-meta/user2/commits_search_test.git/refs/heads/master create mode 100644 integrations/repo_commits_search_test.go diff --git a/integrations/api_repo_test.go b/integrations/api_repo_test.go index a919a8370..bd5fc4bad 100644 --- a/integrations/api_repo_test.go +++ b/integrations/api_repo_test.go @@ -70,9 +70,9 @@ func TestAPISearchRepo(t *testing.T) { expectedResults }{ {name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50", expectedResults: expectedResults{ - nil: {count: 19}, - user: {count: 19}, - user2: {count: 19}}, + nil: {count: 20}, + user: {count: 20}, + user2: {count: 20}}, }, {name: "RepositoriesMax10", requestURL: "/api/v1/repos/search?limit=10", expectedResults: expectedResults{ nil: {count: 10}, diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/HEAD b/integrations/gitea-repositories-meta/user2/commits_search_test.git/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/config b/integrations/gitea-repositories-meta/user2/commits_search_test.git/config new file mode 100644 index 000000000..9ec7812f9 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.git/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true +[remote "origin"] + url = /home/mura/go/src/code.gitea.io/gitea/integrations/gitea-repositories-meta/user2/commits_search_test/ + fetch = +refs/*:refs/* + mirror = true diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/description b/integrations/gitea-repositories-meta/user2/commits_search_test.git/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/applypatch-msg.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/applypatch-msg.sample new file mode 100755 index 000000000..a5d7b84a6 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/hooks/commit-msg.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/commit-msg.sample new file mode 100755 index 000000000..b58d1184a --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/hooks/post-update.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/post-update.sample new file mode 100755 index 000000000..ec17ec193 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/hooks/pre-applypatch.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/pre-applypatch.sample new file mode 100755 index 000000000..4142082bc --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/hooks/pre-commit.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/pre-commit.sample new file mode 100755 index 000000000..68d62d544 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/hooks/pre-push.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/pre-push.sample new file mode 100755 index 000000000..6187dbf43 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/hooks/pre-rebase.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/pre-rebase.sample new file mode 100755 index 000000000..33730ca64 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/hooks/prepare-commit-msg.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/prepare-commit-msg.sample new file mode 100755 index 000000000..f093a02ec --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/hooks/update.sample b/integrations/gitea-repositories-meta/user2/commits_search_test.git/hooks/update.sample new file mode 100755 index 000000000..80ba94135 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/info/exclude b/integrations/gitea-repositories-meta/user2/commits_search_test.git/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.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-repositories-meta/user2/commits_search_test.git/objects/0a/8499a22ad32a80beda9d75efe15f9f94582468 b/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/0a/8499a22ad32a80beda9d75efe15f9f94582468 new file mode 100644 index 000000000..c258fcdd3 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/0a/8499a22ad32a80beda9d75efe15f9f94582468 @@ -0,0 +1,2 @@ +x +0=).&-;qBcKĻaFZi6U!)d=$'cr(4ig(D2l3f1C%ҫ= nKSS]g=RǍ@da8juD?Џ:?>9 \ No newline at end of file diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/0c/cf1fcd4d1717c22de0707619a5577ea0acebf0 b/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/0c/cf1fcd4d1717c22de0707619a5577ea0acebf0 new file mode 100644 index 0000000000000000000000000000000000000000..25b730dc8146c6cbe853cc8731eda943c3e2d6fe GIT binary patch literal 32 ocmb9XD~D{Ff%bx2y%6F@paY9O<|aScKcQ9d*9nGJq@q)Sa9IV MX2pL|09>6C^f9s*n*aa+ literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/3f/6594f108842b7c50772510e53ce113d3583c4a b/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/3f/6594f108842b7c50772510e53ce113d3583c4a new file mode 100644 index 0000000000000000000000000000000000000000..18a2af07c8f74c136fe349472306d10fc8b6ddc5 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bx2y%6F@paY9O<~|UFMrloT>OykgMu>2rQvl8 M*1Y}z04ItM=qa%m9{>OV literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/58/e97d1a24fb9e1599d8a467ec409430f3d3569e b/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/58/e97d1a24fb9e1599d8a467ec409430f3d3569e new file mode 100644 index 0000000000000000000000000000000000000000..585bb66e5b916fa86e0f0879e7bffcef3f9d5802 GIT binary patch literal 154 zcmV;L0A>Gp0fmk`3PLdu0IhS1?M2yq_9X!k@eE#IU$Q~Lm`8}<@l9cGGsVEbq*m)= zfR1rDx(L{^P;^CO2+piN5qfV(qmWIawau1-O^(&ZU0wr_gNu=k;cN{DTqSeNo}`GT z5=(Rxj9Y@@_qewX*S5lG;vyfe+f$CI)iY=!y?EoTfjtI9HSOFQ(&5%BoF@JRzvAH3 I7q!(p_qU2m>i_@% literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/67/68c1fc1d9448422f05cc84267d94ee62085fe8 b/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/67/68c1fc1d9448422f05cc84267d94ee62085fe8 new file mode 100644 index 0000000000000000000000000000000000000000..2860a7c55937eea6933d3f309a3520149835e88c GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bx2y%6F@paY9O<|b&m&ehV!Z literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/98/00fe78cabf4fe774fcf376f97fa2a0ed06987b b/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/98/00fe78cabf4fe774fcf376f97fa2a0ed06987b new file mode 100644 index 0000000000000000000000000000000000000000..42a85f1b7767eb229d00521aa511118fee6408bf GIT binary patch literal 149 zcmV;G0BZku0hNwR3IZ_@1zqP9*^AQobkYrjh&PEz2L~q3Fhub9M(_e|9z{XH%WG?M z*B0EN?;<+HK-tu63VTo9+6tKSfDnff2^I*eklNBN&#sY#V=>A4dS@}nTqyYvC3|4+ zpt|BPu&DIvk9F6#d0F)I-K)G)+ZH+JwOzD9G!fZ2tB*hcYS?kC%OAy15` DMx9BE literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/9f/cdb7d53bdef786d2e5577948a0c0d4b321fe5a b/integrations/gitea-repositories-meta/user2/commits_search_test.git/objects/9f/cdb7d53bdef786d2e5577948a0c0d4b321fe5a new file mode 100644 index 0000000000000000000000000000000000000000..125bc6c9e19be4f3ced2c68cc1465d0290d204fa GIT binary patch literal 32 ocmb9XD~D{Ff%bx2y%6F@paY9O<`#Ll3P-hvG)6%19Cd5yRyP2 M>uUA_06@n+a literal 0 HcmV?d00001 diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/packed-refs b/integrations/gitea-repositories-meta/user2/commits_search_test.git/packed-refs new file mode 100644 index 000000000..7675cfd15 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.git/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled +9800fe78cabf4fe774fcf376f97fa2a0ed06987b refs/heads/master diff --git a/integrations/gitea-repositories-meta/user2/commits_search_test.git/refs/heads/master b/integrations/gitea-repositories-meta/user2/commits_search_test.git/refs/heads/master new file mode 100644 index 000000000..81ba7e721 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/commits_search_test.git/refs/heads/master @@ -0,0 +1 @@ +9800fe78cabf4fe774fcf376f97fa2a0ed06987b diff --git a/integrations/repo_commits_search_test.go b/integrations/repo_commits_search_test.go new file mode 100644 index 000000000..f477550c0 --- /dev/null +++ b/integrations/repo_commits_search_test.go @@ -0,0 +1,37 @@ +// Copyright 2019 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package integrations + +import ( + "net/http" + "net/url" + "strings" + "testing" + + "github.com/stretchr/testify/assert" +) + +func testRepoCommitsSearch(t *testing.T, query, commit string) { + prepareTestEnv(t) + + session := loginUser(t, "user2") + + // Request repository commits page + req := NewRequestf(t, "GET", "/user2/commits_search_test/commits/branch/master/search?q=%s", url.QueryEscape(query)) + resp := session.MakeRequest(t, req, http.StatusOK) + + doc := NewHTMLParser(t, resp.Body) + sel := doc.doc.Find("#commits-table tbody tr td.sha a") + assert.EqualValues(t, commit, strings.TrimSpace(sel.Text())) +} + +func TestRepoCommitsSearch(t *testing.T) { + testRepoCommitsSearch(t, "author:alice", "6e8eabd9a7") + testRepoCommitsSearch(t, "committer:Tom", "58e97d1a24") + testRepoCommitsSearch(t, "author:bob commit-4", "58e97d1a24") + testRepoCommitsSearch(t, "author:bob commit after:2019-03-03", "58e97d1a24") + testRepoCommitsSearch(t, "committer:alice commit before:2019-03-02", "6e8eabd9a7") + testRepoCommitsSearch(t, "committer:alice author:tom commit before:2019-03-04 after:2019-03-02", "0a8499a22a") +} diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index f494cdd1b..7a594842a 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -220,4 +220,39 @@ repo_id: 28 type: 1 config: "{}" - created_unix: 1524304355 \ No newline at end of file + created_unix: 1524304355 + +- + id: 33 + repo_id: 36 + type: 4 + config: "{}" + created_unix: 1524304355 + +- + id: 34 + repo_id: 36 + type: 5 + config: "{}" + created_unix: 1524304355 + +- + id: 35 + repo_id: 36 + type: 1 + config: "{}" + created_unix: 1524304355 + +- + id: 36 + repo_id: 36 + type: 2 + config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}" + created_unix: 1524304355 + +- + id: 37 + repo_id: 36 + type: 3 + config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}" + created_unix: 1524304355 diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml index f41576165..0e7f8f90d 100644 --- a/models/fixtures/repository.yml +++ b/models/fixtures/repository.yml @@ -430,3 +430,14 @@ num_forks: 0 num_issues: 0 is_mirror: false + +- + id: 36 + owner_id: 2 + lower_name: commits_search_test + name: commits_search_test + is_private: false + num_stars: 0 + num_forks: 0 + num_issues: 0 + is_mirror: false diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml index 8d2b698b2..22e408ed2 100644 --- a/models/fixtures/user.yml +++ b/models/fixtures/user.yml @@ -28,7 +28,7 @@ is_admin: false avatar: avatar2 avatar_email: user2@example.com - num_repos: 6 + num_repos: 7 num_stars: 2 num_followers: 2 num_following: 1 diff --git a/models/repo_list_test.go b/models/repo_list_test.go index c032af2b8..120718c21 100644 --- a/models/repo_list_test.go +++ b/models/repo_list_test.go @@ -147,19 +147,19 @@ func TestSearchRepositoryByName(t *testing.T) { count: 14}, {name: "AllPublic/PublicRepositoriesOfUserIncludingCollaborative", opts: &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, AllPublic: true}, - count: 19}, + count: 20}, {name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborative", opts: &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true}, - count: 23}, + count: 24}, {name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborativeByName", opts: &SearchRepoOptions{Keyword: "test", Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true}, - count: 13}, + count: 14}, {name: "AllPublic/PublicAndPrivateRepositoriesOfUser2IncludingCollaborativeByName", opts: &SearchRepoOptions{Keyword: "test", Page: 1, PageSize: 10, OwnerID: 18, Private: true, AllPublic: true}, - count: 11}, + count: 12}, {name: "AllPublic/PublicRepositoriesOfOrganization", opts: &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 17, AllPublic: true, Collaborate: util.OptionalBoolFalse}, - count: 19}, + count: 20}, } for _, testCase := range testCases { diff --git a/modules/git/commit.go b/modules/git/commit.go index 36b8d5456..85c9554bb 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -214,9 +214,48 @@ func (c *Commit) CommitsBeforeUntil(commitID string) (*list.List, error) { return c.repo.CommitsBetween(c, endCommit) } +// SearchCommitsOptions specify the parameters for SearchCommits +type SearchCommitsOptions struct { + Keywords []string + Authors, Committers []string + After, Before string + All bool +} + +// NewSearchCommitsOptions contruct a SearchCommitsOption from a space-delimited search string +func NewSearchCommitsOptions(searchString string, forAllRefs bool) SearchCommitsOptions { + var keywords, authors, committers []string + var after, before string + + fields := strings.Fields(searchString) + for _, k := range fields { + switch { + case strings.HasPrefix(k, "author:"): + authors = append(authors, strings.TrimPrefix(k, "author:")) + case strings.HasPrefix(k, "committer:"): + committers = append(committers, strings.TrimPrefix(k, "committer:")) + case strings.HasPrefix(k, "after:"): + after = strings.TrimPrefix(k, "after:") + case strings.HasPrefix(k, "before:"): + before = strings.TrimPrefix(k, "before:") + default: + keywords = append(keywords, k) + } + } + + return SearchCommitsOptions{ + Keywords: keywords, + Authors: authors, + Committers: committers, + After: after, + Before: before, + All: forAllRefs, + } +} + // SearchCommits returns the commits match the keyword before current revision -func (c *Commit) SearchCommits(keyword string, all bool) (*list.List, error) { - return c.repo.searchCommits(c.ID, keyword, all) +func (c *Commit) SearchCommits(opts SearchCommitsOptions) (*list.List, error) { + return c.repo.searchCommits(c.ID, opts) } // GetFilesChangedSinceCommit get all changed file names between pastCommit to current revision diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index 146619373..1ecd1f889 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -237,9 +237,30 @@ func (repo *Repository) commitsByRange(id SHA1, page int) (*list.List, error) { return repo.parsePrettyFormatLogToList(stdout) } -func (repo *Repository) searchCommits(id SHA1, keyword string, all bool) (*list.List, error) { - cmd := NewCommand("log", id.String(), "-100", "-i", "--grep="+keyword, prettyLogFormat) - if all { +func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) (*list.List, error) { + cmd := NewCommand("log", id.String(), "-100", "-i", prettyLogFormat) + if len(opts.Keywords) > 0 { + for _, v := range opts.Keywords { + cmd.AddArguments("--grep=" + v) + } + } + if len(opts.Authors) > 0 { + for _, v := range opts.Authors { + cmd.AddArguments("--author=" + v) + } + } + if len(opts.Committers) > 0 { + for _, v := range opts.Committers { + cmd.AddArguments("--committer=" + v) + } + } + if len(opts.After) > 0 { + cmd.AddArguments("--after=" + opts.After) + } + if len(opts.Before) > 0 { + cmd.AddArguments("--before=" + opts.Before) + } + if opts.All { cmd.AddArguments("--all") } stdout, err := cmd.RunInDirBytes(repo.Path) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2c764f170..ce726ed56 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -686,6 +686,7 @@ commits.desc = Browse source code change history. commits.commits = Commits commits.no_commits = No commits in common. '%s' and '%s' have entirely different histories. commits.search = Search commits… +commits.search.tooltip = You can prefix keywords with "author:", "committer:", "after:", or "before:", e.g. "revert author:Alice before:2019-04-01". commits.find = Search commits.search_all = All Branches commits.author = Author diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 6b99a1220..a1e9b8bc5 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -107,14 +107,15 @@ func SearchCommits(ctx *context.Context) { ctx.Data["PageIsCommits"] = true ctx.Data["PageIsViewCode"] = true - keyword := strings.Trim(ctx.Query("q"), " ") - if len(keyword) == 0 { + query := strings.Trim(ctx.Query("q"), " ") + if len(query) == 0 { ctx.Redirect(ctx.Repo.RepoLink + "/commits/" + ctx.Repo.BranchNameSubURL()) return } - all := ctx.QueryBool("all") - commits, err := ctx.Repo.Commit.SearchCommits(keyword, all) + all := ctx.QueryBool("all") + opts := git.NewSearchCommitsOptions(query, all) + commits, err := ctx.Repo.Commit.SearchCommits(opts) if err != nil { ctx.ServerError("SearchCommits", err) return @@ -124,7 +125,7 @@ func SearchCommits(ctx *context.Context) { commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository) ctx.Data["Commits"] = commits - ctx.Data["Keyword"] = keyword + ctx.Data["Keyword"] = query if all { ctx.Data["All"] = "checked" } diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 55c550ae9..8c8cdf209 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -18,7 +18,7 @@ - + {{else if .IsDiffCompare}} {{ShortSha .BeforeCommitID}} ... {{ShortSha .AfterCommitID}}