merge(3p/cgit): subtree merge at adcc4f82
Change-Id: I16941629a17a2f39b9324cb85dc0cec6b104dfe4
This commit is contained in:
parent
f4609b896f
commit
1e81ce6622
26 changed files with 299 additions and 135 deletions
4
third_party/cgit/Makefile
vendored
4
third_party/cgit/Makefile
vendored
|
@ -1,6 +1,6 @@
|
||||||
all::
|
all::
|
||||||
|
|
||||||
CGIT_VERSION = v1.2.1
|
CGIT_VERSION = v1.2.3
|
||||||
CGIT_SCRIPT_NAME = cgit.cgi
|
CGIT_SCRIPT_NAME = cgit.cgi
|
||||||
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
|
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
|
||||||
CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
|
CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
|
||||||
|
@ -14,7 +14,7 @@ htmldir = $(docdir)
|
||||||
pdfdir = $(docdir)
|
pdfdir = $(docdir)
|
||||||
mandir = $(prefix)/share/man
|
mandir = $(prefix)/share/man
|
||||||
SHA1_HEADER = <openssl/sha.h>
|
SHA1_HEADER = <openssl/sha.h>
|
||||||
GIT_VER = 2.23.0
|
GIT_VER = 2.29.0
|
||||||
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
|
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
COPYTREE = cp -r
|
COPYTREE = cp -r
|
||||||
|
|
18
third_party/cgit/cgit.c
vendored
18
third_party/cgit/cgit.c
vendored
|
@ -324,11 +324,11 @@ static void querystring_cb(const char *name, const char *value)
|
||||||
ctx.qry.head = xstrdup(value);
|
ctx.qry.head = xstrdup(value);
|
||||||
ctx.qry.has_symref = 1;
|
ctx.qry.has_symref = 1;
|
||||||
} else if (!strcmp(name, "id")) {
|
} else if (!strcmp(name, "id")) {
|
||||||
ctx.qry.sha1 = xstrdup(value);
|
ctx.qry.oid = xstrdup(value);
|
||||||
ctx.qry.has_sha1 = 1;
|
ctx.qry.has_oid = 1;
|
||||||
} else if (!strcmp(name, "id2")) {
|
} else if (!strcmp(name, "id2")) {
|
||||||
ctx.qry.sha2 = xstrdup(value);
|
ctx.qry.oid2 = xstrdup(value);
|
||||||
ctx.qry.has_sha1 = 1;
|
ctx.qry.has_oid = 1;
|
||||||
} else if (!strcmp(name, "ofs")) {
|
} else if (!strcmp(name, "ofs")) {
|
||||||
ctx.qry.ofs = atoi(value);
|
ctx.qry.ofs = atoi(value);
|
||||||
} else if (!strcmp(name, "path")) {
|
} else if (!strcmp(name, "path")) {
|
||||||
|
@ -579,7 +579,7 @@ static void prepare_repo_env(int *nongit)
|
||||||
* load local configuration from the git repository, so we do them both while
|
* load local configuration from the git repository, so we do them both while
|
||||||
* the HOME variables are unset. */
|
* the HOME variables are unset. */
|
||||||
setup_git_directory_gently(nongit);
|
setup_git_directory_gently(nongit);
|
||||||
init_display_notes(NULL);
|
load_display_notes(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int prepare_repo_cmd(int nongit)
|
static int prepare_repo_cmd(int nongit)
|
||||||
|
@ -992,9 +992,9 @@ static void cgit_parse_args(int argc, const char **argv)
|
||||||
} else if (skip_prefix(argv[i], "--head=", &arg)) {
|
} else if (skip_prefix(argv[i], "--head=", &arg)) {
|
||||||
ctx.qry.head = xstrdup(arg);
|
ctx.qry.head = xstrdup(arg);
|
||||||
ctx.qry.has_symref = 1;
|
ctx.qry.has_symref = 1;
|
||||||
} else if (skip_prefix(argv[i], "--sha1=", &arg)) {
|
} else if (skip_prefix(argv[i], "--oid=", &arg)) {
|
||||||
ctx.qry.sha1 = xstrdup(arg);
|
ctx.qry.oid = xstrdup(arg);
|
||||||
ctx.qry.has_sha1 = 1;
|
ctx.qry.has_oid = 1;
|
||||||
} else if (skip_prefix(argv[i], "--ofs=", &arg)) {
|
} else if (skip_prefix(argv[i], "--ofs=", &arg)) {
|
||||||
ctx.qry.ofs = atoi(arg);
|
ctx.qry.ofs = atoi(arg);
|
||||||
} else if (skip_prefix(argv[i], "--scan-tree=", &arg) ||
|
} else if (skip_prefix(argv[i], "--scan-tree=", &arg) ||
|
||||||
|
@ -1037,7 +1037,7 @@ static int calc_ttl(void)
|
||||||
if (!strcmp(ctx.qry.page, "snapshot"))
|
if (!strcmp(ctx.qry.page, "snapshot"))
|
||||||
return ctx.cfg.cache_snapshot_ttl;
|
return ctx.cfg.cache_snapshot_ttl;
|
||||||
|
|
||||||
if (ctx.qry.has_sha1)
|
if (ctx.qry.has_oid)
|
||||||
return ctx.cfg.cache_static_ttl;
|
return ctx.cfg.cache_static_ttl;
|
||||||
|
|
||||||
if (ctx.qry.has_symref)
|
if (ctx.qry.has_symref)
|
||||||
|
|
2
third_party/cgit/cgit.css
vendored
2
third_party/cgit/cgit.css
vendored
|
@ -561,7 +561,7 @@ div#cgit table.diff td div.del {
|
||||||
color: red;
|
color: red;
|
||||||
}
|
}
|
||||||
|
|
||||||
div#cgit .sha1 {
|
div#cgit .oid {
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
font-size: 90%;
|
font-size: 90%;
|
||||||
}
|
}
|
||||||
|
|
8
third_party/cgit/cgit.h
vendored
8
third_party/cgit/cgit.h
vendored
|
@ -14,7 +14,7 @@
|
||||||
#include <tag.h>
|
#include <tag.h>
|
||||||
#include <diff.h>
|
#include <diff.h>
|
||||||
#include <diffcore.h>
|
#include <diffcore.h>
|
||||||
#include <argv-array.h>
|
#include <strvec.h>
|
||||||
#include <refs.h>
|
#include <refs.h>
|
||||||
#include <revision.h>
|
#include <revision.h>
|
||||||
#include <log-tree.h>
|
#include <log-tree.h>
|
||||||
|
@ -164,7 +164,7 @@ struct reflist {
|
||||||
|
|
||||||
struct cgit_query {
|
struct cgit_query {
|
||||||
int has_symref;
|
int has_symref;
|
||||||
int has_sha1;
|
int has_oid;
|
||||||
int has_difftype;
|
int has_difftype;
|
||||||
char *raw;
|
char *raw;
|
||||||
char *repo;
|
char *repo;
|
||||||
|
@ -172,8 +172,8 @@ struct cgit_query {
|
||||||
char *search;
|
char *search;
|
||||||
char *grep;
|
char *grep;
|
||||||
char *head;
|
char *head;
|
||||||
char *sha1;
|
char *oid;
|
||||||
char *sha2;
|
char *oid2;
|
||||||
char *path;
|
char *path;
|
||||||
char *name;
|
char *name;
|
||||||
char *url;
|
char *url;
|
||||||
|
|
9
third_party/cgit/cgitrc.5.txt
vendored
9
third_party/cgit/cgitrc.5.txt
vendored
|
@ -407,9 +407,12 @@ side-by-side-diffs::
|
||||||
snapshots::
|
snapshots::
|
||||||
Text which specifies the default set of snapshot formats that cgit
|
Text which specifies the default set of snapshot formats that cgit
|
||||||
generates links for. The value is a space-separated list of zero or
|
generates links for. The value is a space-separated list of zero or
|
||||||
more of the values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip".
|
more of the values "tar", "tar.gz", "tar.bz2", "tar.lz", "tar.xz",
|
||||||
The special value "all" enables all snapshot formats.
|
"tar.zst" and "zip". The special value "all" enables all snapshot
|
||||||
Default value: none.
|
formats. Default value: none.
|
||||||
|
All compressors use default settings. Some settings can be influenced
|
||||||
|
with environment variables, for example set ZSTD_CLEVEL=10 in web
|
||||||
|
server environment for higher (but slower) zstd compression.
|
||||||
|
|
||||||
source-filter::
|
source-filter::
|
||||||
Specifies a command which will be invoked to format plaintext blobs
|
Specifies a command which will be invoked to format plaintext blobs
|
||||||
|
|
18
third_party/cgit/cmd.c
vendored
18
third_party/cgit/cmd.c
vendored
|
@ -52,22 +52,22 @@ static void blame_fn(void)
|
||||||
|
|
||||||
static void blob_fn(void)
|
static void blob_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_blob(ctx.qry.sha1, ctx.qry.path, ctx.qry.head, 0);
|
cgit_print_blob(ctx.qry.oid, ctx.qry.path, ctx.qry.head, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void commit_fn(void)
|
static void commit_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_commit(ctx.qry.sha1, ctx.qry.path);
|
cgit_print_commit(ctx.qry.oid, ctx.qry.path);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void diff_fn(void)
|
static void diff_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 0);
|
cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rawdiff_fn(void)
|
static void rawdiff_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 1);
|
cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void info_fn(void)
|
static void info_fn(void)
|
||||||
|
@ -77,7 +77,7 @@ static void info_fn(void)
|
||||||
|
|
||||||
static void log_fn(void)
|
static void log_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_log(ctx.qry.sha1, ctx.qry.ofs, ctx.cfg.max_commit_count,
|
cgit_print_log(ctx.qry.oid, ctx.qry.ofs, ctx.cfg.max_commit_count,
|
||||||
ctx.qry.grep, ctx.qry.search, ctx.qry.path, 1,
|
ctx.qry.grep, ctx.qry.search, ctx.qry.path, 1,
|
||||||
ctx.repo->enable_commit_graph,
|
ctx.repo->enable_commit_graph,
|
||||||
ctx.repo->commit_sort);
|
ctx.repo->commit_sort);
|
||||||
|
@ -103,7 +103,7 @@ static void repolist_fn(void)
|
||||||
|
|
||||||
static void patch_fn(void)
|
static void patch_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_patch(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path);
|
cgit_print_patch(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void plain_fn(void)
|
static void plain_fn(void)
|
||||||
|
@ -118,7 +118,7 @@ static void refs_fn(void)
|
||||||
|
|
||||||
static void snapshot_fn(void)
|
static void snapshot_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_snapshot(ctx.qry.head, ctx.qry.sha1, ctx.qry.path,
|
cgit_print_snapshot(ctx.qry.head, ctx.qry.oid, ctx.qry.path,
|
||||||
ctx.qry.nohead);
|
ctx.qry.nohead);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -134,12 +134,12 @@ static void summary_fn(void)
|
||||||
|
|
||||||
static void tag_fn(void)
|
static void tag_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_tag(ctx.qry.sha1);
|
cgit_print_tag(ctx.qry.oid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tree_fn(void)
|
static void tree_fn(void)
|
||||||
{
|
{
|
||||||
cgit_print_tree(ctx.qry.sha1, ctx.qry.path);
|
cgit_print_tree(ctx.qry.oid, ctx.qry.path);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define def_cmd(name, want_repo, want_vpath, is_clone) \
|
#define def_cmd(name, want_repo, want_vpath, is_clone) \
|
||||||
|
|
2
third_party/cgit/filters/commit-links.sh
vendored
2
third_party/cgit/filters/commit-links.sh
vendored
|
@ -19,7 +19,7 @@ regex=''
|
||||||
|
|
||||||
# This expression generates links to commits referenced by their SHA1.
|
# This expression generates links to commits referenced by their SHA1.
|
||||||
regex=$regex'
|
regex=$regex'
|
||||||
s|\b([0-9a-fA-F]{7,40})\b|<a href="./?id=\1">\1</a>|g'
|
s|\b([0-9a-fA-F]{7,64})\b|<a href="./?id=\1">\1</a>|g'
|
||||||
|
|
||||||
# This expression generates links to a fictional bugtracker.
|
# This expression generates links to a fictional bugtracker.
|
||||||
regex=$regex'
|
regex=$regex'
|
||||||
|
|
1
third_party/cgit/git
vendored
Symbolic link
1
third_party/cgit/git
vendored
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../git/
|
7
third_party/cgit/parsing.c
vendored
7
third_party/cgit/parsing.c
vendored
|
@ -127,9 +127,8 @@ static int end_of_header(const char *p)
|
||||||
|
|
||||||
struct commitinfo *cgit_parse_commit(struct commit *commit)
|
struct commitinfo *cgit_parse_commit(struct commit *commit)
|
||||||
{
|
{
|
||||||
const int sha1hex_len = 40;
|
|
||||||
struct commitinfo *ret;
|
struct commitinfo *ret;
|
||||||
const char *p = get_cached_commit_buffer(the_repository, commit, NULL);
|
const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
|
||||||
const char *t;
|
const char *t;
|
||||||
|
|
||||||
ret = xcalloc(1, sizeof(struct commitinfo));
|
ret = xcalloc(1, sizeof(struct commitinfo));
|
||||||
|
@ -140,10 +139,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
|
||||||
|
|
||||||
if (!skip_prefix(p, "tree ", &p))
|
if (!skip_prefix(p, "tree ", &p))
|
||||||
die("Bad commit: %s", oid_to_hex(&commit->object.oid));
|
die("Bad commit: %s", oid_to_hex(&commit->object.oid));
|
||||||
p += sha1hex_len + 1;
|
p += the_hash_algo->hexsz + 1;
|
||||||
|
|
||||||
while (skip_prefix(p, "parent ", &p))
|
while (skip_prefix(p, "parent ", &p))
|
||||||
p += sha1hex_len + 1;
|
p += the_hash_algo->hexsz + 1;
|
||||||
|
|
||||||
if (p && skip_prefix(p, "author ", &p)) {
|
if (p && skip_prefix(p, "author ", &p)) {
|
||||||
parse_user(p, &ret->author, &ret->author_email,
|
parse_user(p, &ret->author, &ret->author_email,
|
||||||
|
|
14
third_party/cgit/tests/setup.sh
vendored
14
third_party/cgit/tests/setup.sh
vendored
|
@ -80,13 +80,17 @@ mkrepo() {
|
||||||
git commit -m "commit $n"
|
git commit -m "commit $n"
|
||||||
n=$(expr $n + 1)
|
n=$(expr $n + 1)
|
||||||
done
|
done
|
||||||
if test "$3" = "testplus"
|
case "$3" in
|
||||||
then
|
testplus)
|
||||||
echo "hello" >a+b
|
echo "hello" >a+b
|
||||||
git add a+b
|
git add a+b
|
||||||
git commit -m "add a+b"
|
git commit -m "add a+b"
|
||||||
git branch "1+2"
|
git branch "1+2"
|
||||||
fi
|
;;
|
||||||
|
commit-graph)
|
||||||
|
git commit-graph write
|
||||||
|
;;
|
||||||
|
esac
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -95,7 +99,7 @@ setup_repos()
|
||||||
rm -rf cache
|
rm -rf cache
|
||||||
mkdir -p cache
|
mkdir -p cache
|
||||||
mkrepo repos/foo 5 >/dev/null
|
mkrepo repos/foo 5 >/dev/null
|
||||||
mkrepo repos/bar 50 >/dev/null
|
mkrepo repos/bar 50 commit-graph >/dev/null
|
||||||
mkrepo repos/foo+bar 10 testplus >/dev/null
|
mkrepo repos/foo+bar 10 testplus >/dev/null
|
||||||
mkrepo "repos/with space" 2 >/dev/null
|
mkrepo "repos/with space" 2 >/dev/null
|
||||||
mkrepo repos/filter 5 testplus >/dev/null
|
mkrepo repos/filter 5 testplus >/dev/null
|
||||||
|
@ -104,7 +108,7 @@ virtual-root=/
|
||||||
cache-root=$PWD/cache
|
cache-root=$PWD/cache
|
||||||
|
|
||||||
cache-size=1021
|
cache-size=1021
|
||||||
snapshots=tar.gz tar.bz zip
|
snapshots=tar.gz tar.bz tar.lz tar.xz tar.zst zip
|
||||||
enable-log-filecount=1
|
enable-log-filecount=1
|
||||||
enable-log-linecount=1
|
enable-log-linecount=1
|
||||||
summary-log=5
|
summary-log=5
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
if [ "${CGIT_TEST_NO_GIT_VERSION}" = "YesPlease" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
test_description='Check Git version is correct'
|
test_description='Check Git version is correct'
|
||||||
CGIT_TEST_NO_CREATE_REPOS=YesPlease
|
CGIT_TEST_NO_CREATE_REPOS=YesPlease
|
||||||
. ./setup.sh
|
. ./setup.sh
|
||||||
|
@ -29,10 +33,10 @@ test_expect_success 'test submodule version matches Makefile' '
|
||||||
else
|
else
|
||||||
(
|
(
|
||||||
cd ../.. &&
|
cd ../.. &&
|
||||||
sm_sha1=$(git ls-files --stage -- git |
|
sm_oid=$(git ls-files --stage -- git |
|
||||||
sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") &&
|
sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") &&
|
||||||
cd git &&
|
cd git &&
|
||||||
git describe --match "v[0-9]*" $sm_sha1
|
git describe --match "v[0-9]*" $sm_oid
|
||||||
) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
|
) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
|
||||||
test_cmp sm_version makefile_version
|
test_cmp sm_version makefile_version
|
||||||
fi
|
fi
|
||||||
|
|
2
third_party/cgit/tests/t0105-commit.sh
vendored
2
third_party/cgit/tests/t0105-commit.sh
vendored
|
@ -25,7 +25,7 @@ test_expect_success 'get root commit' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'root commit contains diffstat' '
|
test_expect_success 'root commit contains diffstat' '
|
||||||
grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" tmp
|
grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40,64\}.>file-1</a>" tmp
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'root commit contains diff' '
|
test_expect_success 'root commit contains diff' '
|
||||||
|
|
123
third_party/cgit/tests/t0107-snapshot.sh
vendored
123
third_party/cgit/tests/t0107-snapshot.sh
vendored
|
@ -38,6 +38,129 @@ test_expect_success 'verify untarred file-5' '
|
||||||
test_line_count = 1 master/file-5
|
test_line_count = 1 master/file-5
|
||||||
'
|
'
|
||||||
|
|
||||||
|
if test -n "$(which lzip 2>/dev/null)"; then
|
||||||
|
test_set_prereq LZIP
|
||||||
|
else
|
||||||
|
say 'Skipping LZIP validation tests: lzip not found'
|
||||||
|
fi
|
||||||
|
|
||||||
|
test_expect_success LZIP 'get foo/snapshot/master.tar.lz' '
|
||||||
|
cgit_url "foo/snapshot/master.tar.lz" >tmp
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success LZIP 'check html headers' '
|
||||||
|
head -n 1 tmp |
|
||||||
|
grep "Content-Type: application/x-lzip" &&
|
||||||
|
|
||||||
|
head -n 2 tmp |
|
||||||
|
grep "Content-Disposition: inline; filename=.master.tar.lz."
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success LZIP 'strip off the header lines' '
|
||||||
|
strip_headers <tmp >master.tar.lz
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success LZIP 'verify lzip format' '
|
||||||
|
lzip --test master.tar.lz
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success LZIP 'untar' '
|
||||||
|
rm -rf master &&
|
||||||
|
tar --lzip -xf master.tar.lz
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success LZIP 'count files' '
|
||||||
|
ls master/ >output &&
|
||||||
|
test_line_count = 5 output
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success LZIP 'verify untarred file-5' '
|
||||||
|
grep "^5$" master/file-5 &&
|
||||||
|
test_line_count = 1 master/file-5
|
||||||
|
'
|
||||||
|
|
||||||
|
if test -n "$(which xz 2>/dev/null)"; then
|
||||||
|
test_set_prereq XZ
|
||||||
|
else
|
||||||
|
say 'Skipping XZ validation tests: xz not found'
|
||||||
|
fi
|
||||||
|
|
||||||
|
test_expect_success XZ 'get foo/snapshot/master.tar.xz' '
|
||||||
|
cgit_url "foo/snapshot/master.tar.xz" >tmp
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success XZ 'check html headers' '
|
||||||
|
head -n 1 tmp |
|
||||||
|
grep "Content-Type: application/x-xz" &&
|
||||||
|
|
||||||
|
head -n 2 tmp |
|
||||||
|
grep "Content-Disposition: inline; filename=.master.tar.xz."
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success XZ 'strip off the header lines' '
|
||||||
|
strip_headers <tmp >master.tar.xz
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success XZ 'verify xz format' '
|
||||||
|
xz --test master.tar.xz
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success XZ 'untar' '
|
||||||
|
rm -rf master &&
|
||||||
|
tar --xz -xf master.tar.xz
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success XZ 'count files' '
|
||||||
|
ls master/ >output &&
|
||||||
|
test_line_count = 5 output
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success XZ 'verify untarred file-5' '
|
||||||
|
grep "^5$" master/file-5 &&
|
||||||
|
test_line_count = 1 master/file-5
|
||||||
|
'
|
||||||
|
|
||||||
|
if test -n "$(which zstd 2>/dev/null)"; then
|
||||||
|
test_set_prereq ZSTD
|
||||||
|
else
|
||||||
|
say 'Skipping ZSTD validation tests: zstd not found'
|
||||||
|
fi
|
||||||
|
|
||||||
|
test_expect_success ZSTD 'get foo/snapshot/master.tar.zst' '
|
||||||
|
cgit_url "foo/snapshot/master.tar.zst" >tmp
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success ZSTD 'check html headers' '
|
||||||
|
head -n 1 tmp |
|
||||||
|
grep "Content-Type: application/x-zstd" &&
|
||||||
|
|
||||||
|
head -n 2 tmp |
|
||||||
|
grep "Content-Disposition: inline; filename=.master.tar.zst."
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success ZSTD 'strip off the header lines' '
|
||||||
|
strip_headers <tmp >master.tar.zst
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success ZSTD 'verify zstd format' '
|
||||||
|
zstd --test master.tar.zst
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success ZSTD 'untar' '
|
||||||
|
rm -rf master &&
|
||||||
|
tar --zstd -xf master.tar.zst
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success ZSTD 'count files' '
|
||||||
|
ls master/ >output &&
|
||||||
|
test_line_count = 5 output
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success ZSTD 'verify untarred file-5' '
|
||||||
|
grep "^5$" master/file-5 &&
|
||||||
|
test_line_count = 1 master/file-5
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'get foo/snapshot/master.zip' '
|
test_expect_success 'get foo/snapshot/master.zip' '
|
||||||
cgit_url "foo/snapshot/master.zip" >tmp
|
cgit_url "foo/snapshot/master.zip" >tmp
|
||||||
'
|
'
|
||||||
|
|
8
third_party/cgit/tests/t0109-gitconfig.sh
vendored
8
third_party/cgit/tests/t0109-gitconfig.sh
vendored
|
@ -9,6 +9,12 @@ test -n "$(which strace 2>/dev/null)" || {
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
strace true 2>/dev/null || {
|
||||||
|
skip_all='Skipping access validation tests: strace not functional'
|
||||||
|
test_done
|
||||||
|
exit
|
||||||
|
}
|
||||||
|
|
||||||
test_no_home_access () {
|
test_no_home_access () {
|
||||||
non_existent_path="/path/to/some/place/that/does/not/possibly/exist"
|
non_existent_path="/path/to/some/place/that/does/not/possibly/exist"
|
||||||
while test -d "$non_existent_path"; do
|
while test -d "$non_existent_path"; do
|
||||||
|
@ -19,7 +25,7 @@ test_no_home_access () {
|
||||||
-E CGIT_CONFIG="$PWD/cgitrc" \
|
-E CGIT_CONFIG="$PWD/cgitrc" \
|
||||||
-E QUERY_STRING="url=$1" \
|
-E QUERY_STRING="url=$1" \
|
||||||
-e access -f -o strace.out cgit &&
|
-e access -f -o strace.out cgit &&
|
||||||
test_must_fail grep "$non_existent_path" strace.out
|
! grep "$non_existent_path" strace.out
|
||||||
}
|
}
|
||||||
|
|
||||||
test_no_home_access_success() {
|
test_no_home_access_success() {
|
||||||
|
|
18
third_party/cgit/ui-blame.c
vendored
18
third_party/cgit/ui-blame.c
vendored
|
@ -10,7 +10,7 @@
|
||||||
#include "ui-blame.h"
|
#include "ui-blame.h"
|
||||||
#include "html.h"
|
#include "html.h"
|
||||||
#include "ui-shared.h"
|
#include "ui-shared.h"
|
||||||
#include "argv-array.h"
|
#include "strvec.h"
|
||||||
#include "blame.h"
|
#include "blame.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ static void emit_blame_entry_hash(struct blame_entry *ent)
|
||||||
unsigned long line = 0;
|
unsigned long line = 0;
|
||||||
|
|
||||||
char *detail = emit_suspect_detail(suspect);
|
char *detail = emit_suspect_detail(suspect);
|
||||||
html("<span class='sha1'>");
|
html("<span class='oid'>");
|
||||||
cgit_commit_link(find_unique_abbrev(oid, DEFAULT_ABBREV), detail,
|
cgit_commit_link(find_unique_abbrev(oid, DEFAULT_ABBREV), detail,
|
||||||
NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
|
NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
|
||||||
html("</span>");
|
html("</span>");
|
||||||
|
@ -104,7 +104,7 @@ static void print_object(const struct object_id *oid, const char *path,
|
||||||
enum object_type type;
|
enum object_type type;
|
||||||
char *buf;
|
char *buf;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
struct argv_array rev_argv = ARGV_ARRAY_INIT;
|
struct strvec rev_argv = STRVEC_INIT;
|
||||||
struct rev_info revs;
|
struct rev_info revs;
|
||||||
struct blame_scoreboard sb;
|
struct blame_scoreboard sb;
|
||||||
struct blame_origin *o;
|
struct blame_origin *o;
|
||||||
|
@ -124,11 +124,11 @@ static void print_object(const struct object_id *oid, const char *path,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
argv_array_push(&rev_argv, "blame");
|
strvec_push(&rev_argv, "blame");
|
||||||
argv_array_push(&rev_argv, rev);
|
strvec_push(&rev_argv, rev);
|
||||||
init_revisions(&revs, NULL);
|
init_revisions(&revs, NULL);
|
||||||
revs.diffopt.flags.allow_textconv = 1;
|
revs.diffopt.flags.allow_textconv = 1;
|
||||||
setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL);
|
setup_revisions(rev_argv.nr, rev_argv.v, &revs, NULL);
|
||||||
init_scoreboard(&sb);
|
init_scoreboard(&sb);
|
||||||
sb.revs = &revs;
|
sb.revs = &revs;
|
||||||
sb.repo = the_repository;
|
sb.repo = the_repository;
|
||||||
|
@ -260,7 +260,7 @@ static int basedir_len(const char *path)
|
||||||
|
|
||||||
void cgit_print_blame(void)
|
void cgit_print_blame(void)
|
||||||
{
|
{
|
||||||
const char *rev = ctx.qry.sha1;
|
const char *rev = ctx.qry.oid;
|
||||||
struct object_id oid;
|
struct object_id oid;
|
||||||
struct commit *commit;
|
struct commit *commit;
|
||||||
struct pathspec_item path_items = {
|
struct pathspec_item path_items = {
|
||||||
|
@ -294,7 +294,9 @@ void cgit_print_blame(void)
|
||||||
walk_tree_ctx.match_baselen = (path_items.match) ?
|
walk_tree_ctx.match_baselen = (path_items.match) ?
|
||||||
basedir_len(path_items.match) : -1;
|
basedir_len(path_items.match) : -1;
|
||||||
|
|
||||||
read_tree_recursive(the_repository, commit->maybe_tree, "", 0, 0,
|
read_tree_recursive(the_repository,
|
||||||
|
repo_get_commit_tree(the_repository, commit),
|
||||||
|
"", 0, 0,
|
||||||
&paths, walk_tree, &walk_tree_ctx);
|
&paths, walk_tree, &walk_tree_ctx);
|
||||||
if (!walk_tree_ctx.state)
|
if (!walk_tree_ctx.state)
|
||||||
cgit_print_error_page(404, "Not found", "Not found");
|
cgit_print_error_page(404, "Not found", "Not found");
|
||||||
|
|
15
third_party/cgit/ui-blob.c
vendored
15
third_party/cgit/ui-blob.c
vendored
|
@ -56,7 +56,8 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
|
||||||
goto done;
|
goto done;
|
||||||
if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT)
|
if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT)
|
||||||
goto done;
|
goto done;
|
||||||
read_tree_recursive(the_repository, lookup_commit_reference(the_repository, &oid)->maybe_tree,
|
read_tree_recursive(the_repository,
|
||||||
|
repo_get_commit_tree(the_repository, lookup_commit_reference(the_repository, &oid)),
|
||||||
"", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
"", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
@ -91,8 +92,10 @@ int cgit_print_file(char *path, const char *head, int file_only)
|
||||||
type = oid_object_info(the_repository, &oid, &size);
|
type = oid_object_info(the_repository, &oid, &size);
|
||||||
if (type == OBJ_COMMIT) {
|
if (type == OBJ_COMMIT) {
|
||||||
commit = lookup_commit_reference(the_repository, &oid);
|
commit = lookup_commit_reference(the_repository, &oid);
|
||||||
read_tree_recursive(the_repository, commit->maybe_tree,
|
read_tree_recursive(the_repository,
|
||||||
"", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
repo_get_commit_tree(the_repository, commit),
|
||||||
|
"", 0, 0, &paths, walk_tree,
|
||||||
|
&walk_tree_ctx);
|
||||||
if (!walk_tree_ctx.found_path)
|
if (!walk_tree_ctx.found_path)
|
||||||
return -1;
|
return -1;
|
||||||
type = oid_object_info(the_repository, &oid, &size);
|
type = oid_object_info(the_repository, &oid, &size);
|
||||||
|
@ -148,8 +151,10 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
|
||||||
|
|
||||||
if ((!hex) && type == OBJ_COMMIT && path) {
|
if ((!hex) && type == OBJ_COMMIT && path) {
|
||||||
commit = lookup_commit_reference(the_repository, &oid);
|
commit = lookup_commit_reference(the_repository, &oid);
|
||||||
read_tree_recursive(the_repository, commit->maybe_tree,
|
read_tree_recursive(the_repository,
|
||||||
"", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
repo_get_commit_tree(the_repository, commit),
|
||||||
|
"", 0, 0, &paths, walk_tree,
|
||||||
|
&walk_tree_ctx);
|
||||||
type = oid_object_info(the_repository, &oid, &size);
|
type = oid_object_info(the_repository, &oid, &size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
12
third_party/cgit/ui-commit.c
vendored
12
third_party/cgit/ui-commit.c
vendored
|
@ -71,15 +71,15 @@ void cgit_print_commit(char *hex, const char *prefix)
|
||||||
html_txt(show_date(info->committer_date, info->committer_tz,
|
html_txt(show_date(info->committer_date, info->committer_tz,
|
||||||
cgit_date_mode(DATE_DOTTIME)));
|
cgit_date_mode(DATE_DOTTIME)));
|
||||||
html("</td></tr>\n");
|
html("</td></tr>\n");
|
||||||
html("<tr><th>commit</th><td colspan='2' class='sha1'>");
|
html("<tr><th>commit</th><td colspan='2' class='oid'>");
|
||||||
tmp = oid_to_hex(&commit->object.oid);
|
tmp = oid_to_hex(&commit->object.oid);
|
||||||
cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
|
cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
|
||||||
html(" (");
|
html(" (");
|
||||||
cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
|
cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
|
||||||
html(")</td></tr>\n");
|
html(")</td></tr>\n");
|
||||||
html("<tr><th>tree</th><td colspan='2' class='sha1'>");
|
html("<tr><th>tree</th><td colspan='2' class='oid'>");
|
||||||
tmp = xstrdup(hex);
|
tmp = xstrdup(hex);
|
||||||
cgit_tree_link(oid_to_hex(&commit->maybe_tree->object.oid), NULL, NULL,
|
cgit_tree_link(oid_to_hex(get_commit_tree_oid(commit)), NULL, NULL,
|
||||||
ctx.qry.head, tmp, NULL);
|
ctx.qry.head, tmp, NULL);
|
||||||
if (prefix) {
|
if (prefix) {
|
||||||
html(" /");
|
html(" /");
|
||||||
|
@ -96,7 +96,7 @@ void cgit_print_commit(char *hex, const char *prefix)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
html("<tr><th>parent</th>"
|
html("<tr><th>parent</th>"
|
||||||
"<td colspan='2' class='sha1'>");
|
"<td colspan='2' class='oid'>");
|
||||||
tmp = tmp2 = oid_to_hex(&p->item->object.oid);
|
tmp = tmp2 = oid_to_hex(&p->item->object.oid);
|
||||||
if (ctx.repo->enable_subject_links) {
|
if (ctx.repo->enable_subject_links) {
|
||||||
parent_info = cgit_parse_commit(parent);
|
parent_info = cgit_parse_commit(parent);
|
||||||
|
@ -110,7 +110,7 @@ void cgit_print_commit(char *hex, const char *prefix)
|
||||||
parents++;
|
parents++;
|
||||||
}
|
}
|
||||||
if (ctx.repo->snapshots) {
|
if (ctx.repo->snapshots) {
|
||||||
html("<tr><th>download</th><td colspan='2' class='sha1'>");
|
html("<tr><th>download</th><td colspan='2' class='oid'>");
|
||||||
cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
|
cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
|
||||||
html("</td></tr>");
|
html("</td></tr>");
|
||||||
}
|
}
|
||||||
|
@ -140,7 +140,7 @@ void cgit_print_commit(char *hex, const char *prefix)
|
||||||
tmp = oid_to_hex(&commit->parents->item->object.oid);
|
tmp = oid_to_hex(&commit->parents->item->object.oid);
|
||||||
else
|
else
|
||||||
tmp = NULL;
|
tmp = NULL;
|
||||||
cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);
|
cgit_print_diff(ctx.qry.oid, tmp, prefix, 0, 0);
|
||||||
}
|
}
|
||||||
strbuf_release(¬es);
|
strbuf_release(¬es);
|
||||||
cgit_free_commitinfo(info);
|
cgit_free_commitinfo(info);
|
||||||
|
|
12
third_party/cgit/ui-diff.c
vendored
12
third_party/cgit/ui-diff.c
vendored
|
@ -97,8 +97,8 @@ static void print_fileinfo(struct fileinfo *info)
|
||||||
html("]</span>");
|
html("]</span>");
|
||||||
}
|
}
|
||||||
htmlf("</td><td class='%s'>", class);
|
htmlf("</td><td class='%s'>", class);
|
||||||
cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
|
cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.oid,
|
||||||
ctx.qry.sha2, info->new_path);
|
ctx.qry.oid2, info->new_path);
|
||||||
if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
|
if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
|
||||||
htmlf(" (%s from ",
|
htmlf(" (%s from ",
|
||||||
info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
|
info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
|
||||||
|
@ -194,8 +194,8 @@ static void cgit_print_diffstat(const struct object_id *old_oid,
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
html("<div class='diffstat-header'>");
|
html("<div class='diffstat-header'>");
|
||||||
cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
|
cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.oid,
|
||||||
ctx.qry.sha2, NULL);
|
ctx.qry.oid2, NULL);
|
||||||
if (prefix) {
|
if (prefix) {
|
||||||
html(" (limited to '");
|
html(" (limited to '");
|
||||||
html_txt(prefix);
|
html_txt(prefix);
|
||||||
|
@ -413,7 +413,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
|
||||||
"Bad commit: %s", oid_to_hex(new_rev_oid));
|
"Bad commit: %s", oid_to_hex(new_rev_oid));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
new_tree_oid = &commit->maybe_tree->object.oid;
|
new_tree_oid = get_commit_tree_oid(commit);
|
||||||
|
|
||||||
if (old_rev) {
|
if (old_rev) {
|
||||||
if (get_oid(old_rev, old_rev_oid)) {
|
if (get_oid(old_rev, old_rev_oid)) {
|
||||||
|
@ -434,7 +434,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
|
||||||
"Bad commit: %s", oid_to_hex(old_rev_oid));
|
"Bad commit: %s", oid_to_hex(old_rev_oid));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
old_tree_oid = &commit2->maybe_tree->object.oid;
|
old_tree_oid = get_commit_tree_oid(commit2);
|
||||||
} else {
|
} else {
|
||||||
old_tree_oid = NULL;
|
old_tree_oid = NULL;
|
||||||
}
|
}
|
||||||
|
|
40
third_party/cgit/ui-log.c
vendored
40
third_party/cgit/ui-log.c
vendored
|
@ -10,7 +10,7 @@
|
||||||
#include "ui-log.h"
|
#include "ui-log.h"
|
||||||
#include "html.h"
|
#include "html.h"
|
||||||
#include "ui-shared.h"
|
#include "ui-shared.h"
|
||||||
#include "argv-array.h"
|
#include "strvec.h"
|
||||||
|
|
||||||
static int files, add_lines, rem_lines, lines_counted;
|
static int files, add_lines, rem_lines, lines_counted;
|
||||||
|
|
||||||
|
@ -153,8 +153,8 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
|
||||||
rem_lines = 0;
|
rem_lines = 0;
|
||||||
|
|
||||||
revs->diffopt.flags.recursive = 1;
|
revs->diffopt.flags.recursive = 1;
|
||||||
diff_tree_oid(&parent->maybe_tree->object.oid,
|
diff_tree_oid(get_commit_tree_oid(parent),
|
||||||
&commit->maybe_tree->object.oid,
|
get_commit_tree_oid(commit),
|
||||||
"", &revs->diffopt);
|
"", &revs->diffopt);
|
||||||
diffcore_std(&revs->diffopt);
|
diffcore_std(&revs->diffopt);
|
||||||
|
|
||||||
|
@ -366,23 +366,23 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
|
||||||
{
|
{
|
||||||
struct rev_info rev;
|
struct rev_info rev;
|
||||||
struct commit *commit;
|
struct commit *commit;
|
||||||
struct argv_array rev_argv = ARGV_ARRAY_INIT;
|
struct strvec rev_argv = STRVEC_INIT;
|
||||||
int i, columns = commit_graph ? 4 : 3;
|
int i, columns = commit_graph ? 4 : 3;
|
||||||
int must_free_tip = 0;
|
int must_free_tip = 0;
|
||||||
|
|
||||||
/* rev_argv.argv[0] will be ignored by setup_revisions */
|
/* rev_argv.argv[0] will be ignored by setup_revisions */
|
||||||
argv_array_push(&rev_argv, "log_rev_setup");
|
strvec_push(&rev_argv, "log_rev_setup");
|
||||||
|
|
||||||
if (!tip)
|
if (!tip)
|
||||||
tip = ctx.qry.head;
|
tip = ctx.qry.head;
|
||||||
tip = disambiguate_ref(tip, &must_free_tip);
|
tip = disambiguate_ref(tip, &must_free_tip);
|
||||||
argv_array_push(&rev_argv, tip);
|
strvec_push(&rev_argv, tip);
|
||||||
|
|
||||||
if (grep && pattern && *pattern) {
|
if (grep && pattern && *pattern) {
|
||||||
pattern = xstrdup(pattern);
|
pattern = xstrdup(pattern);
|
||||||
if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
|
if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
|
||||||
!strcmp(grep, "committer")) {
|
!strcmp(grep, "committer")) {
|
||||||
argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern);
|
strvec_pushf(&rev_argv, "--%s=%s", grep, pattern);
|
||||||
} else if (!strcmp(grep, "range")) {
|
} else if (!strcmp(grep, "range")) {
|
||||||
char *arg;
|
char *arg;
|
||||||
/* Split the pattern at whitespace and add each token
|
/* Split the pattern at whitespace and add each token
|
||||||
|
@ -390,14 +390,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
|
||||||
* rev-list options. Also, replace the previously
|
* rev-list options. Also, replace the previously
|
||||||
* pushed tip (it's no longer relevant).
|
* pushed tip (it's no longer relevant).
|
||||||
*/
|
*/
|
||||||
argv_array_pop(&rev_argv);
|
strvec_pop(&rev_argv);
|
||||||
while ((arg = next_token(&pattern))) {
|
while ((arg = next_token(&pattern))) {
|
||||||
if (*arg == '-') {
|
if (*arg == '-') {
|
||||||
fprintf(stderr, "Bad range expr: %s\n",
|
fprintf(stderr, "Bad range expr: %s\n",
|
||||||
arg);
|
arg);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
argv_array_push(&rev_argv, arg);
|
strvec_push(&rev_argv, arg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -412,22 +412,22 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
|
||||||
}
|
}
|
||||||
|
|
||||||
if (commit_graph && !ctx.qry.follow) {
|
if (commit_graph && !ctx.qry.follow) {
|
||||||
argv_array_push(&rev_argv, "--graph");
|
strvec_push(&rev_argv, "--graph");
|
||||||
argv_array_push(&rev_argv, "--color");
|
strvec_push(&rev_argv, "--color");
|
||||||
graph_set_column_colors(column_colors_html,
|
graph_set_column_colors(column_colors_html,
|
||||||
COLUMN_COLORS_HTML_MAX);
|
COLUMN_COLORS_HTML_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (commit_sort == 1)
|
if (commit_sort == 1)
|
||||||
argv_array_push(&rev_argv, "--date-order");
|
strvec_push(&rev_argv, "--date-order");
|
||||||
else if (commit_sort == 2)
|
else if (commit_sort == 2)
|
||||||
argv_array_push(&rev_argv, "--topo-order");
|
strvec_push(&rev_argv, "--topo-order");
|
||||||
|
|
||||||
if (path && ctx.qry.follow)
|
if (path && ctx.qry.follow)
|
||||||
argv_array_push(&rev_argv, "--follow");
|
strvec_push(&rev_argv, "--follow");
|
||||||
argv_array_push(&rev_argv, "--");
|
strvec_push(&rev_argv, "--");
|
||||||
if (path)
|
if (path)
|
||||||
argv_array_push(&rev_argv, path);
|
strvec_push(&rev_argv, path);
|
||||||
|
|
||||||
init_revisions(&rev, NULL);
|
init_revisions(&rev, NULL);
|
||||||
rev.abbrev = DEFAULT_ABBREV;
|
rev.abbrev = DEFAULT_ABBREV;
|
||||||
|
@ -436,7 +436,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
|
||||||
rev.show_root_diff = 0;
|
rev.show_root_diff = 0;
|
||||||
rev.ignore_missing = 1;
|
rev.ignore_missing = 1;
|
||||||
rev.simplify_history = 1;
|
rev.simplify_history = 1;
|
||||||
setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
|
setup_revisions(rev_argv.nr, rev_argv.v, &rev, NULL);
|
||||||
load_ref_decorations(NULL, DECORATE_FULL_REFS);
|
load_ref_decorations(NULL, DECORATE_FULL_REFS);
|
||||||
rev.show_decorations = 1;
|
rev.show_decorations = 1;
|
||||||
rev.grep_filter.ignore_case = 1;
|
rev.grep_filter.ignore_case = 1;
|
||||||
|
@ -463,7 +463,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
|
||||||
if (pager) {
|
if (pager) {
|
||||||
html(" (");
|
html(" (");
|
||||||
cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
|
cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
|
||||||
NULL, ctx.qry.head, ctx.qry.sha1,
|
NULL, ctx.qry.head, ctx.qry.oid,
|
||||||
ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
|
ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
|
||||||
ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
|
ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
|
||||||
ctx.qry.follow);
|
ctx.qry.follow);
|
||||||
|
@ -519,7 +519,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
|
||||||
if (ofs > 0) {
|
if (ofs > 0) {
|
||||||
html("<li>");
|
html("<li>");
|
||||||
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
|
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
|
||||||
ctx.qry.sha1, ctx.qry.vpath,
|
ctx.qry.oid, ctx.qry.vpath,
|
||||||
ofs - cnt, ctx.qry.grep,
|
ofs - cnt, ctx.qry.grep,
|
||||||
ctx.qry.search, ctx.qry.showmsg,
|
ctx.qry.search, ctx.qry.showmsg,
|
||||||
ctx.qry.follow);
|
ctx.qry.follow);
|
||||||
|
@ -528,7 +528,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
|
||||||
if ((commit = get_revision(&rev)) != NULL) {
|
if ((commit = get_revision(&rev)) != NULL) {
|
||||||
html("<li>");
|
html("<li>");
|
||||||
cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
|
cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
|
||||||
ctx.qry.sha1, ctx.qry.vpath,
|
ctx.qry.oid, ctx.qry.vpath,
|
||||||
ofs + cnt, ctx.qry.grep,
|
ofs + cnt, ctx.qry.grep,
|
||||||
ctx.qry.search, ctx.qry.showmsg,
|
ctx.qry.search, ctx.qry.showmsg,
|
||||||
ctx.qry.follow);
|
ctx.qry.follow);
|
||||||
|
|
2
third_party/cgit/ui-patch.c
vendored
2
third_party/cgit/ui-patch.c
vendored
|
@ -61,7 +61,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_null_oid(&old_rev_oid)) {
|
if (is_null_oid(&old_rev_oid)) {
|
||||||
memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
|
memcpy(rev_range, oid_to_hex(&new_rev_oid), the_hash_algo->hexsz + 1);
|
||||||
} else {
|
} else {
|
||||||
xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),
|
xsnprintf(rev_range, REV_RANGE_LEN, "%s..%s", oid_to_hex(&old_rev_oid),
|
||||||
oid_to_hex(&new_rev_oid));
|
oid_to_hex(&new_rev_oid));
|
||||||
|
|
11
third_party/cgit/ui-plain.c
vendored
11
third_party/cgit/ui-plain.c
vendored
|
@ -99,7 +99,7 @@ static void print_dir(const struct object_id *oid, const char *base,
|
||||||
fullpath = NULL;
|
fullpath = NULL;
|
||||||
}
|
}
|
||||||
html("<li>");
|
html("<li>");
|
||||||
cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
|
cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.oid,
|
||||||
fullpath);
|
fullpath);
|
||||||
html("</li>\n");
|
html("</li>\n");
|
||||||
}
|
}
|
||||||
|
@ -118,7 +118,7 @@ static void print_dir_entry(const struct object_id *oid, const char *base,
|
||||||
if (S_ISGITLINK(mode)) {
|
if (S_ISGITLINK(mode)) {
|
||||||
cgit_submodule_link(NULL, fullpath, oid_to_hex(oid));
|
cgit_submodule_link(NULL, fullpath, oid_to_hex(oid));
|
||||||
} else
|
} else
|
||||||
cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
|
cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.oid,
|
||||||
fullpath);
|
fullpath);
|
||||||
html("</li>\n");
|
html("</li>\n");
|
||||||
free(fullpath);
|
free(fullpath);
|
||||||
|
@ -163,7 +163,7 @@ static int basedir_len(const char *path)
|
||||||
|
|
||||||
void cgit_print_plain(void)
|
void cgit_print_plain(void)
|
||||||
{
|
{
|
||||||
const char *rev = ctx.qry.sha1;
|
const char *rev = ctx.qry.oid;
|
||||||
struct object_id oid;
|
struct object_id oid;
|
||||||
struct commit *commit;
|
struct commit *commit;
|
||||||
struct pathspec_item path_items = {
|
struct pathspec_item path_items = {
|
||||||
|
@ -193,12 +193,13 @@ void cgit_print_plain(void)
|
||||||
if (!path_items.match) {
|
if (!path_items.match) {
|
||||||
path_items.match = "";
|
path_items.match = "";
|
||||||
walk_tree_ctx.match_baselen = -1;
|
walk_tree_ctx.match_baselen = -1;
|
||||||
print_dir(&commit->maybe_tree->object.oid, "", 0, "");
|
print_dir(get_commit_tree_oid(commit), "", 0, "");
|
||||||
walk_tree_ctx.match = 2;
|
walk_tree_ctx.match = 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
walk_tree_ctx.match_baselen = basedir_len(path_items.match);
|
walk_tree_ctx.match_baselen = basedir_len(path_items.match);
|
||||||
read_tree_recursive(the_repository, commit->maybe_tree,
|
read_tree_recursive(the_repository,
|
||||||
|
repo_get_commit_tree(the_repository, commit),
|
||||||
"", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
"", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
||||||
if (!walk_tree_ctx.match)
|
if (!walk_tree_ctx.match)
|
||||||
cgit_print_error_page(404, "Not found", "Not found");
|
cgit_print_error_page(404, "Not found", "Not found");
|
||||||
|
|
2
third_party/cgit/ui-repolist.c
vendored
2
third_party/cgit/ui-repolist.c
vendored
|
@ -20,7 +20,7 @@ static time_t read_agefile(const char *path)
|
||||||
|
|
||||||
if (readfile(path, &buf, &size)) {
|
if (readfile(path, &buf, &size)) {
|
||||||
free(buf);
|
free(buf);
|
||||||
return -1;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parse_date(buf, &date_buf) == 0)
|
if (parse_date(buf, &date_buf) == 0)
|
||||||
|
|
40
third_party/cgit/ui-shared.c
vendored
40
third_party/cgit/ui-shared.c
vendored
|
@ -522,45 +522,45 @@ static void cgit_self_link(char *name, const char *title, const char *class)
|
||||||
else if (!strcmp(ctx.qry.page, "summary"))
|
else if (!strcmp(ctx.qry.page, "summary"))
|
||||||
cgit_summary_link(name, title, class, ctx.qry.head);
|
cgit_summary_link(name, title, class, ctx.qry.head);
|
||||||
else if (!strcmp(ctx.qry.page, "tag"))
|
else if (!strcmp(ctx.qry.page, "tag"))
|
||||||
cgit_tag_link(name, title, class, ctx.qry.has_sha1 ?
|
cgit_tag_link(name, title, class, ctx.qry.has_oid ?
|
||||||
ctx.qry.sha1 : ctx.qry.head);
|
ctx.qry.oid : ctx.qry.head);
|
||||||
else if (!strcmp(ctx.qry.page, "tree"))
|
else if (!strcmp(ctx.qry.page, "tree"))
|
||||||
cgit_tree_link(name, title, class, ctx.qry.head,
|
cgit_tree_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
|
ctx.qry.has_oid ? ctx.qry.oid : NULL,
|
||||||
ctx.qry.path);
|
ctx.qry.path);
|
||||||
else if (!strcmp(ctx.qry.page, "plain"))
|
else if (!strcmp(ctx.qry.page, "plain"))
|
||||||
cgit_plain_link(name, title, class, ctx.qry.head,
|
cgit_plain_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
|
ctx.qry.has_oid ? ctx.qry.oid : NULL,
|
||||||
ctx.qry.path);
|
ctx.qry.path);
|
||||||
else if (!strcmp(ctx.qry.page, "blame"))
|
else if (!strcmp(ctx.qry.page, "blame"))
|
||||||
cgit_blame_link(name, title, class, ctx.qry.head,
|
cgit_blame_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
|
ctx.qry.has_oid ? ctx.qry.oid : NULL,
|
||||||
ctx.qry.path);
|
ctx.qry.path);
|
||||||
else if (!strcmp(ctx.qry.page, "log"))
|
else if (!strcmp(ctx.qry.page, "log"))
|
||||||
cgit_log_link(name, title, class, ctx.qry.head,
|
cgit_log_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
|
ctx.qry.has_oid ? ctx.qry.oid : NULL,
|
||||||
ctx.qry.path, ctx.qry.ofs,
|
ctx.qry.path, ctx.qry.ofs,
|
||||||
ctx.qry.grep, ctx.qry.search,
|
ctx.qry.grep, ctx.qry.search,
|
||||||
ctx.qry.showmsg, ctx.qry.follow);
|
ctx.qry.showmsg, ctx.qry.follow);
|
||||||
else if (!strcmp(ctx.qry.page, "commit"))
|
else if (!strcmp(ctx.qry.page, "commit"))
|
||||||
cgit_commit_link(name, title, class, ctx.qry.head,
|
cgit_commit_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
|
ctx.qry.has_oid ? ctx.qry.oid : NULL,
|
||||||
ctx.qry.path);
|
ctx.qry.path);
|
||||||
else if (!strcmp(ctx.qry.page, "patch"))
|
else if (!strcmp(ctx.qry.page, "patch"))
|
||||||
cgit_patch_link(name, title, class, ctx.qry.head,
|
cgit_patch_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
|
ctx.qry.has_oid ? ctx.qry.oid : NULL,
|
||||||
ctx.qry.path);
|
ctx.qry.path);
|
||||||
else if (!strcmp(ctx.qry.page, "refs"))
|
else if (!strcmp(ctx.qry.page, "refs"))
|
||||||
cgit_refs_link(name, title, class, ctx.qry.head,
|
cgit_refs_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
|
ctx.qry.has_oid ? ctx.qry.oid : NULL,
|
||||||
ctx.qry.path);
|
ctx.qry.path);
|
||||||
else if (!strcmp(ctx.qry.page, "snapshot"))
|
else if (!strcmp(ctx.qry.page, "snapshot"))
|
||||||
cgit_snapshot_link(name, title, class, ctx.qry.head,
|
cgit_snapshot_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
|
ctx.qry.has_oid ? ctx.qry.oid : NULL,
|
||||||
ctx.qry.path);
|
ctx.qry.path);
|
||||||
else if (!strcmp(ctx.qry.page, "diff"))
|
else if (!strcmp(ctx.qry.page, "diff"))
|
||||||
cgit_diff_link(name, title, class, ctx.qry.head,
|
cgit_diff_link(name, title, class, ctx.qry.head,
|
||||||
ctx.qry.sha1, ctx.qry.sha2,
|
ctx.qry.oid, ctx.qry.oid2,
|
||||||
ctx.qry.path);
|
ctx.qry.path);
|
||||||
else if (!strcmp(ctx.qry.page, "stats"))
|
else if (!strcmp(ctx.qry.page, "stats"))
|
||||||
cgit_stats_link(name, title, class, ctx.qry.head,
|
cgit_stats_link(name, title, class, ctx.qry.head,
|
||||||
|
@ -928,10 +928,10 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
|
||||||
strcmp(ctx.qry.head, ctx.repo->defbranch))
|
strcmp(ctx.qry.head, ctx.repo->defbranch))
|
||||||
html_hidden("h", ctx.qry.head);
|
html_hidden("h", ctx.qry.head);
|
||||||
|
|
||||||
if (ctx.qry.sha1)
|
if (ctx.qry.oid)
|
||||||
html_hidden("id", ctx.qry.sha1);
|
html_hidden("id", ctx.qry.oid);
|
||||||
if (ctx.qry.sha2)
|
if (ctx.qry.oid2)
|
||||||
html_hidden("id2", ctx.qry.sha2);
|
html_hidden("id2", ctx.qry.oid2);
|
||||||
if (ctx.qry.showmsg)
|
if (ctx.qry.showmsg)
|
||||||
html_hidden("showmsg", "1");
|
html_hidden("showmsg", "1");
|
||||||
|
|
||||||
|
@ -1049,20 +1049,20 @@ void cgit_print_pageheader(void)
|
||||||
cgit_summary_link("summary", NULL, hc("summary"),
|
cgit_summary_link("summary", NULL, hc("summary"),
|
||||||
ctx.qry.head);
|
ctx.qry.head);
|
||||||
cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
|
cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
|
||||||
ctx.qry.sha1, NULL);
|
ctx.qry.oid, NULL);
|
||||||
cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
|
cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
|
||||||
NULL, ctx.qry.vpath, 0, NULL, NULL,
|
NULL, ctx.qry.vpath, 0, NULL, NULL,
|
||||||
ctx.qry.showmsg, ctx.qry.follow);
|
ctx.qry.showmsg, ctx.qry.follow);
|
||||||
if (ctx.qry.page && !strcmp(ctx.qry.page, "blame"))
|
if (ctx.qry.page && !strcmp(ctx.qry.page, "blame"))
|
||||||
cgit_blame_link("blame", NULL, hc("blame"), ctx.qry.head,
|
cgit_blame_link("blame", NULL, hc("blame"), ctx.qry.head,
|
||||||
ctx.qry.sha1, ctx.qry.vpath);
|
ctx.qry.oid, ctx.qry.vpath);
|
||||||
else
|
else
|
||||||
cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
|
cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
|
||||||
ctx.qry.sha1, ctx.qry.vpath);
|
ctx.qry.oid, ctx.qry.vpath);
|
||||||
cgit_commit_link("commit", NULL, hc("commit"),
|
cgit_commit_link("commit", NULL, hc("commit"),
|
||||||
ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath);
|
ctx.qry.head, ctx.qry.oid, ctx.qry.vpath);
|
||||||
cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
|
cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
|
||||||
ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath);
|
ctx.qry.oid, ctx.qry.oid2, ctx.qry.vpath);
|
||||||
if (ctx.repo->max_stats)
|
if (ctx.repo->max_stats)
|
||||||
cgit_stats_link("stats", NULL, hc("stats"),
|
cgit_stats_link("stats", NULL, hc("stats"),
|
||||||
ctx.qry.head, ctx.qry.vpath);
|
ctx.qry.head, ctx.qry.vpath);
|
||||||
|
|
38
third_party/cgit/ui-snapshot.c
vendored
38
third_party/cgit/ui-snapshot.c
vendored
|
@ -13,32 +13,32 @@
|
||||||
|
|
||||||
static int write_archive_type(const char *format, const char *hex, const char *prefix)
|
static int write_archive_type(const char *format, const char *hex, const char *prefix)
|
||||||
{
|
{
|
||||||
struct argv_array argv = ARGV_ARRAY_INIT;
|
struct strvec argv = STRVEC_INIT;
|
||||||
const char **nargv;
|
const char **nargv;
|
||||||
int result;
|
int result;
|
||||||
argv_array_push(&argv, "snapshot");
|
strvec_push(&argv, "snapshot");
|
||||||
argv_array_push(&argv, format);
|
strvec_push(&argv, format);
|
||||||
if (prefix) {
|
if (prefix) {
|
||||||
struct strbuf buf = STRBUF_INIT;
|
struct strbuf buf = STRBUF_INIT;
|
||||||
strbuf_addstr(&buf, prefix);
|
strbuf_addstr(&buf, prefix);
|
||||||
strbuf_addch(&buf, '/');
|
strbuf_addch(&buf, '/');
|
||||||
argv_array_push(&argv, "--prefix");
|
strvec_push(&argv, "--prefix");
|
||||||
argv_array_push(&argv, buf.buf);
|
strvec_push(&argv, buf.buf);
|
||||||
strbuf_release(&buf);
|
strbuf_release(&buf);
|
||||||
}
|
}
|
||||||
argv_array_push(&argv, hex);
|
strvec_push(&argv, hex);
|
||||||
/*
|
/*
|
||||||
* Now we need to copy the pointers to arguments into a new
|
* Now we need to copy the pointers to arguments into a new
|
||||||
* structure because write_archive will rearrange its arguments
|
* structure because write_archive will rearrange its arguments
|
||||||
* which may result in duplicated/missing entries causing leaks
|
* which may result in duplicated/missing entries causing leaks
|
||||||
* or double-frees in argv_array_clear.
|
* or double-frees in strvec_clear.
|
||||||
*/
|
*/
|
||||||
nargv = xmalloc(sizeof(char *) * (argv.argc + 1));
|
nargv = xmalloc(sizeof(char *) * (argv.nr + 1));
|
||||||
/* argv_array guarantees a trailing NULL entry. */
|
/* strvec guarantees a trailing NULL entry. */
|
||||||
memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
|
memcpy(nargv, argv.v, sizeof(char *) * (argv.nr + 1));
|
||||||
|
|
||||||
result = write_archive(argv.argc, nargv, NULL, the_repository, NULL, 0);
|
result = write_archive(argv.nr, nargv, NULL, the_repository, NULL, 0);
|
||||||
argv_array_clear(&argv);
|
strvec_clear(&argv);
|
||||||
free(nargv);
|
free(nargv);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -79,18 +79,32 @@ static int write_tar_bzip2_archive(const char *hex, const char *prefix)
|
||||||
return write_compressed_tar_archive(hex, prefix, argv);
|
return write_compressed_tar_archive(hex, prefix, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int write_tar_lzip_archive(const char *hex, const char *prefix)
|
||||||
|
{
|
||||||
|
char *argv[] = { "lzip", NULL };
|
||||||
|
return write_compressed_tar_archive(hex, prefix, argv);
|
||||||
|
}
|
||||||
|
|
||||||
static int write_tar_xz_archive(const char *hex, const char *prefix)
|
static int write_tar_xz_archive(const char *hex, const char *prefix)
|
||||||
{
|
{
|
||||||
char *argv[] = { "xz", NULL };
|
char *argv[] = { "xz", NULL };
|
||||||
return write_compressed_tar_archive(hex, prefix, argv);
|
return write_compressed_tar_archive(hex, prefix, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int write_tar_zstd_archive(const char *hex, const char *prefix)
|
||||||
|
{
|
||||||
|
char *argv[] = { "zstd", "-T0", NULL };
|
||||||
|
return write_compressed_tar_archive(hex, prefix, argv);
|
||||||
|
}
|
||||||
|
|
||||||
const struct cgit_snapshot_format cgit_snapshot_formats[] = {
|
const struct cgit_snapshot_format cgit_snapshot_formats[] = {
|
||||||
/* .tar must remain the 0 index */
|
/* .tar must remain the 0 index */
|
||||||
{ ".tar", "application/x-tar", write_tar_archive },
|
{ ".tar", "application/x-tar", write_tar_archive },
|
||||||
{ ".tar.gz", "application/x-gzip", write_tar_gzip_archive },
|
{ ".tar.gz", "application/x-gzip", write_tar_gzip_archive },
|
||||||
{ ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive },
|
{ ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive },
|
||||||
|
{ ".tar.lz", "application/x-lzip", write_tar_lzip_archive },
|
||||||
{ ".tar.xz", "application/x-xz", write_tar_xz_archive },
|
{ ".tar.xz", "application/x-xz", write_tar_xz_archive },
|
||||||
|
{ ".tar.zst", "application/x-zstd", write_tar_zstd_archive },
|
||||||
{ ".zip", "application/x-zip", write_zip_archive },
|
{ ".zip", "application/x-zip", write_zip_archive },
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
|
6
third_party/cgit/ui-tag.c
vendored
6
third_party/cgit/ui-tag.c
vendored
|
@ -33,7 +33,7 @@ static void print_tag_content(char *buf)
|
||||||
|
|
||||||
static void print_download_links(char *revname)
|
static void print_download_links(char *revname)
|
||||||
{
|
{
|
||||||
html("<tr><th>download</th><td class='sha1'>");
|
html("<tr><th>download</th><td class='oid'>");
|
||||||
cgit_print_snapshot_links(ctx.repo, revname, "<br/>");
|
cgit_print_snapshot_links(ctx.repo, revname, "<br/>");
|
||||||
html("</td></tr>");
|
html("</td></tr>");
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ void cgit_print_tag(char *revname)
|
||||||
cgit_close_filter(ctx.repo->email_filter);
|
cgit_close_filter(ctx.repo->email_filter);
|
||||||
html("</td></tr>\n");
|
html("</td></tr>\n");
|
||||||
}
|
}
|
||||||
html("<tr><td>tagged object</td><td class='sha1'>");
|
html("<tr><td>tagged object</td><td class='oid'>");
|
||||||
cgit_object_link(tag->tagged);
|
cgit_object_link(tag->tagged);
|
||||||
html("</td></tr>\n");
|
html("</td></tr>\n");
|
||||||
if (ctx.repo->snapshots)
|
if (ctx.repo->snapshots)
|
||||||
|
@ -106,7 +106,7 @@ void cgit_print_tag(char *revname)
|
||||||
html("<tr><td>tag name</td><td>");
|
html("<tr><td>tag name</td><td>");
|
||||||
html_txt(revname);
|
html_txt(revname);
|
||||||
html("</td></tr>\n");
|
html("</td></tr>\n");
|
||||||
html("<tr><td>tagged object</td><td class='sha1'>");
|
html("<tr><td>tagged object</td><td class='oid'>");
|
||||||
cgit_object_link(obj);
|
cgit_object_link(obj);
|
||||||
html("</td></tr>\n");
|
html("</td></tr>\n");
|
||||||
if (ctx.repo->snapshots)
|
if (ctx.repo->snapshots)
|
||||||
|
|
6
third_party/cgit/ui-tree.c
vendored
6
third_party/cgit/ui-tree.c
vendored
|
@ -390,11 +390,13 @@ void cgit_print_tree(const char *rev, char *path)
|
||||||
walk_tree_ctx.curr_rev = xstrdup(rev);
|
walk_tree_ctx.curr_rev = xstrdup(rev);
|
||||||
|
|
||||||
if (path == NULL) {
|
if (path == NULL) {
|
||||||
ls_tree(&commit->maybe_tree->object.oid, NULL, &walk_tree_ctx);
|
ls_tree(get_commit_tree_oid(commit), NULL, &walk_tree_ctx);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
read_tree_recursive(the_repository, commit->maybe_tree, "", 0, 0,
|
read_tree_recursive(the_repository,
|
||||||
|
repo_get_commit_tree(the_repository, commit),
|
||||||
|
"", 0, 0,
|
||||||
&paths, walk_tree, &walk_tree_ctx);
|
&paths, walk_tree, &walk_tree_ctx);
|
||||||
if (walk_tree_ctx.state == 1)
|
if (walk_tree_ctx.state == 1)
|
||||||
ls_tail();
|
ls_tail();
|
||||||
|
|
Loading…
Reference in a new issue