[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#37413] [PATCH 2/9] git: 'update-cached-checkout' avoids network acc
From: |
Ludovic Courtès |
Subject: |
[bug#37413] [PATCH 2/9] git: 'update-cached-checkout' avoids network access when unnecessary. |
Date: |
Mon, 16 Sep 2019 00:20:59 +0200 |
* guix/git.scm (reference-available?): New procedure.
(update-cached-checkout): Avoid call to 'remote-fetch' when REPOSITORY
already contains REF.
---
guix/git.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/guix/git.scm b/guix/git.scm
index de98fed40c..92a7353b5a 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -220,6 +220,21 @@ dynamic extent of EXP."
(G_ "Support for submodules is missing; \
please upgrade Guile-Git.~%"))))
+(define (reference-available? repository ref)
+ "Return true if REF, a reference such as '(commit . \"cabba9e\"), is
+definitely available in REPOSITORY, false otherwise."
+ (match ref
+ (('commit . commit)
+ (catch 'git-error
+ (lambda ()
+ (->bool (commit-lookup repository (string->oid commit))))
+ (lambda (key error . rest)
+ (if (= GIT_ENOTFOUND (git-error-code error))
+ #f
+ (apply throw key error rest)))))
+ (_
+ #f)))
+
(define* (update-cached-checkout url
#:key
(ref '(branch . "master"))
@@ -254,7 +269,8 @@ When RECURSIVE? is true, check out submodules as well, if
any."
(repository-open cache-directory)
(clone* url cache-directory))))
;; Only fetch remote if it has not been cloned just before.
- (when cache-exists?
+ (when (and cache-exists?
+ (not (reference-available? repository ref)))
(remote-fetch (remote-lookup repository "origin")))
(when recursive?
(update-submodules repository #:log-port log-port))
--
2.23.0
- [bug#37413] [PATCH 0/9] Channel news distribution mechanism, Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 1/9] pull: '--news' shows the list of channels added or removed., Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 2/9] git: 'update-cached-checkout' avoids network access when unnecessary.,
Ludovic Courtès <=
- [bug#37413] [PATCH 5/9] ui: Add 'current-message-language'., Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 7/9] pull: '-l' displays channel news., Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 6/9] pull: Display channel news., Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 3/9] git: Add 'commit-difference'., Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 8/9] Add '.guix-channel' file., Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 9/9] DRAFT etc: Add channel news file., Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 4/9] channels: Add support for a news file., Ludovic Courtès, 2019/09/15
- [bug#37413] [PATCH 0/9] Channel news distribution mechanism, Ricardo Wurmus, 2019/09/16