services: cgit: Disable repo booleans having a global counterpart.

Otherwise the global counterpart is never taken into account.

* doc/guix.texi (Version Control Services): Update accordingly.
* gnu/services/cgit.scm (repo-boolean?, serialize-repo-boolean): Use the
DEFINE-MAYBE macro to allow for the 'disabled value.
(repository-cgit-configuration)[enable-commit-graph?, enable-log-filecount?,
enable-log-linecount?, enable-remote-branches?, enable-subject-links?,
enable-html-serving?]: Change default value to 'disabled.
This commit is contained in:
Clément Lassieur 2018-08-12 21:19:38 +02:00
parent 162c8ab82e
commit efb22b47db
No known key found for this signature in database
GPG key ID: 89F96D4808F359C7
2 changed files with 19 additions and 18 deletions

View file

@ -20061,51 +20061,51 @@ Defaults to @samp{""}.
@end deftypevr @end deftypevr
@deftypevr {@code{repository-cgit-configuration} parameter} repo-boolean enable-commit-graph? @deftypevr {@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-commit-graph?
A flag which can be used to disable the global setting A flag which can be used to disable the global setting
@code{enable-commit-graph?}. @code{enable-commit-graph?}.
Defaults to @samp{#f}. Defaults to @samp{disabled}.
@end deftypevr @end deftypevr
@deftypevr {@code{repository-cgit-configuration} parameter} repo-boolean enable-log-filecount? @deftypevr {@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-filecount?
A flag which can be used to disable the global setting A flag which can be used to disable the global setting
@code{enable-log-filecount?}. @code{enable-log-filecount?}.
Defaults to @samp{#f}. Defaults to @samp{disabled}.
@end deftypevr @end deftypevr
@deftypevr {@code{repository-cgit-configuration} parameter} repo-boolean enable-log-linecount? @deftypevr {@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-linecount?
A flag which can be used to disable the global setting A flag which can be used to disable the global setting
@code{enable-log-linecount?}. @code{enable-log-linecount?}.
Defaults to @samp{#f}. Defaults to @samp{disabled}.
@end deftypevr @end deftypevr
@deftypevr {@code{repository-cgit-configuration} parameter} repo-boolean enable-remote-branches? @deftypevr {@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-remote-branches?
Flag which, when set to @code{#t}, will make cgit display remote Flag which, when set to @code{#t}, will make cgit display remote
branches in the summary and refs views. branches in the summary and refs views.
Defaults to @samp{#f}. Defaults to @samp{disabled}.
@end deftypevr @end deftypevr
@deftypevr {@code{repository-cgit-configuration} parameter} repo-boolean enable-subject-links? @deftypevr {@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-subject-links?
A flag which can be used to override the global setting A flag which can be used to override the global setting
@code{enable-subject-links?}. @code{enable-subject-links?}.
Defaults to @samp{#f}. Defaults to @samp{disabled}.
@end deftypevr @end deftypevr
@deftypevr {@code{repository-cgit-configuration} parameter} repo-boolean enable-html-serving? @deftypevr {@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-html-serving?
A flag which can be used to override the global setting A flag which can be used to override the global setting
@code{enable-html-serving?}. @code{enable-html-serving?}.
Defaults to @samp{#f}. Defaults to @samp{disabled}.
@end deftypevr @end deftypevr

View file

@ -149,6 +149,7 @@ (define (serialize-repo-integer field-name val)
(define (serialize-repo-boolean field-name val) (define (serialize-repo-boolean field-name val)
(serialize-repo-integer field-name (if val 1 0))) (serialize-repo-integer field-name (if val 1 0)))
(define-maybe repo-boolean)
(define repo-list? list?) (define repo-list? list?)
@ -239,27 +240,27 @@ (define-configuration repository-cgit-configuration
(repo-file-object "") (repo-file-object "")
"Override the default @code{email-filter}.") "Override the default @code{email-filter}.")
(enable-commit-graph? (enable-commit-graph?
(repo-boolean #f) (maybe-repo-boolean 'disabled)
"A flag which can be used to disable the global setting "A flag which can be used to disable the global setting
@code{enable-commit-graph?}.") @code{enable-commit-graph?}.")
(enable-log-filecount? (enable-log-filecount?
(repo-boolean #f) (maybe-repo-boolean 'disabled)
"A flag which can be used to disable the global setting "A flag which can be used to disable the global setting
@code{enable-log-filecount?}.") @code{enable-log-filecount?}.")
(enable-log-linecount? (enable-log-linecount?
(repo-boolean #f) (maybe-repo-boolean 'disabled)
"A flag which can be used to disable the global setting "A flag which can be used to disable the global setting
@code{enable-log-linecount?}.") @code{enable-log-linecount?}.")
(enable-remote-branches? (enable-remote-branches?
(repo-boolean #f) (maybe-repo-boolean 'disabled)
"Flag which, when set to @code{#t}, will make cgit display remote "Flag which, when set to @code{#t}, will make cgit display remote
branches in the summary and refs views.") branches in the summary and refs views.")
(enable-subject-links? (enable-subject-links?
(repo-boolean #f) (maybe-repo-boolean 'disabled)
"A flag which can be used to override the global setting "A flag which can be used to override the global setting
@code{enable-subject-links?}.") @code{enable-subject-links?}.")
(enable-html-serving? (enable-html-serving?
(repo-boolean #f) (maybe-repo-boolean 'disabled)
"A flag which can be used to override the global setting "A flag which can be used to override the global setting
@code{enable-html-serving?}.") @code{enable-html-serving?}.")
(hide? (hide?