;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by ;;; the Free Software Foundation; either version 3 of the License, or (at ;;; your option) any later version. ;;; ;;; GNU Guix is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;;; GNU General Public License for more details. ;;; ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . ;;; ;;; Validate 'etc/news.scm'. ;;; (use-modules (git) (guix git) (guix ui) (guix channels) (srfi srfi-26) (ice-9 match)) ;; XXX: These two things are currently private. (define read-channel-news (@@ (guix channels) read-channel-news)) (define channel-news-entries (cut struct-ref <> 0)) (define (all-the-news directory) "Return the read from DIRECTORY, a checkout of the 'guix' channel." (call-with-input-file (string-append directory "/etc/news.scm") read-channel-news)) (define (validate-texinfo str type language) "Parse STR as a Texinfo fragment and raise an error if that fails." (catch #t (lambda () (texi->plain-text str)) (lambda (key . args) (print-exception (current-error-port) #f key args) (report-error (G_ "the Texinfo snippet below is invalid (~a, ~a):~%") type language) (display str (current-error-port)) (exit 1)))) (define (validate-news-entry repository entry) "Validate ENTRY, a , making sure it refers to an existent commit of REPOSITORY and contains only valid Texinfo." (catch 'git-error (lambda () (let ((commit (commit-lookup repository (string->oid (channel-news-entry-commit entry))))) (for-each (match-lambda ((language . title) (validate-texinfo title 'title language))) (channel-news-entry-title entry)) (for-each (match-lambda ((language . body) (validate-texinfo body 'body language))) (channel-news-entry-body entry)))) (lambda (key error . rest) (if (= GIT_ENOTFOUND (git-error-code error)) (leave (G_ "commit '~a' of entry '~a' does not exist~%") (channel-news-entry-commit entry) (channel-news-entry-title entry)) (apply throw key error rest))))) (let* ((this-directory (dirname (current-filename))) (top-directory (string-append this-directory "/..")) (entries (channel-news-entries (all-the-news top-directory)))) (with-repository top-directory repository (for-each (cut validate-news-entry repository <>) entries) (info (G_ "All ~a channel news entries are valid.~%") (length entries)))) with-temporary-git-worktree): Renamed from 'with-temporary-git-worktree'. Update doc. Do not change directory implicitly. Define as a procedure, not a syntax. (keep-source-in-store): New procedure. (main): Adjust to use with call-with-temporary-git-worktree. Add the sources to the store when GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT is set. Exit gracefully when FIND-ORIGIN-REMOTE returns #f. (%savannah-guix-git-repo-push-url-regexp): Adjust match for a potential colon separator. * Makefile.am (GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT): Adjust. * .dir-locals.el (scheme-mode): Remove entry for with-temporary-git-worktree. * doc/contributing.texi (Updating the Guix Package): Update doc. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Maxim Cournoyer 2020-10-25maint: update-guix-package: Include the git.sv.gnu.org alias....* build-aux/update-guix-package.scm (%savannah-guix-git-repo-push-url): Rename to... (%savannah-guix-git-repo-push-url-regexp): ...this. Add the 'sv' alternative to 'savannah' and the (push) suffix in the URL regexp. (find-origin-remote): Adjust accordingly. Reported-by: Ludovic Courtès <ludo@gnu.org> Maxim Cournoyer 2020-10-19maint: update-guix-package: Prevent accidentally breaking guix pull....Fixes <https://issues.guix.gnu.org/43893>. This changes the 'update-guix-package' tool so that it: 1. Always uses a clean checkout to compute the hash of the updated 'guix' package. 2. Ensures the commit used in the updated 'guix' package definition has already been pushed upstream. * build-aux/update-guix-package.scm (%savannah-guix-git-repo-push-url): New variable. (with-input-pipe-to-string, with-temporary-git-worktree): New syntaxes. (find-origin-remote, git-add-worktree): New procedures. (commit-already-pushed?): New predicate. (main): Check the commit used has already been pushed upstream and compute the hash from a clean checkout. * doc/contributing.texi (Updating the Guix Package): Document it. * .dir-locals.el (scheme-mode): Fix indentation of with-temporary-git-worktree. Maxim Cournoyer 2020-05-28update-guix-package: Use 'origin-hash'....* gnu/packages/package-management.scm (main): Use 'origin-hash' instead of 'origin-sha256'. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr> Vincent Legoll