grim/hgkeeper

Add the global hgrc path to hgweb

2020-11-13, Gary Kramlich
37b0575030fb
Parents 4c9cc0c56dff
Children a3894522a8c0
Add the global hgrc path to hgweb
2 files changed, 2 insertions(+), 1 deletions(-)
  • +1 -1
    hgweb/files/hgweb.config
  • +1 -0
    hgweb/hgweb.go
    • --- a/hgweb/files/hgweb.config Fri Nov 13 20:54:08 2020 -0600
    +++ b/hgweb/files/hgweb.config Fri Nov 13 20:56:05 2020 -0600
    @@ -5,4 +5,4 @@
    # include the site config last as it should override everything
    %include {{.SITE_HGRC}}
    -
    +%include {{.GLOBAL_HGRC}}
    --- a/hgweb/hgweb.go Fri Nov 13 20:54:08 2020 -0600
    +++ b/hgweb/hgweb.go Fri Nov 13 20:56:05 2020 -0600
    @@ -46,6 +46,7 @@
    data := map[string]string{
    "HGWEB_ACCESS_CONFIG": access.HgwebConfigPath(),
    "SITE_HGRC": filepath.Join(access.AdminRepoPath(), "site.hgrc"),
    + "GLOBAL_HGRC": filepath.Join(access.AdminRepoPath(), "config/hgrc"),
    }
    if err := t.Execute(configPath, data); err != nil {