[bug#74552] [PATCH 0/3] Small changes for running qa-frontpage locally

[bug#74552] [PATCH 0/3] Small changes for running qa-frontpage locally

[Noé Lopez via Guix-patches via]

From: Noé Lopez <noelopez@free.fr>

Hi,

While trying out qa-frontpage locally, I had the occasion to make some
trivial changes:

– Changed references for guix environment to guix shell
– Changed the remote url for guix-patches to not require authentication
– Abstracted git fetch invocations into a function.  This was
  originally intended for further changes but I suppose it can’t hurt.

Have a good day,
Noé Lopez

Noé Lopez (3):
  Update references to guix environment
  Abstract git fetch invocations into fetch-remote! function
  Use https protocol for the guix-patches remote

 README.org                                  |  2 +-
 guix-dev.scm                                |  2 +-
 guix-qa-frontpage/git-repository.scm        | 14 ++++++++++----
 guix-qa-frontpage/manage-patch-branches.scm |  6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)


base-commit: d3e526bf8a8b2723fdfd26d14c9959a060ba523b
-- 
2.46.0

[bug#74552] [PATCH 1/3] Update references to guix environment

[Noé Lopez via Guix-patches via]

From: Noé Lopez <noelopez@free.fr>

---
 README.org   | 2 +-
 guix-dev.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.org b/README.org
index abb0858..377f549 100644
--- a/README.org
+++ b/README.org
@@ -9,7 +9,7 @@ Guix, like packages for example.
 Use the guix-dev.scm file to provide the dependencies.
 
 #+BEGIN_SRC shell
-guix environment -l guix-dev.scm
+guix shell -D --file=guix-dev.scm
 #+END_SRC
 
 Then run the following commands:
diff --git a/guix-dev.scm b/guix-dev.scm
index e820570..f32a449 100644
--- a/guix-dev.scm
+++ b/guix-dev.scm
@@ -21,7 +21,7 @@
 ;;; Run the following command to enter a development environment for
 ;;; the guix-qa-frontpage:
 ;;;
-;;;  $ guix environment -l guix-dev.scm
+;;;  $ guix shell -D --file=guix-dev.scm
 
 (use-modules ((guix licenses) #:prefix license:)
              (guix packages)
-- 
2.46.0

[bug#74552] [PATCH 2/3] Abstract git fetch invocations into fetch-remote! function

[Noé Lopez via Guix-patches via]

From: Noé Lopez <noelopez@free.fr>

---
 guix-qa-frontpage/git-repository.scm        | 12 +++++++++---
 guix-qa-frontpage/manage-patch-branches.scm |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/guix-qa-frontpage/git-repository.scm b/guix-qa-frontpage/git-repository.scm
index 2140c1e..0d31fe6 100644
--- a/guix-qa-frontpage/git-repository.scm
+++ b/guix-qa-frontpage/git-repository.scm
@@ -16,6 +16,7 @@
   #:export (%git-repository-location
 
             ensure-repository-exists!
+	    fetch-remote!
             update-repository!
             with-bare-git-repository
             with-git-worktree
@@ -55,13 +56,18 @@
           (invoke "git" "config" "user.name" "Guix Patches Tester")
           (invoke "git" "config" "user.email" "")))))))
 
+(define* (fetch-remote! remote #:rest additional-args)
+  (let ((args `("git" "fetch" "--prune"
+		,@additional-args ,remote)))
+    (apply invoke args)))
+
 (define (update-repository!)
   (with-bare-git-repository
    (lambda ()
      (invoke "git" "prune")
-     (invoke "git" "fetch" "--prune" "origin")
-     (invoke "git" "fetch" "--prune" "patches")
-     (invoke "git" "fetch" "--force" "--tags" "patches"))))
+     (fetch-remote! "origin")
+     (fetch-remote! "patches")
+     (fetch-remote! "patches" "--force" "--tags"))))
 
 (define (with-bare-git-repository thunk)
   (ensure-repository-exists!)
diff --git a/guix-qa-frontpage/manage-patch-branches.scm b/guix-qa-frontpage/manage-patch-branches.scm
index fc389e1..b725113 100644
--- a/guix-qa-frontpage/manage-patch-branches.scm
+++ b/guix-qa-frontpage/manage-patch-branches.scm
@@ -64,7 +64,7 @@
 
   (with-bare-git-repository
    (lambda ()
-     (run "git" "fetch" "--prune" "patches")
+     (fetch-remote! "origin")
 
      (let ((pipe (open-pipe* OPEN_READ
                              "git" "ls-remote" "--heads" "patches")))
@@ -142,7 +142,7 @@
           latest-processed-master-revision
           (with-bare-git-repository
            (lambda ()
-             (invoke "git" "fetch" "--prune" "origin")
+             (fetch-remote! "origin")
              (invoke-read-line "git" "show-ref" "--hash"
                                (string-append "origin/" branch)))))))
 
@@ -262,7 +262,7 @@
       (begin
         (with-bare-git-repository
          (lambda ()
-           (invoke "git" "fetch" "--prune" "origin")
+	   (fetch-remote! "origin")
            (system* "git" "worktree" "remove" "--force"
                     (simple-format #f "../issue-~A" issue-number))
            (system* "git" "branch" "-D"
-- 
2.46.0

[bug#74552] [PATCH 3/3] Use https protocol for the guix-patches remote

[Noé Lopez via Guix-patches via]

From: Noé Lopez <noelopez@free.fr>

The git protocol requires credentials.
---
 guix-qa-frontpage/git-repository.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix-qa-frontpage/git-repository.scm b/guix-qa-frontpage/git-repository.scm
index 0d31fe6..4ba7ca7 100644
--- a/guix-qa-frontpage/git-repository.scm
+++ b/guix-qa-frontpage/git-repository.scm
@@ -51,7 +51,7 @@
           (invoke "git" "remote" "add" "origin"
                   "https://git.savannah.gnu.org/git/guix.git")
           (invoke "git" "remote" "add" "patches"
-                  "git@git.qa.guix.gnu.org:guix-patches")
+                  "https://git.qa.guix.gnu.org/git/guix-patches")
 
           (invoke "git" "config" "user.name" "Guix Patches Tester")
           (invoke "git" "config" "user.email" "")))))))
-- 
2.46.0