Merge branch 'lh/repo-scan'

diff --combined cgit.c
index ec40e1f7f5993127bb5d141d8e2292bffc1ff12d,3fcca2a2d3f31ec2ae955357018f13e775bc3bbe..bd377881f669d44634767489dfb276dce3308426
--- 1/cgit.c
--- 2/cgit.c
+++ b/cgit.c
@@@ -40,9 -40,58 +40,58 @@@ struct cgit_filter *new_filter(const ch
        return f;
  }
  
+ static void process_cached_repolist(const char *path);
+ 
+ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
+ {
+       if (!strcmp(name, "name"))
+               repo->name = xstrdup(value);
+       else if (!strcmp(name, "clone-url"))
+               repo->clone_url = xstrdup(value);
+       else if (!strcmp(name, "desc"))
+               repo->desc = xstrdup(value);
+       else if (!strcmp(name, "owner"))
+               repo->owner = xstrdup(value);
+       else if (!strcmp(name, "defbranch"))
+               repo->defbranch = xstrdup(value);
+       else if (!strcmp(name, "snapshots"))
+               repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
+       else if (!strcmp(name, "enable-log-filecount"))
+               repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
+       else if (!strcmp(name, "enable-log-linecount"))
+               repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
+       else if (!strcmp(name, "max-stats"))
+               repo->max_stats = cgit_find_stats_period(value, NULL);
+       else if (!strcmp(name, "module-link"))
+               repo->module_link= xstrdup(value);
+       else if (!strcmp(name, "section"))
+               repo->section = xstrdup(value);
+       else if (!strcmp(name, "readme") && value != NULL) {
+               if (*value == '/')
+                       ctx.repo->readme = xstrdup(value);
+               else
+                       ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
+       } else if (ctx.cfg.enable_filter_overrides) {
+               if (!strcmp(name, "about-filter"))
+                       repo->about_filter = new_filter(value, 0);
+               else if (!strcmp(name, "commit-filter"))
+                       repo->commit_filter = new_filter(value, 0);
+               else if (!strcmp(name, "source-filter"))
+                       repo->source_filter = new_filter(value, 1);
+       }
+ }
+ 
  void config_cb(const char *name, const char *value)
  {
-       if (!strcmp(name, "root-title"))
+       if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
+               ctx.cfg.section = xstrdup(value);
+       else if (!strcmp(name, "repo.url"))
+               ctx.repo = cgit_add_repo(value);
+       else if (ctx.repo && !strcmp(name, "repo.path"))
+               ctx.repo->path = trim_end(value, '/');
+       else if (ctx.repo && !prefixcmp(name, "repo."))
+               repo_config(ctx.repo, name + 5, value);
+       else if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);
        else if (!strcmp(name, "root-desc"))
                ctx.cfg.root_desc = xstrdup(value);
@@@ -80,14 -129,14 +129,16 @@@
                ctx.cfg.noheader = atoi(value);
        else if (!strcmp(name, "snapshots"))
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
+       else if (!strcmp(name, "enable-filter-overrides"))
+               ctx.cfg.enable_filter_overrides = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
                ctx.cfg.enable_index_links = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
                ctx.cfg.enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
                ctx.cfg.enable_log_linecount = atoi(value);
 +      else if (!strcmp(name, "enable-tree-linenumbers"))
 +              ctx.cfg.enable_tree_linenumbers = atoi(value);
        else if (!strcmp(name, "max-stats"))
                ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "cache-size"))
@@@ -98,6 -147,8 +149,8 @@@
                ctx.cfg.cache_root_ttl = atoi(value);
        else if (!strcmp(name, "cache-repo-ttl"))
                ctx.cfg.cache_repo_ttl = atoi(value);
+       else if (!strcmp(name, "cache-scanrc-ttl"))
+               ctx.cfg.cache_scanrc_ttl = atoi(value);
        else if (!strcmp(name, "cache-static-ttl"))
                ctx.cfg.cache_static_ttl = atoi(value);
        else if (!strcmp(name, "cache-dynamic-ttl"))
@@@ -116,6 -167,11 +169,11 @@@
                ctx.cfg.max_repo_count = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);
+       else if (!strcmp(name, "scan-path"))
+               if (!ctx.cfg.nocache && ctx.cfg.cache_size)
+                       process_cached_repolist(value);
+               else
+                       scan_tree(value, repo_config);
        else if (!strcmp(name, "source-filter"))
                ctx.cfg.source_filter = new_filter(value, 1);
        else if (!strcmp(name, "summary-log"))
@@@ -136,44 -192,7 +194,7 @@@
                ctx.cfg.local_time = atoi(value);
        else if (!prefixcmp(name, "mimetype."))
                add_mimetype(name + 9, value);
-       else if (!strcmp(name, "repo.group"))
-               ctx.cfg.repo_group = xstrdup(value);
-       else if (!strcmp(name, "repo.url"))
-               ctx.repo = cgit_add_repo(value);
-       else if (!strcmp(name, "repo.name"))
-               ctx.repo->name = xstrdup(value);
-       else if (ctx.repo && !strcmp(name, "repo.path"))
-               ctx.repo->path = trim_end(value, '/');
-       else if (ctx.repo && !strcmp(name, "repo.clone-url"))
-               ctx.repo->clone_url = xstrdup(value);
-       else if (ctx.repo && !strcmp(name, "repo.desc"))
-               ctx.repo->desc = xstrdup(value);
-       else if (ctx.repo && !strcmp(name, "repo.owner"))
-               ctx.repo->owner = xstrdup(value);
-       else if (ctx.repo && !strcmp(name, "repo.defbranch"))
-               ctx.repo->defbranch = xstrdup(value);
-       else if (ctx.repo && !strcmp(name, "repo.snapshots"))
-               ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
-       else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
-               ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
-       else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
-               ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
-       else if (ctx.repo && !strcmp(name, "repo.max-stats"))
-               ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
-       else if (ctx.repo && !strcmp(name, "repo.module-link"))
-               ctx.repo->module_link= xstrdup(value);
-       else if (ctx.repo && !strcmp(name, "repo.about-filter"))
-               ctx.repo->about_filter = new_filter(value, 0);
-       else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
-               ctx.repo->commit_filter = new_filter(value, 0);
-       else if (ctx.repo && !strcmp(name, "repo.source-filter"))
-               ctx.repo->source_filter = new_filter(value, 1);
-       else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
-               if (*value == '/')
-                       ctx.repo->readme = xstrdup(value);
-               else
-                       ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
-       } else if (!strcmp(name, "include"))
+       else if (!strcmp(name, "include"))
                parse_configfile(value, config_cb);
  }
  
@@@ -236,11 -255,11 +257,12 @@@ static void prepare_context(struct cgit
        ctx->cfg.cache_repo_ttl = 5;
        ctx->cfg.cache_root = CGIT_CACHE_ROOT;
        ctx->cfg.cache_root_ttl = 5;
+       ctx->cfg.cache_scanrc_ttl = 15;
        ctx->cfg.cache_static_ttl = -1;
        ctx->cfg.css = "/cgit.css";
        ctx->cfg.logo = "/cgit.png";
        ctx->cfg.local_time = 0;
 +      ctx->cfg.enable_tree_linenumbers = 1;
        ctx->cfg.max_repo_count = 50;
        ctx->cfg.max_commit_count = 50;
        ctx->cfg.max_lock_attempts = 5;
@@@ -253,6 -272,7 +275,7 @@@
        ctx->cfg.root_title = "Git repository browser";
        ctx->cfg.root_desc = "a fast webinterface for the git dscm";
        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
+       ctx->cfg.section = "";
        ctx->cfg.summary_branches = 10;
        ctx->cfg.summary_log = 10;
        ctx->cfg.summary_tags = 10;
@@@ -417,28 -437,151 +440,151 @@@ int cmp_repos(const void *a, const voi
        return strcmp(ra->url, rb->url);
  }
  
- void print_repo(struct cgit_repo *repo)
+ char *build_snapshot_setting(int bitmap)
+ {
+       const struct cgit_snapshot_format *f;
+       char *result = xstrdup("");
+       char *tmp;
+       int len;
+ 
+       for (f = cgit_snapshot_formats; f->suffix; f++) {
+               if (f->bit & bitmap) {
+                       tmp = result;
+                       result = xstrdup(fmt("%s%s ", tmp, f->suffix));
+                       free(tmp);
+               }
+       }
+       len = strlen(result);
+       if (len)
+               result[len - 1] = '\0';
+       return result;
+ }
+ 
+ char *get_first_line(char *txt)
+ {
+       char *t = xstrdup(txt);
+       char *p = strchr(t, '\n');
+       if (p)
+               *p = '\0';
+       return t;
+ }
+ 
+ void print_repo(FILE *f, struct cgit_repo *repo)
  {
-       printf("repo.url=%s\n", repo->url);
-       printf("repo.name=%s\n", repo->name);
-       printf("repo.path=%s\n", repo->path);
+       fprintf(f, "repo.url=%s\n", repo->url);
+       fprintf(f, "repo.name=%s\n", repo->name);
+       fprintf(f, "repo.path=%s\n", repo->path);
        if (repo->owner)
-               printf("repo.owner=%s\n", repo->owner);
-       if (repo->desc)
-               printf("repo.desc=%s\n", repo->desc);
+               fprintf(f, "repo.owner=%s\n", repo->owner);
+       if (repo->desc) {
+               char *tmp = get_first_line(repo->desc);
+               fprintf(f, "repo.desc=%s\n", tmp);
+               free(tmp);
+       }
        if (repo->readme)
-               printf("repo.readme=%s\n", repo->readme);
-       printf("\n");
+               fprintf(f, "repo.readme=%s\n", repo->readme);
+       if (repo->defbranch)
+               fprintf(f, "repo.defbranch=%s\n", repo->defbranch);
+       if (repo->module_link)
+               fprintf(f, "repo.module-link=%s\n", repo->module_link);
+       if (repo->section)
+               fprintf(f, "repo.section=%s\n", repo->section);
+       if (repo->clone_url)
+               fprintf(f, "repo.clone-url=%s\n", repo->clone_url);
+       fprintf(f, "repo.enable-log-filecount=%d\n",
+               repo->enable_log_filecount);
+       fprintf(f, "repo.enable-log-linecount=%d\n",
+               repo->enable_log_linecount);
+       if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
+               fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd);
+       if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
+               fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd);
+       if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)
+               fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd);
+       if (repo->snapshots != ctx.cfg.snapshots) {
+               char *tmp = build_snapshot_setting(repo->snapshots);
+               fprintf(f, "repo.snapshots=%s\n", tmp);
+               free(tmp);
+       }
+       if (repo->max_stats != ctx.cfg.max_stats)
+               fprintf(f, "repo.max-stats=%s\n",
+                       cgit_find_stats_periodname(repo->max_stats));
+       fprintf(f, "\n");
  }
  
- void print_repolist(struct cgit_repolist *list)
+ void print_repolist(FILE *f, struct cgit_repolist *list, int start)
  {
        int i;
  
-       for(i = 0; i < list->count; i++)
-               print_repo(&list->repos[i]);
+       for(i = start; i < list->count; i++)
+               print_repo(f, &list->repos[i]);
+ }
+ 
+ /* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc'
+  * and return 0 on success.
+  */
+ static int generate_cached_repolist(const char *path, const char *cached_rc)
+ {
+       char *locked_rc;
+       int idx;
+       FILE *f;
+ 
+       locked_rc = xstrdup(fmt("%s.lock", cached_rc));
+       f = fopen(locked_rc, "wx");
+       if (!f) {
+               /* Inform about the error unless the lockfile already existed,
+                * since that only means we've got concurrent requests.
+                */
+               if (errno != EEXIST)
+                       fprintf(stderr, "[cgit] Error opening %s: %s (%d)\n",
+                               locked_rc, strerror(errno), errno);
+               return errno;
+       }
+       idx = cgit_repolist.count;
+       scan_tree(path, repo_config);
+       print_repolist(f, &cgit_repolist, idx);
+       if (rename(locked_rc, cached_rc))
+               fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
+                       locked_rc, cached_rc, strerror(errno), errno);
+       fclose(f);
+       return 0;
  }
  
+ static void process_cached_repolist(const char *path)
+ {
+       struct stat st;
+       char *cached_rc;
+       time_t age;
+ 
+       cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root,
+               hash_str(path)));
+ 
+       if (stat(cached_rc, &st)) {
+               /* Nothing is cached, we need to scan without forking. And
+                * if we fail to generate a cached repolist, we need to
+                * invoke scan_tree manually.
+                */
+               if (generate_cached_repolist(path, cached_rc))
+                       scan_tree(path, repo_config);
+               return;
+       }
+ 
+       parse_configfile(cached_rc, config_cb);
+ 
+       /* If the cached configfile hasn't expired, lets exit now */
+       age = time(NULL) - st.st_mtime;
+       if (age <= (ctx.cfg.cache_scanrc_ttl * 60))
+               return;
+ 
+       /* The cached repolist has been parsed, but it was old. So lets
+        * rescan the specified path and generate a new cached repolist
+        * in a child-process to avoid latency for the current request.
+        */
+       if (fork())
+               return;
+ 
+       exit(generate_cached_repolist(path, cached_rc));
+ }
  
  static void cgit_parse_args(int argc, const char **argv)
  {
@@@ -475,15 -618,26 +621,26 @@@
                if (!strncmp(argv[i], "--ofs=", 6)) {
                        ctx.qry.ofs = atoi(argv[i]+6);
                }
-               if (!strncmp(argv[i], "--scan-tree=", 12)) {
+               if (!strncmp(argv[i], "--scan-tree=", 12) ||
+                   !strncmp(argv[i], "--scan-path=", 12)) {
+                       /* HACK: the global snapshot bitmask defines the
+                        * set of allowed snapshot formats, but the config
+                        * file hasn't been parsed yet so the mask is
+                        * currently 0. By setting all bits high before
+                        * scanning we make sure that any in-repo cgitrc
+                        * snapshot setting is respected by scan_tree().
+                        * BTW: we assume that there'll never be more than
+                        * 255 different snapshot formats supported by cgit...
+                        */
+                       ctx.cfg.snapshots = 0xFF;
                        scan++;
-                       scan_tree(argv[i] + 12);
+                       scan_tree(argv[i] + 12, repo_config);
                }
        }
        if (scan) {
                qsort(cgit_repolist.repos, cgit_repolist.count,
                        sizeof(struct cgit_repo), cmp_repos);
-               print_repolist(&cgit_repolist);
+               print_repolist(stdout, &cgit_repolist, 0);
                exit(0);
        }
  }

diff --combined cgit.css
index ebf33222070d7c9d932143e2a82c6c421263a56f,3c65114edb76bf8e7381328b6facd517abfecafd..c47ebc96126b8629cd6824b0d3346aaa216d48a7
--- 1/cgit.css
--- 2/cgit.css
+++ b/cgit.css
@@@ -237,16 -237,16 +237,16 @@@ table.blob 
  }
  
  table.blob td.lines {
 -      margin: 0; padding: 0;
 +      margin: 0; padding: 0 0 0 0.5em;
        vertical-align: top;
        color: black;
  }
  
  table.blob td.linenumbers {
 -      margin: 0; padding: 0;
 +      margin: 0; padding: 0 0.5em 0 0.5em;
        vertical-align: top;
 +      text-align: right;
        border-right: 1px solid gray;
 -      background-color: #eee;
  }
  
  table.blob pre {
@@@ -429,7 -429,7 +429,7 @@@ table.diff td div.del 
        text-align: right;
  }
  
- table.list td.repogroup {
+ table.list td.reposection {
        font-style: italic;
        color: #888;
  }

diff --combined cgit.h
index a20679ad012bd0ea637f328f16d70e18c5b3fac2,ef109aadf6a3ed07005d4c09bb8b2094b9247cc5..6c6c460f9d03108b17a0da008381d93c69f262cf
--- 1/cgit.h
--- 2/cgit.h
+++ b/cgit.h
@@@ -65,9 -65,9 +65,9 @@@ struct cgit_repo 
        char *desc;
        char *owner;
        char *defbranch;
-       char *group;
        char *module_link;
        char *readme;
+       char *section;
        char *clone_url;
        int snapshots;
        int enable_log_filecount;
@@@ -79,6 -79,9 +79,9 @@@
        struct cgit_filter *source_filter;
  };
  
+ typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
+             const char *value);
+ 
  struct cgit_repolist {
        int length;
        int count;
@@@ -156,24 -159,25 +159,26 @@@ struct cgit_config 
        char *logo;
        char *logo_link;
        char *module_link;
-       char *repo_group;
        char *robots;
        char *root_title;
        char *root_desc;
        char *root_readme;
        char *script_name;
+       char *section;
        char *virtual_root;
        int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;
        int cache_root_ttl;
+       int cache_scanrc_ttl;
        int cache_static_ttl;
        int embedded;
+       int enable_filter_overrides;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
 +      int enable_tree_linenumbers;
        int local_time;
        int max_repo_count;
        int max_commit_count;

diff --combined cgitrc.5.txt
index 3b16db96c0c2808d2a7d291c76defcf9142f5a3b,617b7c39a03aaa7a5bc355fc05e2ea2be1d2bf5c..4dc383de410b3f6d4cd229c870bdf920fbc8286d
--- 1/cgitrc.5.txt
--- 2/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@@ -54,6 -54,10 +54,10 @@@ cache-root-ttl:
        Number which specifies the time-to-live, in minutes, for the cached
        version of the repository index page. Default value: "5".
  
+ cache-scanrc-ttl::
+       Number which specifies the time-to-live, in minutes, for the result
+       of scanning a path for git repositories. Default value: "15".
+ 
  cache-size::
        The maximum number of entries in the cgit cache. Default value: "0"
        (i.e. caching is disabled).
@@@ -84,6 -88,10 +88,10 @@@ embedded:
        suitable for embedding in other html pages. Default value: none. See
        also: "noheader".
        
+ enable-filter-overrides::
+       Flag which, when set to "1", allows all filter settings to be
+       overridden in repository-specific cgitrc files. Default value: none.
+ 
  enable-index-links::
        Flag which, when set to "1", will make cgit generate extra links for
        each repo in the repository index (specifically, to the "summary",
@@@ -99,10 -107,6 +107,10 @@@ enable-log-linecount:
        and removed lines for each commit on the repository log page. Default
        value: "0".
  
 +enable-tree-linenumbers::
 +      Flag which, when set to "1", will make cgit generate linenumber links
 +      for plaintext blobs printed in the tree view. Default value: "1".
 +
  favicon::
        Url used as link to a shortcut icon for cgit. If specified, it is
        suggested to use the value "/favicon.ico" since certain browsers will
@@@ -200,8 -204,8 +208,8 @@@ renamelimit:
          `man git-diff`). Default value: "-1".
  
  repo.group::
-       A value for the current repository group, which all repositories
-       specified after this setting will inherit. Default value: none.
+       Legacy alias for "section". This option is deprecated and will not be
+       supported in cgit-1.0.
  
  robots::
        Text used as content for the "robots" meta-tag. Default value:
@@@ -220,6 -224,16 +228,16 @@@ root-title:
        Text printed as heading on the repository index page. Default value:
        "Git Repository Browser".
  
+ scan-path::
+       A path which will be scanned for repositories. If caching is enabled,
+       the result will be cached as a cgitrc include-file in the cache
+       directory. Default value: none. See also: cache-scanrc-ttl.
+ 
+ section::
+       The name of the current repository section - all repositories defined
+       after this option will inherit the current section name. Default value:
+       none.
+ 
  snapshots::
        Text which specifies the default set of snapshot formats generated by
        cgit. The value is a space-separated list of zero or more of the
@@@ -256,14 -270,16 +274,16 @@@ virtual-root:
  REPOSITORY SETTINGS
  -------------------
  repo.about-filter::
-       Override the default about-filter. Default value: <about-filter>.
+       Override the default about-filter. Default value: none. See also:
+       "enable-filter-overrides".
  
  repo.clone-url::
        A list of space-separated urls which can be used to clone this repo.
        Default value: none.
  
  repo.commit-filter::
-       Override the default commit-filter. Default value: <commit-filter>.
+       Override the default commit-filter. Default value: none. See also:
+       "enable-filter-overrides".
  
  repo.defbranch::
        The name of the default branch for this repository. If no such branch
@@@ -305,14 -321,32 +325,32 @@@ repo.snapshots:
        A mask of allowed snapshot-formats for this repo, restricted by the
        "snapshots" global setting. Default value: <snapshots>.
  
+ repo.section::
+       Override the current section name for this repository. Default value:
+       none.
+ 
  repo.source-filter::
-       Override the default source-filter. Default value: <source-filter>.
+       Override the default source-filter. Default value: none. See also:
+       "enable-filter-overrides".
  
  repo.url::
        The relative url used to access the repository. This must be the first
        setting specified for each repo. Default value: none.
  
  
+ REPOSITORY-SPECIFIC CGITRC FILE
+ -------------------------------
+ When the option "scan-path" is used to auto-discover git repositories, cgit
+ will try to parse the file "cgitrc" within any found repository. Such a
+ repo-specific config file may contain any of the repo-specific options
+ described above, except "repo.url" and "repo.path". Additionally, the "filter"
+ options are only acknowledged in repo-specific config files when
+ "enable-filter-overrides" is set to "1".
+ 
+ Note: the "repo." prefix is dropped from the option names in repo-specific
+ config files, e.g. "repo.desc" becomes "desc".
+ 
+ 
  EXAMPLE CGITRC FILE
  -------------------