mirror of
https://github.com/git/git.git
synced 2024-11-12 20:23:02 +01:00
12b1443c2c
Extract filtering out forks (which is done if 'forks' feature is
enabled) into filter_forks_from_projects_list subroutine, and
searching projects (via projects search form, or via content tags)
into search_projects_list subroutine.
Both are now run _before_ displaying projects, and not while printing;
this allow to know upfront if there were any found projects. Gitweb
now can and do print 'No such projects found' if user searches for
phrase which does not correspond to any project (any repository).
This also would allow splitting projects list into pages, if we so
desire.
Filtering out forks and marking repository (project) as having forks
is now consolidated into one subroutine (special case of handling
forks in git_get_projects_list only for $projects_list being file is
now removed). Forks handling is also cleaned up and simplified.
$pr->{'forks'} now contains un-filled list of forks; we can now also
detect situation where the way for having forks is prepared, but there
are no forks yet.
Sorting projects got also refactored in a very straight way (just
moving code) into sort_projects_list subroutine.
The interaction between forks, content tags and searching is now made
more explicit: searching whether by tag, or via search form turns off
fork filtering (gitweb searches also forks, and will show all
results). If 'ctags' feature is disabled, then searching by tag is
too.
The t9500 test now includes some basic test for 'forks' and 'ctags'
features; the t9502 includes test checking if gitweb correctly filters
out forks.
Generating list of projects by scanning given directory is now also a
bit simplified wrt. handling filtering; it is byproduct of extracting
filtering forks to separate subroutine.
While at it we now detect that there are no projects and respond with
"404 No projects found" also for 'project_index' and 'opml' actions.
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
189 lines
5.5 KiB
Bash
Executable file
189 lines
5.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2009 Mark Rada
|
|
#
|
|
|
|
test_description='gitweb as standalone script (parsing script output).
|
|
|
|
This test runs gitweb (git web interface) as a CGI script from the
|
|
commandline, and checks that it produces the correct output, either
|
|
in the HTTP header or the actual script output.'
|
|
|
|
|
|
. ./gitweb-lib.sh
|
|
|
|
# ----------------------------------------------------------------------
|
|
# snapshot file name and prefix
|
|
|
|
cat >>gitweb_config.perl <<\EOF
|
|
|
|
$known_snapshot_formats{'tar'} = {
|
|
'display' => 'tar',
|
|
'type' => 'application/x-tar',
|
|
'suffix' => '.tar',
|
|
'format' => 'tar',
|
|
};
|
|
|
|
$feature{'snapshot'}{'default'} = ['tar'];
|
|
EOF
|
|
|
|
# Call check_snapshot with the arguments "<basename> [<prefix>]"
|
|
#
|
|
# This will check that gitweb HTTP header contains proposed filename
|
|
# as <basename> with '.tar' suffix added, and that generated tarfile
|
|
# (gitweb message body) has <prefix> as prefix for al files in tarfile
|
|
#
|
|
# <prefix> default to <basename>
|
|
check_snapshot () {
|
|
basename=$1
|
|
prefix=${2:-"$1"}
|
|
echo "basename=$basename"
|
|
grep "filename=.*$basename.tar" gitweb.headers >/dev/null 2>&1 &&
|
|
"$TAR" tf gitweb.body >file_list &&
|
|
! grep -v "^$prefix/" file_list
|
|
}
|
|
|
|
test_expect_success setup '
|
|
test_commit first foo &&
|
|
git branch xx/test &&
|
|
FULL_ID=$(git rev-parse --verify HEAD) &&
|
|
SHORT_ID=$(git rev-parse --verify --short=7 HEAD)
|
|
'
|
|
test_debug '
|
|
echo "FULL_ID = $FULL_ID"
|
|
echo "SHORT_ID = $SHORT_ID"
|
|
'
|
|
|
|
test_expect_success 'snapshot: full sha1' '
|
|
gitweb_run "p=.git;a=snapshot;h=$FULL_ID;sf=tar" &&
|
|
check_snapshot ".git-$SHORT_ID"
|
|
'
|
|
test_debug 'cat gitweb.headers && cat file_list'
|
|
|
|
test_expect_success 'snapshot: shortened sha1' '
|
|
gitweb_run "p=.git;a=snapshot;h=$SHORT_ID;sf=tar" &&
|
|
check_snapshot ".git-$SHORT_ID"
|
|
'
|
|
test_debug 'cat gitweb.headers && cat file_list'
|
|
|
|
test_expect_success 'snapshot: almost full sha1' '
|
|
ID=$(git rev-parse --short=30 HEAD) &&
|
|
gitweb_run "p=.git;a=snapshot;h=$ID;sf=tar" &&
|
|
check_snapshot ".git-$SHORT_ID"
|
|
'
|
|
test_debug 'cat gitweb.headers && cat file_list'
|
|
|
|
test_expect_success 'snapshot: HEAD' '
|
|
gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tar" &&
|
|
check_snapshot ".git-HEAD-$SHORT_ID"
|
|
'
|
|
test_debug 'cat gitweb.headers && cat file_list'
|
|
|
|
test_expect_success 'snapshot: short branch name (master)' '
|
|
gitweb_run "p=.git;a=snapshot;h=master;sf=tar" &&
|
|
ID=$(git rev-parse --verify --short=7 master) &&
|
|
check_snapshot ".git-master-$ID"
|
|
'
|
|
test_debug 'cat gitweb.headers && cat file_list'
|
|
|
|
test_expect_success 'snapshot: short tag name (first)' '
|
|
gitweb_run "p=.git;a=snapshot;h=first;sf=tar" &&
|
|
ID=$(git rev-parse --verify --short=7 first) &&
|
|
check_snapshot ".git-first-$ID"
|
|
'
|
|
test_debug 'cat gitweb.headers && cat file_list'
|
|
|
|
test_expect_success 'snapshot: full branch name (refs/heads/master)' '
|
|
gitweb_run "p=.git;a=snapshot;h=refs/heads/master;sf=tar" &&
|
|
ID=$(git rev-parse --verify --short=7 master) &&
|
|
check_snapshot ".git-master-$ID"
|
|
'
|
|
test_debug 'cat gitweb.headers && cat file_list'
|
|
|
|
test_expect_success 'snapshot: full tag name (refs/tags/first)' '
|
|
gitweb_run "p=.git;a=snapshot;h=refs/tags/first;sf=tar" &&
|
|
check_snapshot ".git-first"
|
|
'
|
|
test_debug 'cat gitweb.headers && cat file_list'
|
|
|
|
test_expect_success 'snapshot: hierarchical branch name (xx/test)' '
|
|
gitweb_run "p=.git;a=snapshot;h=xx/test;sf=tar" &&
|
|
! grep "filename=.*/" gitweb.headers
|
|
'
|
|
test_debug 'cat gitweb.headers'
|
|
|
|
# ----------------------------------------------------------------------
|
|
# forks of projects
|
|
|
|
test_expect_success 'forks: setup' '
|
|
git init --bare foo.git &&
|
|
echo file > file &&
|
|
git --git-dir=foo.git --work-tree=. add file &&
|
|
git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
|
|
echo "foo" > foo.git/description &&
|
|
git clone --bare foo.git foo.bar.git &&
|
|
echo "foo.bar" > foo.bar.git/description &&
|
|
git clone --bare foo.git foo_baz.git &&
|
|
echo "foo_baz" > foo_baz.git/description &&
|
|
rm -fr foo &&
|
|
mkdir -p foo &&
|
|
(
|
|
cd foo &&
|
|
git clone --shared --bare ../foo.git foo-forked.git &&
|
|
echo "fork of foo" > foo-forked.git/description
|
|
)
|
|
'
|
|
|
|
test_expect_success 'forks: not skipped unless "forks" feature enabled' '
|
|
gitweb_run "a=project_list" &&
|
|
grep -q ">\\.git<" gitweb.body &&
|
|
grep -q ">foo\\.git<" gitweb.body &&
|
|
grep -q ">foo_baz\\.git<" gitweb.body &&
|
|
grep -q ">foo\\.bar\\.git<" gitweb.body &&
|
|
grep -q ">foo_baz\\.git<" gitweb.body &&
|
|
grep -q ">foo/foo-forked\\.git<" gitweb.body &&
|
|
grep -q ">fork of .*<" gitweb.body
|
|
'
|
|
|
|
cat >>gitweb_config.perl <<\EOF &&
|
|
$feature{'forks'}{'default'} = [1];
|
|
EOF
|
|
|
|
test_expect_success 'forks: forks skipped if "forks" feature enabled' '
|
|
gitweb_run "a=project_list" &&
|
|
grep -q ">\\.git<" gitweb.body &&
|
|
grep -q ">foo\\.git<" gitweb.body &&
|
|
grep -q ">foo_baz\\.git<" gitweb.body &&
|
|
grep -q ">foo\\.bar\\.git<" gitweb.body &&
|
|
grep -q ">foo_baz\\.git<" gitweb.body &&
|
|
grep -v ">foo/foo-forked\\.git<" gitweb.body &&
|
|
grep -v ">fork of .*<" gitweb.body
|
|
'
|
|
|
|
test_expect_success 'forks: "forks" action for forked repository' '
|
|
gitweb_run "p=foo.git;a=forks" &&
|
|
grep -q ">foo/foo-forked\\.git<" gitweb.body &&
|
|
grep -q ">fork of foo<" gitweb.body
|
|
'
|
|
|
|
test_expect_success 'forks: can access forked repository' '
|
|
gitweb_run "p=foo/foo-forked.git;a=summary" &&
|
|
grep -q "200 OK" gitweb.headers &&
|
|
grep -q ">fork of foo<" gitweb.body
|
|
'
|
|
|
|
test_expect_success 'forks: project_index lists all projects (incl. forks)' '
|
|
cat >expected <<-\EOF
|
|
.git
|
|
foo.bar.git
|
|
foo.git
|
|
foo/foo-forked.git
|
|
foo_baz.git
|
|
EOF
|
|
gitweb_run "a=project_index" &&
|
|
sed -e "s/ .*//" <gitweb.body | sort >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
|
|
test_done
|