TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: Avoid touching the network unless needed in 'reference-available?'. 

Follow-up of 756e336fa0 fixing the issue.

* guix/git/scm (reference-available?): Address case by case to determine
whether the reference exists in the local Git checkout.
This commit is contained in:
Simon Tournier 2023-09-06 15:01:00 +02:00
parent f45c0c8228
commit 6d33c1f806
No known key found for this signature in database
GPG Key ID: 92F1D22C608EE7E5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
guix/git.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -360,21 +361,16 @@ dynamic extent of EXP."
(define (reference-available? repository ref)
"Return true if REF, a reference such as '(commit . \"cabba9e\"), is
definitely available in REPOSITORY, false otherwise."
;; Note: this must not rely on 'resolve-reference', as that procedure always
;; resolves the references for branch names such as master. The semantic we
;; want here is that unless the reference is exact (e.g. a commit), the
;; reference should not be considered available, as it could have changed on
;; the remote.
(match ref
((or ('commit . commit)
('tag-or-commit . (? commit-id? commit)))
(let ((len (string-length commit))
(oid (string->oid commit)))
(false-if-git-not-found
(->bool (if (< len 40)
(object-lookup-prefix repository oid len OBJ-COMMIT)
(commit-lookup repository oid))))))
(('commit . (? commit-id? commit))
(let ((oid (string->oid commit)))
(->bool (commit-lookup repository oid))))
((or ('tag . str)
('tag-or-commit . str))
(false-if-git-not-found
(->bool (resolve-reference repository ref))))
(_
;; For the others REF as branch or symref, the REF cannot be available
#f)))
(define (clone-from-swh url tag-or-commit output)