Merge branch 'master' into gnome-team

2 files changed, 96 insertions, 6 deletions

diff --git a/tests/channels.scm b/tests/channels.scm
index 6c4276deb4..c56e4e6a71 100644
--- a/tests/channels.scm
+++ b/tests/channels.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019-2020, 2022, 2024 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -191,11 +191,60 @@
                            (and (eq? (channel-name
                                       (channel-instance-channel instance))
                                      'test-channel)
-                                (string=? (channel-commit
-                                           (channel-instance-channel instance))
-                                          "abc1234")))
+                                (equal? (channel-commit
+                                         (channel-instance-channel instance))
+                                        "abc1234")))
                          instances)))))))
 
+(test-equal "latest-channel-instances reads dependencies from most-specific instance"
+  '(chan1 chan2)
+  ;; Here '.guix-channel' in DIRECTORY2 is less specific than the
+  ;; user-provided channel spec in ONE: the latter specifies a commit.  Since
+  ;; the most specific one "wins", the bogus '.guix-channel' file added in
+  ;; DIRECTORY1 as its second commit must not be taken into account.
+  ;; See <https://issues.guix.gnu.org/68822>.
+  (with-temporary-git-repository directory1
+      `((add "a.scm" "(define-module (a))")
+        (commit "first commit")
+        (add ".guix-channel"
+             ,(object->string
+               '(channel
+                 (version 0)
+                 (dependencies
+                  ;; Attempting to fetch this dependency would fail.
+                  (channel
+                   (name nonexistent-dependency)
+                   (url "http://guix.example.org/does-not-exist.git"))))))
+        (commit "second commit"))
+    (with-temporary-git-repository directory2
+        `((add ".guix-channel"
+               ,(object->string
+                 `(channel (version 0)
+                           (dependencies
+                            (channel
+                             (name chan1)
+                             ;; Note: no 'commit' field here.
+                             (url ,(string-append "file://" directory1)))))))
+          (commit "initial commit"))
+      (with-repository directory1 repository
+        (let* ((commit (find-commit repository "first"))
+               (one    (channel
+                        (url (string-append "file://" directory1))
+                        (commit (oid->string (commit-id commit))) ;<- specific
+                        (name 'chan1)))
+               (two    (channel
+                        (url (string-append "file://" directory2))
+                        (name 'chan2))))
+
+          (with-store store
+            (map (compose channel-name channel-instance-channel)
+                 (delete-duplicates
+                  (append (latest-channel-instances store (list one two))
+                          (latest-channel-instances store (list two one)))
+                  (lambda (instance1 instance2)
+                    (string=? (channel-instance-commit instance1)
+                              (channel-instance-commit instance2)))))))))))
+
 (test-equal "latest-channel-instances #:validate-pull"
   'descendant
 
diff --git a/tests/guix-download.sh b/tests/guix-download.sh
index f4cb335eef..d4cd2ea6b9 100644
--- a/tests/guix-download.sh
+++ b/tests/guix-download.sh
@@ -16,6 +16,12 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
+# Define some files/folders needed for the tests.
+output="t-download-$$"
+test_git_repo="$(mktemp -d)"
+output_dir="t-archive-dir-$$"
+trap 'rm -rf "$test_git_repo" ; rm -f "$output" ; rm -rf "$output_dir"' EXIT
+
 #
 # Test the `guix download' command-line utility.
 #
@@ -36,8 +42,6 @@ guix download "file://$abs_top_srcdir/README"
 guix download "$abs_top_srcdir/README"
 
 # This one too, even if it cannot talk to the daemon.
-output="t-download-$$"
-trap 'rm -f "$output"' EXIT
 GUIX_DAEMON_SOCKET="/nowhere" guix download -o "$output" \
 		  "file://$abs_top_srcdir/README"
 cmp "$output" "$abs_top_srcdir/README"
@@ -45,4 +49,41 @@ cmp "$output" "$abs_top_srcdir/README"
 # This one should fail.
 guix download "file:///does-not-exist" "file://$abs_top_srcdir/README" && false
 
+# Test git support with local repository.
+# First, create a dummy git repo in the temporary directory.
+(
+    cd $test_git_repo
+    git init
+    touch test
+    git config user.name "User"
+    git config user.email "user@domain"
+    git add test
+    git commit -m "Commit"
+    git tag -a -m "v1" v1
+)
+
+# Extract commit number.
+commit=$((cd $test_git_repo && git log) | head -n 1 | cut -f2 -d' ')
+
+# We expect that guix hash is working properly or at least that the output of
+# 'guix download' is consistent with 'guix hash'.
+expected_hash=$(guix hash -rx $test_git_repo)
+
+# Test the different options
+for option in "" "--commit=$commit" "--commit=v1" "--branch=master"
+do
+    command_output="$(guix download --git $option "file://$test_git_repo")"
+    computed_hash="$(echo $command_output | cut -f2 -d' ')"
+    store_path="$(echo $command_output | cut -f1 -d' ')"
+    [ "$expected_hash" = "$computed_hash" ]
+    diff -r -x ".git" $test_git_repo $store_path
+done
+
+# Should fail.
+guix download --git --branch=non_existent "file://$test_git_repo" && false
+
+# Same but download to file instead of store.
+guix download --git "file://$test_git_repo" -o $output_dir
+diff -r -x ".git" $test_git_repo $output_dir
+
 exit 0