aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jason A. Donenfeld <Jason@zx2c4.com>2012-10-17 06:32:40 (JST)
committerGravatar Jason A. Donenfeld <Jason@zx2c4.com>2012-10-17 06:32:53 (JST)
commitfdfb6a6d802d6b91061296eda9848d5819760d01 (patch)
treea0da4493009a4db6339f72e9d397f7bd2f81b8ad
parent8f40be229cf8ac7ecbf5e03e11098bad8e82e7e5 (diff)
downloadcgit-fdfb6a6d802d6b91061296eda9848d5819760d01.zip
cgit-fdfb6a6d802d6b91061296eda9848d5819760d01.tar.gz
ui-repolist: Rename section-sort to repository-sort.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--cgit.c6
-rw-r--r--cgit.h2
-rw-r--r--cgitrc.5.txt4
-rw-r--r--ui-repolist.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/cgit.c b/cgit.c
index 3299936..a8dda23 100644
--- a/cgit.c
+++ b/cgit.c
@@ -233,8 +233,8 @@ void config_cb(const char *name, const char *value)
233 ctx.cfg.scan_hidden_path = atoi(value); 233 ctx.cfg.scan_hidden_path = atoi(value);
234 else if (!strcmp(name, "section-from-path")) 234 else if (!strcmp(name, "section-from-path"))
235 ctx.cfg.section_from_path = atoi(value); 235 ctx.cfg.section_from_path = atoi(value);
236 else if (!strcmp(name, "section-sort")) 236 else if (!strcmp(name, "repository-sort"))
237 ctx.cfg.section_sort = xstrdup(value); 237 ctx.cfg.repository_sort = xstrdup(value);
238 else if (!strcmp(name, "source-filter")) 238 else if (!strcmp(name, "source-filter"))
239 ctx.cfg.source_filter = new_filter(value, SOURCE); 239 ctx.cfg.source_filter = new_filter(value, SOURCE);
240 else if (!strcmp(name, "summary-log")) 240 else if (!strcmp(name, "summary-log"))
@@ -364,7 +364,7 @@ static void prepare_context(struct cgit_context *ctx)
364 ctx->cfg.scan_hidden_path = 0; 364 ctx->cfg.scan_hidden_path = 0;
365 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 365 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
366 ctx->cfg.section = ""; 366 ctx->cfg.section = "";
367 ctx->cfg.section_sort = "name"; 367 ctx->cfg.repository_sort = "name";
368 ctx->cfg.summary_branches = 10; 368 ctx->cfg.summary_branches = 10;
369 ctx->cfg.summary_log = 10; 369 ctx->cfg.summary_log = 10;
370 ctx->cfg.summary_tags = 10; 370 ctx->cfg.summary_tags = 10;
diff --git a/cgit.h b/cgit.h
index 79ba7ad..8846e88 100644
--- a/cgit.h
+++ b/cgit.h
@@ -187,7 +187,7 @@ struct cgit_config {
187 char *root_readme; 187 char *root_readme;
188 char *script_name; 188 char *script_name;
189 char *section; 189 char *section;
190 char *section_sort; 190 char *repository_sort;
191 char *virtual_root; 191 char *virtual_root;
192 char *strict_export; 192 char *strict_export;
193 int cache_size; 193 int cache_size;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 902fff3..7e1a93a 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -72,7 +72,7 @@ cache-static-ttl::
72 72
73case-sensitive-sort:: 73case-sensitive-sort::
74 Sort items in the repo list case sensitively. Default value: "1". 74 Sort items in the repo list case sensitively. Default value: "1".
75 See also: section-sort. 75 See also: repository-sort.
76 76
77clone-prefix:: 77clone-prefix::
78 Space-separated list of common prefixes which, when combined with a 78 Space-separated list of common prefixes which, when combined with a
@@ -337,7 +337,7 @@ section::
337 after this option will inherit the current section name. Default value: 337 after this option will inherit the current section name. Default value:
338 none. 338 none.
339 339
340section-sort:: 340repository-sort::
341 The way in which repositories in each section are sorted. Valid values 341 The way in which repositories in each section are sorted. Valid values
342 are "name" for sorting by the repo name or "age" for sorting by the 342 are "name" for sorting by the repo name or "age" for sorting by the
343 most recently updated repository. Default value: "name". See also: 343 most recently updated repository. Default value: "name". See also:
diff --git a/ui-repolist.c b/ui-repolist.c
index 7e7f1fb..c774632 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -160,7 +160,7 @@ static int sort_section(const void *a, const void *b)
160 160
161 result = cmp(r1->section, r2->section); 161 result = cmp(r1->section, r2->section);
162 if (!result) { 162 if (!result) {
163 if (!strcmp(ctx.cfg.section_sort, "age")) { 163 if (!strcmp(ctx.cfg.repository_sort, "age")) {
164 // get_repo_modtime caches the value in r->mtime, so we don't 164 // get_repo_modtime caches the value in r->mtime, so we don't
165 // have to worry about inefficiencies here. 165 // have to worry about inefficiencies here.
166 if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t)) 166 if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t))