me
/
guix
Archived
1
0
Fork 0
Code

swh: Support downloads of bare Git repositories. 

* guix/swh.scm (swh-download-archive): New procedure.
(swh-download-directory): Rewrite in terms of 'swh-download-archive'.
(swh-download): Add #:archive-type and honor it.  Use
'swh-download-archive' instead of 'swh-download-directory'.
master
Ludovic Courtès 2021-09-10 15:01:59 +02:00 committed by Ludovic Courtès
parent 281ede2e7d
commit 6ec81c31c0
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
guix/swh.scm
View File

@ -645,20 +645,29 @@ delete it when leaving the dynamic extent of this call."
(lambda () (lambda ()
(false-if-exception (delete-file-recursively tmp-dir)))))) (false-if-exception (delete-file-recursively tmp-dir))))))
(define* (swh-download-directory id output (define* (swh-download-archive swhid output
#:key (log-port (current-error-port))) #:key
"Download from Software Heritage the directory with the given ID, and (archive-type 'flat)
unpack it to OUTPUT. Return #t on success and #f on failure" (log-port (current-error-port)))
"Download from Software Heritage the directory or revision with the given
SWID, in the ARCHIVE-TYPE format (one of 'flat or 'git-bare), and unpack it to
OUTPUT. Return #t on success and #f on failure."
(call-with-temporary-directory (call-with-temporary-directory
(lambda (directory) (lambda (directory)
(match (vault-fetch id 'directory #:log-port log-port) (match (vault-fetch swhid
#:archive-type archive-type
#:log-port log-port)
(#f (#f
(format log-port (format log-port
"SWH: directory ~a could not be fetched from the vault~%" "SWH: object ~a could not be fetched from the vault~%"
id) swhid)
#f) #f)
((? port? input) ((? port? input)
(let ((tar (open-pipe* OPEN_WRITE "tar" "-C" directory "-xzvf" "-"))) (let ((tar (open-pipe* OPEN_WRITE "tar" "-C" directory
(match archive-type
('flat "-xzvf") ;gzipped
('git-bare "-xvf")) ;uncompressed
"-")))
(dump-port input tar) (dump-port input tar)
(close-port input) (close-port input)
(let ((status (close-pipe tar))) (let ((status (close-pipe tar)))
@ -672,6 +681,14 @@ unpack it to OUTPUT. Return #t on success and #f on failure"
#:log (%make-void-port "w")) #:log (%make-void-port "w"))
#t)))))))) #t))))))))
(define* (swh-download-directory id output
#:key (log-port (current-error-port)))
"Download from Software Heritage the directory with the given ID, and
unpack it to OUTPUT. Return #t on success and #f on failure."
(swh-download-archive (string-append "swh:1:dir:" id) output
#:archive-type 'flat
#:log-port log-port))
(define (commit-id? reference) (define (commit-id? reference)
"Return true if REFERENCE is likely a commit ID, false otherwise---e.g., if "Return true if REFERENCE is likely a commit ID, false otherwise---e.g., if
it is a tag name. This is based on a simple heuristic so use with care!" it is a tag name. This is based on a simple heuristic so use with care!"
@ -679,8 +696,11 @@ it is a tag name. This is based on a simple heuristic so use with care!"
(string-every char-set:hex-digit reference))) (string-every char-set:hex-digit reference)))
(define* (swh-download url reference output (define* (swh-download url reference output
#:key (log-port (current-error-port))) #:key
"Download from Software Heritage a checkout of the Git tag or commit (archive-type 'flat)
(log-port (current-error-port)))
"Download from Software Heritage a checkout (if ARCHIVE-TYPE is 'flat) or a
full Git repository (if ARCHIVE-TYPE is 'git-bare) of the Git tag or commit
REFERENCE originating from URL, and unpack it in OUTPUT. Return #t on success REFERENCE originating from URL, and unpack it in OUTPUT. Return #t on success
and #f on failure. and #f on failure.
@ -694,8 +714,16 @@ wait until it becomes available, which could take several minutes."
(format log-port "SWH: found revision ~a with directory at '~a'~%" (format log-port "SWH: found revision ~a with directory at '~a'~%"
(revision-id revision) (revision-id revision)
(swh-url (revision-directory-url revision))) (swh-url (revision-directory-url revision)))
(swh-download-directory (revision-directory revision) output (swh-download-archive (match archive-type
#:log-port log-port)) ('flat
(string-append
"swh:1:dir:" (revision-directory revision)))
('git-bare
(string-append
"swh:1:rev:" (revision-id revision))))
output
#:archive-type archive-type
#:log-port log-port))
(#f (#f
(format log-port (format log-port
"SWH: revision ~s originating from ~a could not be found~%" "SWH: revision ~s originating from ~a could not be found~%"