From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: [PATCH] scripts: hash: Add --exclude-.git option. Date: Mon, 05 Sep 2016 23:04:11 +0200 Message-ID: <87fupexdmc.fsf@gnu.org> References: <87zinmybwv.fsf@gnu.org> <57CD38D2.6050807@goebel-consult.de> <87vayay3w4.fsf@gnu.org> <20160905202009.GB16662@macbook42.flashner.co.il> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh14N-0005zQ-Uy for guix-devel@gnu.org; Mon, 05 Sep 2016 17:04:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh14K-0000zb-0m for guix-devel@gnu.org; Mon, 05 Sep 2016 17:04:43 -0400 In-Reply-To: <20160905202009.GB16662@macbook42.flashner.co.il> (Efraim Flashner's message of "Mon, 5 Sep 2016 23:20:09 +0300") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Efraim Flashner Cc: guix-devel , Hartmut Goebel --=-=-= Content-Type: text/plain Efraim Flashner writes: > Can this be generalized? `grep \\-download\) gnu/packages/*scm' shows also > svn-download, cvs-download and a lone hg-download. Okay. What about simply having non-default --exclude=FILE See attached. (Missing test included this time). Greetings, Jan --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-scripts-hash-Add-exclude-option.patch Content-Transfer-Encoding: quoted-printable >From ae738ad845f6d9e7576c42c53db6f7036b006e6c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 5 Sep 2016 10:27:19 +0200 Subject: [PATCH] scripts: hash: Add --exclude option. * guix/scripts/hash.scm (show-help): Add help text for --exclude option. (%options): Add --exclude option. (guix-hash): Handle exclude option. * doc/guix.texi ("invoking guix hash"): Update doc. * tests/guix-hash.sh: Add test. --- doc/guix.texi | 14 +++++++++++++- guix/scripts/hash.scm | 18 +++++++++++++++--- tests/guix-hash.sh | 17 +++++++++++++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5330238..b5c0a7d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4616,10 +4616,17 @@ The general syntax is: guix hash @var{option} @var{file} @end example =20 -@command{guix hash} has the following option: +@command{guix hash} has the following options: =20 @table @code =20 +@item --exclude=3D@var{file} +@itemx -e @var{file} +Exclude @var{file} when computing a recursive hash, e.g.: +@example +$ guix hash -r -e .git . +@end example + @item --format=3D@var{fmt} @itemx -f @var{fmt} Write the hash in the format specified by @var{fmt}. @@ -4655,6 +4662,11 @@ $ cd foo $ rm -rf .git $ guix hash -r . @end example +@noindent +or simply use the -e (--exclude) option +@example +$ guix hash -r -e .git . +@end example @end table =20 @node Invoking guix import diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index d440953..642e1c0 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2012, 2013, 2014 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2013 Nikita Karetnikov +;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,6 +50,8 @@ Return the cryptographic hash of FILE. Supported formats: 'nix-base32' (default), 'base32', and 'base16' ('hex' and 'hexadecimal' can be used as well).\n")) (format #t (_ " + -e, --exclude=3DFILE exclude FILE when computing hash")) + (format #t (_ " -f, --format=3DFMT write the hash in the given format")) (format #t (_ " -r, --recursive compute the hash on FILE recursively")) @@ -62,7 +65,10 @@ and 'hexadecimal' can be used as well).\n")) =20 (define %options ;; Specification of the command-line options. - (list (option '(#\f "format") #t #f + (list (option '(#\e "exclude") #t #f + (lambda (opt name arg result) + (alist-cons 'exclude arg result))) + (option '(#\f "format") #t #f (lambda (opt name arg result) (define fmt-proc (match arg @@ -78,6 +84,7 @@ and 'hexadecimal' can be used as well).\n")) =20 (alist-cons 'format fmt-proc (alist-delete 'format result)))) + (option '(#\r "recursive") #f #f (lambda (opt name arg result) (alist-cons 'recursive? #t result))) @@ -113,7 +120,12 @@ and 'hexadecimal' can be used as well).\n")) value) (_ #f)) (reverse opts))) - (fmt (assq-ref opts 'format))) + (fmt (assq-ref opts 'format)) + (exclude (assq-ref opts 'exclude)) + (select? (if exclude + (lambda (f s) + (not (string=3D f (string-append (car args) "/" ex= clude)))) + (const #t)))) =20 (define (file-hash file) ;; Compute the hash of FILE. @@ -121,7 +133,7 @@ and 'hexadecimal' can be used as well).\n")) (with-error-handling (if (assoc-ref opts 'recursive?) (let-values (((port get-hash) (open-sha256-port))) - (write-file file port) + (write-file file port #:select? select?) (flush-output-port port) (get-hash)) (call-with-input-file file port-sha256)))) diff --git a/tests/guix-hash.sh b/tests/guix-hash.sh index 23df01d..b59939e 100644 --- a/tests/guix-hash.sh +++ b/tests/guix-hash.sh @@ -1,5 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright =C2=A9 2013, 2014 Ludovic Court=C3=A8s +# Copyright =C2=A9 2016 Jan Nieuwenhuizen # # This file is part of GNU Guix. # @@ -20,6 +21,7 @@ # Test the `guix hash' command-line utility. # =20 +set -x guix hash --version =20 tmpdir=3D"guix-hash-$$" @@ -46,4 +48,18 @@ then false; else true; fi # the archive format doesn't support. if guix hash -r /dev/null then false; else true; fi + +# Adding a .git directory +mkdir "$tmpdir/.git" +touch "$tmpdir/.git/foo" + +# ...changes the hash +test `guix hash -r $tmpdir` =3D 0a50z04zyzf7pidwxv0nwbj82pgzbrhdy9562kncnv= kcfvb48m59 + +# ...but remains the same when using `-e .git' +test `guix hash -r $tmpdir -e .git` =3D 10k1lw41wyrjf9mxydi0is5nkpynlsvgsl= inics4ppir13g7d74p + +# Without '-r', this should fail. +if guix hash "$tmpdir" +then false; else true; fi + --=20 2.9.3 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20 --=-=-=--