From: Oleg Pykhalov <go.wigust@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 32094@debbugs.gnu.org
Subject: [bug#32094] [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body.
Date: Tue, 10 Jul 2018 06:39:22 +0300 [thread overview]
Message-ID: <87efgbiwt1.fsf@gmail.com> (raw)
In-Reply-To: <87zhz0fp1l.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Mon, 09 Jul 2018 16:43:02 +0200")
[-- Attachment #1.1: Type: text/plain, Size: 1411 bytes --]
Hello Ludovic,
Thank you for review.
ludo@gnu.org (Ludovic Courtès) writes:
> Oleg Pykhalov <go.wigust@gmail.com> skribis:
>
>> * guix/git.scm (update-cached-checkout): Call 'url-cache-directory' in
>> 'cache-directory' key argument.
>
> ‘latest-repository-commit’ would need to be adjusted accordingly.
>
> Could you do that and make sure ‘guix pull’ still behaves the same as
> before?
When I adjusted ‘latest-repository-commit’ I thought about removing
‘url-cache-directory’ call from ‘update-cached-checkout’ instead of
moving ‘url-cache-directory’ call to ‘cache-directory’ argument.
I'm not sure it's possible to call ‘url-cache-directory’ in argument of
‘update-cached-checkout’, because ‘url-cache-directory’ requires ‘url’
argument which itself is the argument of ‘update-cached-checkout’.
(define* (url-cache-directory url
#:optional (cache-directory
(%repository-cache-directory)))
…)
(define* (update-cached-checkout url
#:key
(ref '(branch . "origin/master"))
(cache-directory
(%repository-cache-directory)))
…)
Here is an updated patch which was successfully tested with ‘guix pull’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH] git: Call 'url-cache-directory' outside --]
[-- Type: text/x-patch, Size: 2745 bytes --]
From b3466c2e8569c30a83e81598657706b3bbbbc282 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Sun, 8 Jul 2018 13:15:41 +0300
Subject: [PATCH] git: Call 'url-cache-directory' outside
'update-cached-checkout'.
* guix/git.scm (update-cached-checkout): Remove 'url-cache-directory' call.
(latest-repository-commit): Call 'url-cache-directory'.
---
guix/git.scm | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/guix/git.scm b/guix/git.scm
index 9e89cc006..297b086ad 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -122,11 +122,10 @@ to REF.
REF is pair whose key is [branch | commit | tag] and value the associated
data, respectively [<branch name> | <sha1> | <tag name>]."
(with-libgit2
- (let* ((cache-dir (url-cache-directory url cache-directory))
- (cache-exists? (openable-repository? cache-dir))
+ (let* ((cache-exists? (openable-repository? cache-directory))
(repository (if cache-exists?
- (repository-open cache-dir)
- (clone* url cache-dir))))
+ (repository-open cache-directory)
+ (clone* url cache-directory))))
;; Only fetch remote if it has not been cloned just before.
(when cache-exists?
(remote-fetch (remote-lookup repository "origin")))
@@ -138,7 +137,7 @@ data, respectively [<branch name> | <sha1> | <tag name>]."
'repository-close!)
(repository-close! repository))
- (values cache-dir (oid->string oid))))))
+ (values cache-directory (oid->string oid))))))
(define* (latest-repository-commit store url
#:key
@@ -157,12 +156,14 @@ Git repositories are kept in the cache directory specified by
(and (string=? (basename file) ".git")
(eq? 'directory (stat:type stat))))
- (let*-values (((checkout commit)
- (update-cached-checkout url
- #:ref ref
- #:cache-directory cache-directory))
- ((name)
- (url+commit->name url commit)))
+ (let*-values
+ (((checkout commit)
+ (update-cached-checkout url
+ #:ref ref
+ #:cache-directory
+ (url-cache-directory url cache-directory)))
+ ((name)
+ (url+commit->name url commit)))
(values (add-to-store store name #t "sha256" checkout
#:select? (negate dot-git?))
commit)))
--
2.18.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2018-07-10 3:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-08 10:19 [bug#32094] [PATCH] git: Call 'url-cache-directory' outside 'update-cached-checkout' body Oleg Pykhalov
2018-07-08 10:24 ` Oleg Pykhalov
2018-07-09 14:43 ` Ludovic Courtès
2018-07-10 3:39 ` Oleg Pykhalov [this message]
2018-07-11 10:01 ` Ludovic Courtès
2018-07-13 13:26 ` bug#32094: " Oleg Pykhalov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87efgbiwt1.fsf@gmail.com \
--to=go.wigust@gmail.com \
--cc=32094@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.