aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-12-27 13:20:15 +0100
committerLudovic Courtès <ludo@gnu.org>2019-12-27 13:52:49 +0100
commit787766ed1e7f0806a98e696830542da528f957bb (patch)
tree64eda2098fe4492103b560d3e167ac7fc02af364 /build-aux
parent785af04a7574867dc940c791daa938a2432d0450 (diff)
downloadguix-787766ed1e7f0806a98e696830542da528f957bb.tar
guix-787766ed1e7f0806a98e696830542da528f957bb.tar.gz
git-authenticate: Keep a local cache of previously-authenticated commits.
A list of already-authenticated commits is kept in ~/.cache/guix/authentication. This speeds up subsequent "make authenticate" invocations. * build-aux/git-authenticate.scm (authenticated-commit-cache-file) (previously-authenticated-commits, cache-authenticated-commit): New procedures. (git-authenticate): Define 'authenticated-commits' and pass it as a third argument to 'commit-difference'. Add call to 'cache-authenticated-commit'. Don't display signing stats when STATS is null.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/git-authenticate.scm80
1 files changed, 70 insertions, 10 deletions
diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm
index dd7029d438..ec67b589ca 100644
--- a/build-aux/git-authenticate.scm
+++ b/build-aux/git-authenticate.scm
@@ -24,6 +24,7 @@
(guix git)
(guix gnupg)
(guix utils)
+ ((guix build utils) #:select (mkdir-p))
(guix i18n)
(guix progress)
(srfi srfi-1)
@@ -31,8 +32,10 @@
(srfi srfi-26)
(srfi srfi-34)
(srfi srfi-35)
+ (rnrs io ports)
(ice-9 match)
- (ice-9 format))
+ (ice-9 format)
+ (ice-9 pretty-print))
(define %committers
@@ -297,6 +300,49 @@ each of them. Return an alist showing the number of occurrences of each key."
;;;
+;;; Caching.
+;;;
+
+(define (authenticated-commit-cache-file)
+ "Return the name of the file that contains the cache of
+previously-authenticated commits."
+ (string-append (cache-directory) "/authentication/channels/guix"))
+
+(define (previously-authenticated-commits)
+ "Return the previously-authenticated commits as a list of commit IDs (hex
+strings)."
+ (catch 'system-error
+ (lambda ()
+ (call-with-input-file (authenticated-commit-cache-file)
+ read))
+ (lambda args
+ (if (= ENOENT (system-error-errno args))
+ '()
+ (apply throw args)))))
+
+(define (cache-authenticated-commit commit-id)
+ "Record in ~/.cache COMMIT-ID and its closure as authenticated (only
+COMMIT-ID is written to cache, though)."
+ (define %max-cache-length
+ ;; Maximum number of commits in cache.
+ 200)
+
+ (let ((lst (delete-duplicates
+ (cons commit-id (previously-authenticated-commits))))
+ (file (authenticated-commit-cache-file)))
+ (mkdir-p (dirname file))
+ (with-atomic-file-output file
+ (lambda (port)
+ (let ((lst (if (> (length lst) %max-cache-length)
+ (take lst %max-cache-length) ;truncate
+ lst)))
+ (chmod port #o600)
+ (display ";; List of previously-authenticated commits.\n\n"
+ port)
+ (pretty-print lst port))))))
+
+
+;;;
;;; Entry point.
;;;
@@ -312,8 +358,19 @@ each of them. Return an alist showing the number of occurrences of each key."
(define end-commit
(commit-lookup repository (string->oid end)))
+ (define authenticated-commits
+ ;; Previously-authenticated commits that don't need to be checked
+ ;; again.
+ (filter-map (lambda (id)
+ (false-if-exception
+ (commit-lookup repository (string->oid id))))
+ (previously-authenticated-commits)))
+
(define commits
- (commit-difference end-commit start-commit))
+ ;; Commits to authenticate, excluding the closure of
+ ;; AUTHENTICATED-COMMITS.
+ (commit-difference end-commit start-commit
+ authenticated-commits))
(define reporter
(progress-reporter/bar (length commits)))
@@ -327,14 +384,17 @@ each of them. Return an alist showing the number of occurrences of each key."
(lambda (report)
(authenticate-commits repository commits
#:report-progress report)))))
- (format #t (G_ "Signing statistics:~%"))
- (for-each (match-lambda
- ((signer . count)
- (format #t " ~a ~10d~%" signer count)))
- (sort stats
- (match-lambda*
- (((_ . count1) (_ . count2))
- (> count1 count2)))))))
+ (cache-authenticated-commit (oid->string (commit-id end-commit)))
+
+ (unless (null? stats)
+ (format #t (G_ "Signing statistics:~%"))
+ (for-each (match-lambda
+ ((signer . count)
+ (format #t " ~a ~10d~%" signer count)))
+ (sort stats
+ (match-lambda*
+ (((_ . count1) (_ . count2))
+ (> count1 count2))))))))
((command start)
(let* ((head (repository-head repository))
(end (reference-target head)))