grim/hgkeeper

Remove support of "site.hgrc"

10 months ago, aklitzing
569f24e54a4a
Parents 337882c91d45
Children 8b619d8adf66
Remove support of "site.hgrc"

Since we bump the major version we can remove deprecated stuff.

Reviewed at https://reviews.imfreedom.org/r/2498/
3 files changed, 2 insertions(+), 17 deletions(-)
  • +0 -5
    hg/hg.go
  • +0 -1
    hgweb/hgweb.go
  • +2 -11
    setup/resources/README.md
    • --- a/hg/hg.go Tue Jul 04 00:11:52 2023 -0500
    +++ b/hg/hg.go Fri Jul 07 22:28:04 2023 -0500
    @@ -10,8 +10,6 @@
    "sync"
    "go.uber.org/zap"
    -
    - "keep.imfreedom.org/grim/hgkeeper/access"
    )
    var (
    @@ -50,9 +48,6 @@
    // add the hgrc that controls writability
    rcs = append(rcs, c.tmpHgrc)
    - // site.hgrc is deprecated, but we still support it for now
    - rcs = append(rcs, filepath.Join(access.AdminRepoPath(), "site.hgrc"))
    -
    // add the repo specific hgrc's
    rcs = append(rcs, findHgrcsForRepo(repoName)...)
    --- a/hgweb/hgweb.go Tue Jul 04 00:11:52 2023 -0500
    +++ b/hgweb/hgweb.go Fri Jul 07 22:28:04 2023 -0500
    @@ -38,7 +38,6 @@
    t := template.Must(template.New("hgweb-config").Parse(string(contents)))
    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"),
    }
    --- a/setup/resources/README.md Tue Jul 04 00:11:52 2023 -0500
    +++ b/setup/resources/README.md Fri Jul 07 22:28:04 2023 -0500
    @@ -36,8 +36,8 @@
    config/grim/hgkeeper/hgrc
    ```
    -The top-level `config/hgrc` replaces the now deprecated `site.hgrc` mentioned
    -below. It enables
    +The top-level `config/hgrc` replaces the removed `site.hgrc`.
    +It enables
    [Evolve](https://www.mercurial-scm.org/wiki/EvolveExtension), makes all
    repositories non-publishing, and includes a `config/local.hgrc` file which
    users should customizing instead of `config/hgrc` as that file will be
    @@ -57,15 +57,6 @@
    `config/grim/hgkeeper/hgrc` is evaluated last while leaving repository
    `grim/hgkeeper-dev` as non-publishing.
    -# site.hgrc
    -
    -This file is deprecated but still supported for legacy reasons. In the future
    -use `config/hgrc` as the default hgrc for file all hosted repositories.
    -
    -This file is a sitewide `hgrc` file that will be used for every repository on
    -your site. It defaults to enabling evolve from pypi and makes all
    -repositories non-publishing.
    -
    # model.conf
    This file is part of the authentication system and more information can be read