guix: download: Add support for git repositories.

* guix/scripts/download.scm (git-download-to-store*): Add new variable.
(copy-recursively-without-dot-git): New variable.
(git-download-to-file): Add new variable.
(show-help): Add 'git', 'commit', 'branch' and 'recursive'options
help message.
(%default-options): Add default value for 'git-reference' and
'recursive' options.
(%options): Add 'git', 'commit', 'branch' and 'recursive' command
line options.
(guix-download) [hash]: Compute hash with 'file-hash*' instead of
'port-hash' from (gcrypt hash) module. This allows us to compute
hashes for directories.
* doc/guix.texi (Invoking guix-download): Add @item entries for
`git', `commit', `branch' and `recursive' options. Add a paragraph in
the introduction.
* tests/guix-download.sh: New tests. Move variables and trap definition
to the top of the file.

Change-Id: Ic2c428dca4cfcb0d4714ed361a4c46609339140a
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Romain GARBAGE 2024-01-22 11:32:55 +01:00 committed by Maxim Cournoyer
parent 1bdeec5d66
commit 916fb5347a
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 222 additions and 13 deletions

View file

@ -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