ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: 'update-cached-checkout' can fall back to SWH when cloning.

Browse source 
Fixes <https://issues.guix.gnu.org/44187>.
Reported by zimoun <zimon.toutoune@gmail.com>.

* guix/git.scm (GITERR_HTTP): New variable.
(clone-from-swh, clone/swh-fallback): New procedures.
(update-cached-checkout): Use 'clone/swh-fallback' instead of 'clone*'.
This commit is contained in:
Ludovic Courtès 2021-09-10 15:49:45 +02:00 committed by Ludovic Courtès
parent 6ec81c31c0
commit 05f44c2d85
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
guix/git.scm
View file

@ -34,8 +34,9 @@ (define-module (guix git)
#:use-module (guix records)
#:use-module (guix gexp)
#:use-module (guix sets)
#:use-module ((guix diagnostics) #:select (leave))
#:use-module ((guix diagnostics) #:select (leave warning))
#:use-module (guix progress)
#:autoload (guix swh) (swh-download)
#:use-module (rnrs bytevectors)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
@ -182,6 +183,13 @@ (define (make-default-fetch-options)
(lambda args
(make-fetch-options auth-method)))))
(define GITERR_HTTP
;; Guile-Git <= 0.5.2 lacks this constant.
(let ((errors (resolve-interface '(git errors))))
(if (module-defined? errors 'GITERR_HTTP)
(module-ref errors 'GITERR_HTTP)
34)))
(define (clone* url directory)
"Clone git repository at URL into DIRECTORY. Upon failure,
make sure no empty directory is left behind."
@ -344,6 +352,42 @@ (define (reference-available? repository ref)
(_
#f)))
(define (clone-from-swh url tag-or-commit output)
"Attempt to clone TAG-OR-COMMIT (a string), which originates from URL, using
a copy archived at Software Heritage."
(call-with-temporary-directory
(lambda (bare)
(and (swh-download url tag-or-commit bare
#:archive-type 'git-bare)
(let ((repository (clone* bare output)))
(remote-set-url! repository "origin" url)
repository)))))
(define (clone/swh-fallback url ref cache-directory)
"Like 'clone', but fallback to Software Heritage if the repository cannot be
found at URL."
(define (inaccessible-url-error? err)
(let ((class (git-error-class err))
(code (git-error-code err)))
(or (= class GITERR_HTTP) ;404 or similar
(= class GITERR_NET)))) ;unknown host, etc.
(catch 'git-error
(lambda ()
(clone* url cache-directory))
(lambda (key err)
(match ref
(((or 'commit 'tag-or-commit) . commit)
(if (inaccessible-url-error? err)
(or (clone-from-swh url commit cache-directory)
(begin
(warning (G_ "revision ~a of ~a \
could not be fetched from Software Heritage~%")
commit url)
(throw key err)))
(throw key err)))
(_ (throw key err))))))
(define cached-checkout-expiration
;; Return the expiration time procedure for a cached checkout.
;; TODO: Honor $GUIX_GIT_CACHE_EXPIRATION.
@ -410,7 +454,7 @@ (define canonical-ref
(let* ((cache-exists? (openable-repository? cache-directory))
(repository (if cache-exists?
(repository-open cache-directory)
(clone* url cache-directory))))
(clone/swh-fallback url ref cache-directory))))
;; Only fetch remote if it has not been cloned just before.
(when (and cache-exists?
(not (reference-available? repository ref)))