From cfbf916045c180c8f77f90e9c910012f18447dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 10 Sep 2013 22:36:41 +0200
Subject: [PATCH] store: The 'references' parameter of 'add-text-to-store' is
 now optional.

* guix/store.scm (add-text-to-store): Make 'references' optional.
* tests/store.scm ("dead-paths", "references"): Use 'add-text-to-store'
  with no optional argument.
* doc/guix.texi (The Store): Adjust accordingly.
---
 doc/guix.texi   | 2 +-
 guix/store.scm  | 2 +-
 tests/store.scm | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 5b91bc2982a70d2c957946c5d63c4fc9d6d72256..5d1b780144d4c7981b1c46bc8d829ffd534cca39 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1061,7 +1061,7 @@ argument.
 Return @code{#t} when @var{path} is a valid store path.
 @end deffn
 
-@deffn {Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} @var{references}
+@deffn {Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} [@var{references}]
 Add @var{text} under file @var{name} in the store, and return its store
 path.  @var{references} is the list of store paths referred to by the
 resulting store path.
diff --git a/guix/store.scm b/guix/store.scm
index 541c7c848f8553ec3727d8e7aee9e294cfe6cd46..0f1e2f9466d148601f5a623db31885856507ce75 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -452,7 +452,7 @@ encoding conversion errors."
                                        (string-list references))
                     #f
                     store-path)))
-    (lambda (server name text references)
+    (lambda* (server name text #:optional (references '()))
       "Add TEXT under file NAME in the store, and return its store path.
 REFERENCES is the list of store paths referred to by the resulting store
 path."
diff --git a/tests/store.scm b/tests/store.scm
index 9625a6b308a1c0b1d758c1e7783fe33cbb45eae3..0280713191a61aa9a5a9c95b02900320bd416535 100644
--- a/tests/store.scm
+++ b/tests/store.scm
@@ -68,8 +68,7 @@
 (test-skip (if %store 0 10))
 
 (test-assert "dead-paths"
-  (let ((p (add-text-to-store %store "random-text"
-                              (random-text) '())))
+  (let ((p (add-text-to-store %store "random-text" (random-text))))
     (member p (dead-paths %store))))
 
 ;; FIXME: Find a test for `live-paths'.
@@ -99,7 +98,7 @@
 
 (test-assert "references"
   (let* ((t1 (add-text-to-store %store "random1"
-                                (random-text) '()))
+                                (random-text)))
          (t2 (add-text-to-store %store "random2"
                                 (random-text) (list t1))))
     (and (equal? (list t1) (references %store t2))