Warmcat homepage andy@warmcat.com
libwebsockets
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1745906952, "reponame":"cgit", "desc":"CGI gitweb", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/cgit", "f":3, "items": [ {"schema":"libjg2-1", "cid":"302f645cb8c6e7cdec5cc9b7d5386f13", "commit": {"type":"commit", "time": 1530115983, "time_ofs": 120, "oid_tree": { "oid": "6a4ab44d3dc6f51ea9f417206721ec648bea67f9", "alias": []}, "oid":{ "oid": "54d37dc154f5308459df0a90c81dabd0245b6c17", "alias": []}, "msg": "global: remove functionality we deprecated for cgit v1.0", "sig_commit": { "git_time": { "time": 1530115983, "offset": 120 }, "name": "Jason A. Donenfeld", "email": "Jason@zx2c4.com", "md5": "689e78dac56e3d77d7f74984912487d3" }, "sig_author": { "git_time": { "time": 1529315323, "offset": 120 }, "name": "Christian Hesse", "email": "mail@eworm.de", "md5": "d39edb2018ca5544c1c390a8266096fb" }}, "body": "global: remove functionality we deprecated for cgit v1.0\n\nThe man page states these were deprecated for v1.0. We are past v1.1,\nso remove the functionality.\n\nSigned-off-by: Christian Hesse \u003cmail@eworm.de\u003e\nReviewed-by: John Keeping \u003cjohn@keeping.me.uk\u003e\n" , "diff": "diff --git a/cgit.c b/cgit.c\nindex ca0a89c..223dfc8 100644\n--- a/cgit.c\n+++ b/cgit.c\n@@ -111,7 +111,7 @@ static void config_cb(const char *name, const char *value)\n {\n \tconst char *arg;\n \n-\tif (!strcmp(name, \u0022section\u0022) || !strcmp(name, \u0022repo.group\u0022))\n+\tif (!strcmp(name, \u0022section\u0022))\n \t\tctx.cfg.section \u003d xstrdup(value);\n \telse if (!strcmp(name, \u0022repo.url\u0022))\n \t\tctx.repo \u003d cgit_add_repo(value);\n@@ -139,20 +139,14 @@ static void config_cb(const char *name, const char *value)\n \t\tctx.cfg.header \u003d xstrdup(value);\n \telse if (!strcmp(name, \u0022logo\u0022))\n \t\tctx.cfg.logo \u003d xstrdup(value);\n-\telse if (!strcmp(name, \u0022index-header\u0022))\n-\t\tctx.cfg.index_header \u003d xstrdup(value);\n-\telse if (!strcmp(name, \u0022index-info\u0022))\n-\t\tctx.cfg.index_info \u003d xstrdup(value);\n \telse if (!strcmp(name, \u0022logo-link\u0022))\n \t\tctx.cfg.logo_link \u003d xstrdup(value);\n \telse if (!strcmp(name, \u0022module-link\u0022))\n \t\tctx.cfg.module_link \u003d xstrdup(value);\n \telse if (!strcmp(name, \u0022strict-export\u0022))\n \t\tctx.cfg.strict_export \u003d xstrdup(value);\n-\telse if (!strcmp(name, \u0022virtual-root\u0022)) {\n+\telse if (!strcmp(name, \u0022virtual-root\u0022))\n \t\tctx.cfg.virtual_root \u003d ensure_end(value, '/');\n-\t} else if (!strcmp(name, \u0022nocache\u0022))\n-\t\tctx.cfg.nocache \u003d atoi(value);\n \telse if (!strcmp(name, \u0022noplainemail\u0022))\n \t\tctx.cfg.noplainemail \u003d atoi(value);\n \telse if (!strcmp(name, \u0022noheader\u0022))\n@@ -236,7 +230,7 @@ static void config_cb(const char *name, const char *value)\n \telse if (!strcmp(name, \u0022project-list\u0022))\n \t\tctx.cfg.project_list \u003d xstrdup(expand_macros(value));\n \telse if (!strcmp(name, \u0022scan-path\u0022))\n-\t\tif (!ctx.cfg.nocache \u0026\u0026 ctx.cfg.cache_size)\n+\t\tif (ctx.cfg.cache_size)\n \t\t\tprocess_cached_repolist(expand_macros(value));\n \t\telse if (ctx.cfg.project_list)\n \t\t\tscan_projects(expand_macros(value),\n@@ -355,7 +349,6 @@ static void prepare_context(void)\n {\n \tmemset(\u0026ctx, 0, sizeof(ctx));\n \tctx.cfg.agefile \u003d \u0022info/web/last-modified\u0022;\n-\tctx.cfg.nocache \u003d 0;\n \tctx.cfg.cache_size \u003d 0;\n \tctx.cfg.cache_max_create_time \u003d 5;\n \tctx.cfg.cache_root \u003d CGIT_CACHE_ROOT;\n@@ -973,8 +966,6 @@ static void cgit_parse_args(int argc, const char **argv)\n \t\t}\n \t\tif (skip_prefix(argv[i], \u0022--cache\u003d\u0022, \u0026arg)) {\n \t\t\tctx.cfg.cache_root \u003d xstrdup(arg);\n-\t\t} else if (!strcmp(argv[i], \u0022--nocache\u0022)) {\n-\t\t\tctx.cfg.nocache \u003d 1;\n \t\t} else if (!strcmp(argv[i], \u0022--nohttp\u0022)) {\n \t\t\tctx.env.no_http \u003d \u00221\u0022;\n \t\t} else if (skip_prefix(argv[i], \u0022--query\u003d\u0022, \u0026arg)) {\n@@ -1095,8 +1086,6 @@ int cmd_main(int argc, const char **argv)\n \telse\n \t\tctx.page.expires +\u003d ttl * 60;\n \tif (!ctx.env.authenticated || (ctx.env.request_method \u0026\u0026 !strcmp(ctx.env.request_method, \u0022HEAD\u0022)))\n-\t\tctx.cfg.nocache \u003d 1;\n-\tif (ctx.cfg.nocache)\n \t\tctx.cfg.cache_size \u003d 0;\n \terr \u003d cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,\n \t\t\t ctx.qry.raw, ttl, process_request);\ndiff --git a/cgit.h b/cgit.h\nindex 0798dc5..6feca68 100644\n--- a/cgit.h\n+++ b/cgit.h\n@@ -197,8 +197,6 @@ struct cgit_config {\n \tchar *footer;\n \tchar *head_include;\n \tchar *header;\n-\tchar *index_header;\n-\tchar *index_info;\n \tchar *logo;\n \tchar *logo_link;\n \tchar *mimetype_file;\n@@ -248,7 +246,6 @@ struct cgit_config {\n \tint max_repodesc_len;\n \tint max_blob_size;\n \tint max_stats;\n-\tint nocache;\n \tint noplainemail;\n \tint noheader;\n \tint renamelimit;\ndiff --git a/cgitrc.5.txt b/cgitrc.5.txt\nindex 3bfacfa..acfae91 100644\n--- a/cgitrc.5.txt\n+++ b/cgitrc.5.txt\n@@ -238,18 +238,6 @@ include::\n \tName of a configfile to include before the rest of the current config-\n \tfile is parsed. Default value: none. See also: \u0022MACRO EXPANSION\u0022.\n \n-index-header::\n-\tThe content of the file specified with this option will be included\n-\tverbatim above the repository index. This setting is deprecated, and\n-\twill not be supported by cgit-1.0 (use root-readme instead). Default\n-\tvalue: none.\n-\n-index-info::\n-\tThe content of the file specified with this option will be included\n-\tverbatim below the heading on the repository index page. This setting\n-\tis deprecated, and will not be supported by cgit-1.0 (use root-desc\n-\tinstead). Default value: none.\n-\n local-time::\n \tFlag which, if set to \u00221\u0022, makes cgit print commit and tag times in the\n \tservers timezone. Default value: \u00220\u0022.\n@@ -323,11 +311,6 @@ module-link::\n \tformatstring are the path and SHA1 of the submodule commit. Default\n \tvalue: none.\n \n-nocache::\n-\tIf set to the value \u00221\u0022 caching will be disabled. This settings is\n-\tdeprecated, and will not be honored starting with cgit-1.0. Default\n-\tvalue: \u00220\u0022.\n-\n noplainemail::\n \tIf set to \u00221\u0022 showing full author email addresses will be disabled.\n \tDefault value: \u00220\u0022.\n@@ -359,10 +342,6 @@ renamelimit::\n \t \u0022-1\u0022 uses the compiletime value in git (for further info, look at\n \t `man git-diff`). Default value: \u0022-1\u0022.\n \n-repo.group::\n-\tLegacy alias for \u0022section\u0022. This option is deprecated and will not be\n-\tsupported in cgit-1.0.\n-\n repository-sort::\n \tThe way in which repositories in each section are sorted. Valid values\n \tare \u0022name\u0022 for sorting by the repo name or \u0022age\u0022 for sorting by the\ndiff --git a/ui-repolist.c b/ui-repolist.c\nindex af52f9b..41424c0 100644\n--- a/ui-repolist.c\n+++ b/ui-repolist.c\n@@ -288,9 +288,6 @@ void cgit_print_repolist(void)\n \tcgit_print_docstart();\n \tcgit_print_pageheader();\n \n-\tif (ctx.cfg.index_header)\n-\t\thtml_include(ctx.cfg.index_header);\n-\n \tif (ctx.qry.sort)\n \t\tsorted \u003d sort_repolist(ctx.qry.sort);\n \telse if (ctx.cfg.section_sort)\ndiff --git a/ui-shared.c b/ui-shared.c\nindex e8c0723..a63dcb0 100644\n--- a/ui-shared.c\n+++ b/ui-shared.c\n@@ -977,8 +977,6 @@ static void print_header(void)\n \t} else {\n \t\tif (ctx.cfg.root_desc)\n \t\t\thtml_txt(ctx.cfg.root_desc);\n-\t\telse if (ctx.cfg.index_info)\n-\t\t\thtml_include(ctx.cfg.index_info);\n \t}\n \thtml(\u0022\u003c/td\u003e\u003c/tr\u003e\u003c/table\u003e\u005cn\u0022);\n }\n","s":{"c":1745906952,"u": 5524}} ],"g": 6887,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}