[bug#72928] [PATCH] time-machine: Print profile path if no command is given.

[bug#72928] [PATCH] time-machine: Print profile path if no command is given.

[Tomas Volf]

Instead of warning, print the profile path of the cached-channel-instance.

* guix/scripts/time-machine.scm (guix-time-machine)[not command-line]: Print
the profile directory.

Change-Id: Id2c1ded514e6c5af45af9008ad1ef91beb509177
---
 guix/scripts/time-machine.scm | 38 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm
index d9ce85df84..8cad457ade 100644
--- a/guix/scripts/time-machine.scm
+++ b/guix/scripts/time-machine.scm
@@ -179,22 +179,22 @@ (define-command (guix-time-machine . args)
             (ref          (assoc-ref opts 'ref))
             (substitutes?  (assoc-ref opts 'substitutes?))
             (authenticate? (assoc-ref opts 'authenticate-channels?)))
-       (if command-line
-           (let* ((directory
-                   (with-store store
-                     (with-status-verbosity (assoc-ref opts 'verbosity)
-                       (with-build-handler (build-notifier #:use-substitutes?
-                                                           substitutes?
-                                                           #:verbosity
-                                                           (assoc-ref opts 'verbosity)
-                                                           #:dry-run? #f)
-                         (set-build-options-from-command-line store opts)
-                         (cached-channel-instance store channels
-                                                  #:authenticate? authenticate?
-                                                  #:reference-channels
-                                                  %reference-channels
-                                                  #:validate-channels
-                                                  validate-guix-channel)))))
-                  (executable (string-append directory "/bin/guix")))
-             (apply execl (cons* executable executable command-line)))
-           (warning (G_ "no command specified; nothing to do~%")))))))
+       (let* ((directory
+               (with-store store
+                 (with-status-verbosity (assoc-ref opts 'verbosity)
+                   (with-build-handler (build-notifier #:use-substitutes?
+                                                       substitutes?
+                                                       #:verbosity
+                                                       (assoc-ref opts 'verbosity)
+                                                       #:dry-run? #f)
+                     (set-build-options-from-command-line store opts)
+                     (cached-channel-instance store channels
+                                              #:authenticate? authenticate?
+                                              #:reference-channels
+                                              %reference-channels
+                                              #:validate-channels
+                                              validate-guix-channel)))))
+              (executable (string-append directory "/bin/guix")))
+         (if command-line
+             (apply execl (cons* executable executable command-line))
+             (format #t "~a\n" directory)))))))

base-commit: ef525ba96f04c6b3a5e45ab5333c9f440df81e5f
-- 
2.45.2

[bug#72928] [PATCH] time-machine: Print profile path if no command is given.

[Ludovic Courtès]

Hi,

Tomas Volf <~@wolfsden.cz> skribis:

> Instead of warning, print the profile path of the cached-channel-instance.
>
> * guix/scripts/time-machine.scm (guix-time-machine)[not command-line]: Print
> the profile directory.
>
> Change-Id: Id2c1ded514e6c5af45af9008ad1ef91beb509177

[...]

> +         (if command-line
> +             (apply execl (cons* executable executable command-line))
> +             (format #t "~a\n" directory)))))))

Maybe print ‘executable’ rather than ‘directory’?

Also perhaps add a sentence or two in the manual?

At any rate, this sounds like a useful change to me.

Thanks,
Ludo’.

[bug#72928] [PATCH] time-machine: Print profile path if no command is given.

[Tomas Volf]

[-- Attachment #1: Type: text/plain, Size: 1804 bytes --]


Hello,

Ludovic Courtès <ludo@gnu.org> writes:

> Hi,
>
> Tomas Volf <~@wolfsden.cz> skribis:
>
>> Instead of warning, print the profile path of the cached-channel-instance.
>>
>> * guix/scripts/time-machine.scm (guix-time-machine)[not command-line]: Print
>> the profile directory.
>>
>> Change-Id: Id2c1ded514e6c5af45af9008ad1ef91beb509177
>
> [...]
>
>> +         (if command-line
>> +             (apply execl (cons* executable executable command-line))
>> +             (format #t "~a\n" directory)))))))
>
> Maybe print ‘executable’ rather than ‘directory’?

Printing directory gives nice symmetry between

--8<---------------cut here---------------start------------->8---
$ $(guix build guix)/bin/guix describe
  guix 9a2ddcc
    repository URL: https://git.savannah.gnu.org/git/guix.git
    branch: master
    commit: 9a2ddcc8f5a6f64b475eeb13a3f1034aa6a4a49a
--8<---------------cut here---------------end--------------->8---

and

--8<---------------cut here---------------start------------->8---
$ $(guix time-machine -q --commit=9a2ddcc8f5a6f64b475eeb13a3f1034aa6a4a49a)/bin/guix describe
  guix 9a2ddcc
    repository URL: https://git.savannah.gnu.org/git/guix.git
    commit: 9a2ddcc8f5a6f64b475eeb13a3f1034aa6a4a49a
--8<---------------cut here---------------end--------------->8---

And in some cases you need the store item (guix copy?), and in my
opinion it is easier to go from directory to binary than other way
around.

But just let me know which way I should do it.

>
> Also perhaps add a sentence or two in the manual?

Ah, yeah, definitely.  Once previous point is clarified, I will send v2.

Tomas

-- 
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 853 bytes --]

[bug#72928] [PATCH] time-machine: Print profile path if no command is given.

[Ludovic Courtès]

Hi,

Tomas Volf <~@wolfsden.cz> skribis:

>>> +         (if command-line
>>> +             (apply execl (cons* executable executable command-line))
>>> +             (format #t "~a\n" directory)))))))
>>
>> Maybe print ‘executable’ rather than ‘directory’?
>
> Printing directory gives nice symmetry between
>
> $ $(guix build guix)/bin/guix describe
>   guix 9a2ddcc
>     repository URL: https://git.savannah.gnu.org/git/guix.git
>     branch: master
>     commit: 9a2ddcc8f5a6f64b475eeb13a3f1034aa6a4a49a
>
>
> and
>
> $ $(guix time-machine -q --commit=9a2ddcc8f5a6f64b475eeb13a3f1034aa6a4a49a)/bin/guix describe
>   guix 9a2ddcc
>     repository URL: https://git.savannah.gnu.org/git/guix.git
>     commit: 9a2ddcc8f5a6f64b475eeb13a3f1034aa6a4a49a
>
> And in some cases you need the store item (guix copy?), and in my
> opinion it is easier to go from directory to binary than other way
> around.

Ah yes, good points, I agree.  Let’s do that.

> Ah, yeah, definitely.  Once previous point is clarified, I will send v2.

Green light as far as I’m concerned!

Thanks,
Ludo’.