pull, time-machine: Accept content SWHIDs as arguments to ‘--channels’.

* guix/swh.scm (swhid-content-data): New procedure.
(call): Do not close ‘port’ when ‘result’ is the same as ‘port’.
* guix/scripts/pull.scm (swhid-content-data*): New procedure.
(channel-list): Accept ‘file’ as a SWHID.
* tests/guix-time-machine.sh: Add test.
* doc/guix.texi (Invoking guix pull): Document it.
(Invoking guix time-machine): Likewise.

Change-Id: I8145cd8685fe2926b1548d4a2dcd54804d89228a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

1 files changed, 15 insertions, 1 deletions

diff --git a/tests/guix-time-machine.sh b/tests/guix-time-machine.sh
index 35b186ad6d1..262e3d5fef8 100644
--- a/tests/guix-time-machine.sh
+++ b/tests/guix-time-machine.sh
@@ -22,7 +22,8 @@
 #
 
 channels_file="channels-test-$$.scm"
-trap "rm -f $channels_file" EXIT
+log_file="log-test-$$.log"
+trap "rm -f $channels_file $log_file" EXIT
 
 cat > "$channels_file" <<EOF
 (system "echo rm -rf /")
@@ -73,6 +74,19 @@ cat > "$channels_file" <<EOF
 EOF
 guix repl -- "$channels_file"
 
+if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
+then
+    # Ignore the user's ~/.config/guix/trusted-channels.scm.  Under
+    # ./pre-inst-env zero channels are trusted by default so the following
+    # command must fail.
+    XDG_CONFIG_HOME="$XDG_CACHE_HOME/dot-config"                \
+    guix time-machine                                           \
+         -C swh:1:cnt:003e1e0c1b9b358082201332c926ae54e9549002  \
+         2> "$log_file"                                         \
+        && false
+    grep "'guix' is not trusted" "$log_file"
+fi
+
 if [ -d "$abs_top_srcdir/.git" ] \
    || guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
 then