From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 65352@debbugs.gnu.org, Simon Tournier <zimon.toutoune@gmail.com>
Subject: [bug#65352] Fix time-machine and network
Date: Tue, 05 Sep 2023 16:39:28 -0400 [thread overview]
Message-ID: <87y1hkfj7j.fsf_-_@gmail.com> (raw)
In-Reply-To: <87o7iiqo6d.fsf_-_@gnu.org> ("Ludovic Courtès"'s message of "Mon, 04 Sep 2023 11:32:10 +0200")
Hi,
Ludovic Courtès <ludo@gnu.org> writes:
> Hi again,
>
> Simon Tournier <zimon.toutoune@gmail.com> skribis:
>
>> * guix/git/scm (reference-available?): Rely of the procedure resolve-reference
>> to determine if the reference belongs to the local Git checkout.
>> ---
>> guix/git.scm | 13 ++-----------
>> 1 file changed, 2 insertions(+), 11 deletions(-)
>>
>> diff --git a/guix/git.scm b/guix/git.scm
>> index dbc3b7caa7..ebe2600209 100644
>> --- a/guix/git.scm
>> +++ b/guix/git.scm
>> @@ -360,17 +360,8 @@ (define-syntax-rule (false-if-git-not-found exp)
>> (define (reference-available? repository ref)
>> "Return true if REF, a reference such as '(commit . \"cabba9e\"), is
>> definitely available in REPOSITORY, false otherwise."
>> - (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))))))
>> - (_
>> - #f)))
>> + (false-if-git-not-found
>> + (->bool (resolve-reference repository ref))))
>>
>> (define (clone-from-swh url tag-or-commit output)
>> "Attempt to clone TAG-OR-COMMIT (a string), which originates from URL, using
>>
>> base-commit: 1b2d43fe016848ea2ec16ff18cbc14340944fc4e
>
> In fact, now I recall why that procedure was written that way: it’s
> meant to say whether a given commit (and only a commit) is already in
> the checkout, meaning we don’t need to pull. By definition, it’s an
> answer that can only be given for a specific commit; we cannot tell
> whether “master” or “HEAD” is available, that wouldn’t make sense.
>
> Thus, I think we need to revert
> a789dd58656d5f7f1b8edf790d77753fc71670af, and probably add a comment
> explaining why it’s written this way.
>
> Thoughts?
I've reviewed this thread and the code, and I agree. This is a special
case. I've added a comment so we aren't tempted to use
'resolve-reference' there again.
Will install shortly.
--
Thanks,
Maxim
next prev parent reply other threads:[~2023-09-05 20:40 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1689823648.git.maxim.cournoyer@gmail.com>
2023-07-20 16:34 ` [bug#64746] [PATCH 2/2] scripts: time-machine: Error when attempting to visit too old commits Maxim Cournoyer
2023-07-22 2:00 ` Maxim Cournoyer
2023-08-08 15:58 ` Ludovic Courtès
2023-08-10 14:47 ` Maxim Cournoyer
2023-08-10 16:56 ` Ludovic Courtès
2023-08-11 7:19 ` Josselin Poiret via Guix-patches via
2023-08-12 20:32 ` Ludovic Courtès
2023-08-15 18:57 ` Maxim Cournoyer
2023-08-15 16:14 ` Ludovic Courtès
2023-08-16 14:46 ` Simon Tournier
2023-08-16 18:41 ` Maxim Cournoyer
2023-08-17 14:06 ` [bug#65352] Fix time-machine and network Simon Tournier
2023-08-17 14:09 ` [bug#65352] [PATCH 1/2] guix: git: Fix the procedure reference-available? Simon Tournier
2023-08-17 14:09 ` [bug#65352] [PATCH 2/2] scripts: pull: Remove unused reference pair Simon Tournier
2023-08-17 15:41 ` [bug#65352] Fix time-machine and network Maxim Cournoyer
2023-08-17 16:08 ` Simon Tournier
2023-08-23 2:56 ` Maxim Cournoyer
2023-08-23 8:32 ` Simon Tournier
2023-08-23 20:25 ` Maxim Cournoyer
2023-08-21 14:00 ` Ludovic Courtès
2023-08-21 15:58 ` Maxim Cournoyer
2023-08-22 16:27 ` Ludovic Courtès
2023-08-23 2:14 ` Maxim Cournoyer
2023-08-21 13:57 ` Ludovic Courtès
2023-09-04 8:49 ` Ludovic Courtès
2023-09-04 11:34 ` Simon Tournier
2023-09-05 20:33 ` Maxim Cournoyer
2023-09-05 20:48 ` Simon Tournier
2023-09-04 9:32 ` Ludovic Courtès
2023-09-04 17:37 ` Simon Tournier
2023-09-06 0:22 ` Maxim Cournoyer
2023-09-05 20:39 ` Maxim Cournoyer [this message]
2023-09-05 20:56 ` Simon Tournier
2023-09-06 2:39 ` Maxim Cournoyer
2023-09-05 13:24 ` bug#65352: " Maxim Cournoyer
2023-09-05 13:43 ` [bug#65352] " Simon Tournier
2023-09-06 0:04 ` bug#65352: " Maxim Cournoyer
2023-09-06 0:58 ` [bug#65352] " Simon Tournier
2023-09-06 2:00 ` Maxim Cournoyer
2023-09-07 11:15 ` Simon Tournier
2023-09-06 10:32 ` [bug#65352] time-machine, unavailable network or Savannah down Simon Tournier
2023-09-06 14:17 ` [bug#65352] [PATCH v2] DRAFT git: Avoid touching the network unless needed in 'reference-available?' Simon Tournier
2023-09-13 20:16 ` [bug#65352] Fix time-machine and network Ludovic Courtès
2023-09-13 0:32 ` Simon Tournier
2023-09-14 8:50 ` Ludovic Courtès
2023-09-14 9:04 ` Ludovic Courtès
2023-09-14 9:42 ` Simon Tournier
2023-09-22 13:54 ` bug#65352: " Simon Tournier
2023-09-25 9:32 ` [bug#65352] " Ludovic Courtès
2023-09-25 9:57 ` Simon Tournier
2023-09-25 11:21 ` Simon Tournier
2023-09-25 15:01 ` Ludovic Courtès
2023-09-25 15:58 ` Simon Tournier
2023-09-06 17:41 ` [bug#65352] time-machine, unavailable network or Savannah down Maxim Cournoyer
2023-09-06 23:21 ` Simon Tournier
2023-08-15 19:44 ` [bug#64746] [PATCH v2 1/3] git: Clarify commit relation reference in doc Maxim Cournoyer
2023-08-15 19:44 ` [bug#64746] [PATCH v2 2/3] pull: Tag commit argument with 'tag-or-commit Maxim Cournoyer
2023-08-16 15:02 ` Simon Tournier
2023-08-16 18:47 ` Maxim Cournoyer
2023-08-17 14:45 ` Simon Tournier
2023-08-17 18:16 ` Maxim Cournoyer
2023-08-17 18:47 ` Simon Tournier
2023-08-23 2:54 ` [bug#64746] [PATCH 2/2] scripts: time-machine: Error when attempting to visit too old commits Maxim Cournoyer
2023-08-23 8:27 ` Simon Tournier
2023-08-15 19:44 ` [bug#64746] [PATCH v2 3/3] " Maxim Cournoyer
2023-08-16 15:39 ` Simon Tournier
2023-08-17 1:41 ` bug#64746: " Maxim Cournoyer
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y1hkfj7j.fsf_-_@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=65352@debbugs.gnu.org \
--cc=ludo@gnu.org \
--cc=zimon.toutoune@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).