[bug#44367] [PATCH 1/2] guix: hg-download: Add hg-predicate

[Christopher Baines <mail@cbaines.net>]

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


Holger Peters <holger.peters@posteo.de> writes:

> `hg-predicate' acts for mercurial repositories as `git-predicate' acts
> for git-repositories.
>
> * guix/hg-download.scm (hg-predicate): New variable.

hg-predicate is a procedure, so it's more appropriate to put "New
procedure" here.

>  guix/hg-download.scm | 38 +++++++++++++++++++++++++++++++++++++-
>  1 file changed, 37 insertions(+), 1 deletion(-)
>
> diff --git a/guix/hg-download.scm b/guix/hg-download.scm
> index 694105ceba..44212e295e 100644
> --- a/guix/hg-download.scm
> +++ b/guix/hg-download.scm
> @@ -26,12 +26,14 @@
>    #:use-module (guix packages)
>    #:autoload   (guix build-system gnu) (standard-packages)
>    #:use-module (ice-9 match)
> +  #:use-module (ice-9 popen)
> +  #:use-module (ice-9 rdelim)
>    #:export (hg-reference
>              hg-reference?
>              hg-reference-url
>              hg-reference-changeset
>              hg-reference-recursive?
> -
> +            hg-predicate
>              hg-fetch))
>  
>  ;;; Commentary:
> @@ -93,4 +95,38 @@ HASH-ALGO (a symbol).  Use NAME as the file name, or a generic name if #f."
>                        #:recursive? #t
>                        #:guile-for-build guile)))
>  
> +(define (hg-file-list directory)
> +  "Evaluates to a list of files contained in the repository at path
> +  @var{directory}"
> +  (let* ((port (open-input-pipe (format #f "hg files --repository ~s" directory)))
> +         (files (let loop ((files '()))
> +                  (let ((line (read-line port)))
> +                    (cond
> +                     ((eof-object? line) files)
> +                     (else
> +                      (loop (cons line files))))))))
> +    (close-pipe port)
> +    (map canonicalize-path files)))
> +
> +(define (should-select? pth-lst candidate)
> +  "Returns #t in case that @var{candidate} is a file is part of the given file
> +  list @var{path-list}."

I changed pth-lst to match path-list in the docstring.

> +  (let ((canon-candidate (canonicalize-path candidate)))
> +    (let loop ((xs pth-lst))
> +      (cond
> +       ((null? xs)
> +        ;; Directories are not part of `hg files', but `local-file' will not
> +        ;; recurse if we don't return #t for directories.
> +        (equal? (array-ref (lstat candidate) 13) 'directory))
> +       ((string-contains candidate (car xs)) #t)
> +       (else (loop (cdr xs)))))))
> +
> +(define (hg-predicate directory)
> +  "This procedure evaluates to a predicate that reports back whether a given
> +  @var{file} - @var{stat} combination is part of the files tracked by
> +  mercurial."

I tweaked the indentation here, and capitalised Mercurial, as that seems
better.

> +  (let ((files (hg-file-list directory)))
> +    (lambda (file stat)
> +      (should-select? files file))))
> +
>  ;;; hg-download.scm ends here


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