From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 01/24] dir.c: optionally compute sha-1 of a .gitignore file Date: Sun, 8 Mar 2015 17:12:24 +0700 Message-ID: <1425809567-25518-2-git-send-email-pclouds@gmail.com> References: <1425809567-25518-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Mar 08 11:13:18 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YUYCz-0002LW-11 for gcvg-git-2@plane.gmane.org; Sun, 08 Mar 2015 11:13:17 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751747AbbCHKNN convert rfc822-to-quoted-printable (ORCPT ); Sun, 8 Mar 2015 06:13:13 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:38262 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751638AbbCHKNL (ORCPT ); Sun, 8 Mar 2015 06:13:11 -0400 Received: by pdbfl12 with SMTP id fl12so56276415pdb.5 for ; Sun, 08 Mar 2015 03:13:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Ms77uDdP6XTjTawrb0vvywvjGp0HL7mvHbs72myNJdM=; b=pKr1VEiHfD6fv9x+VFRZzblBMBJcWBJqLgeapo+UjgobrJhMuMBQIXNS3YA0nosNNO s9zjSvuW40gvwxnKeAw2MmKoOn4NXJm3DHfR6GsLDMrJH37LktZWprF+wyK8gozX3E9A K8DbwFV2vUVpemh7WMVi1BEcnGjoLEzvBlJIQj7f7F7COD7OiFZrmInM6zUeay8L1Wj/ +1awdcoOhzWtL7Gt7ty5+z5Hx+MG+nUXoET64R9pviRg7RdGTSUIjJTFTLC+PaeRPv/9 BOZW7KI76cOLHTgYztc0NZyWl7w/Cc8qUmI8jngxXR23L+05qyZ5BFQGab9K3XUklQ7N ZtrA== X-Received: by 10.70.103.73 with SMTP id fu9mr40467445pdb.141.1425809590696; Sun, 08 Mar 2015 03:13:10 -0700 (PDT) Received: from lanh ([115.73.247.162]) by mx.google.com with ESMTPSA id ie5sm14419427pbb.14.2015.03.08.03.13.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Mar 2015 03:13:09 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Sun, 08 Mar 2015 17:13:06 +0700 X-Mailer: git-send-email 2.3.0.rc1.137.g477eb31 In-Reply-To: <1425809567-25518-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This is not used anywhere yet. But the goal is to compare quickly if a =2Egitignore file has changed when we have the SHA-1 of both old (cache= d somewhere) and new (from index or a tree) versions. Helped-by: Junio C Hamano Helped-by: Torsten B=C3=B6gershausen Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: Junio C Hamano --- dir.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- dir.h | 6 ++++++ 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dir.c b/dir.c index fcb6872..d9d1c9a 100644 --- a/dir.c +++ b/dir.c @@ -466,7 +466,8 @@ void add_exclude(const char *string, const char *ba= se, x->el =3D el; } =20 -static void *read_skip_worktree_file_from_index(const char *path, size= _t *size) +static void *read_skip_worktree_file_from_index(const char *path, size= _t *size, + struct sha1_stat *sha1_stat) { int pos, len; unsigned long sz; @@ -485,6 +486,10 @@ static void *read_skip_worktree_file_from_index(co= nst char *path, size_t *size) return NULL; } *size =3D xsize_t(sz); + if (sha1_stat) { + memset(&sha1_stat->stat, 0, sizeof(sha1_stat->stat)); + hashcpy(sha1_stat->sha1, active_cache[pos]->sha1); + } return data; } =20 @@ -529,11 +534,18 @@ static void trim_trailing_spaces(char *buf) *last_space =3D '\0'; } =20 -int add_excludes_from_file_to_list(const char *fname, - const char *base, - int baselen, - struct exclude_list *el, - int check_index) +/* + * Given a file with name "fname", read it (either from disk, or from + * the index if "check_index" is non-zero), parse it and store the + * exclude rules in "el". + * + * If "ss" is not NULL, compute SHA-1 of the exclude file and fill + * stat data from disk (only valid if add_excludes returns zero). If + * ss_valid is non-zero, "ss" must contain good value as input. + */ +static int add_excludes(const char *fname, const char *base, int basel= en, + struct exclude_list *el, int check_index, + struct sha1_stat *sha1_stat) { struct stat st; int fd, i, lineno =3D 1; @@ -547,7 +559,7 @@ int add_excludes_from_file_to_list(const char *fnam= e, if (0 <=3D fd) close(fd); if (!check_index || - (buf =3D read_skip_worktree_file_from_index(fname, &size)) =3D=3D= NULL) + (buf =3D read_skip_worktree_file_from_index(fname, &size, sha1_s= tat)) =3D=3D NULL) return -1; if (size =3D=3D 0) { free(buf); @@ -560,6 +572,11 @@ int add_excludes_from_file_to_list(const char *fna= me, } else { size =3D xsize_t(st.st_size); if (size =3D=3D 0) { + if (sha1_stat) { + fill_stat_data(&sha1_stat->stat, &st); + hashcpy(sha1_stat->sha1, EMPTY_BLOB_SHA1_BIN); + sha1_stat->valid =3D 1; + } close(fd); return 0; } @@ -571,6 +588,22 @@ int add_excludes_from_file_to_list(const char *fna= me, } buf[size++] =3D '\n'; close(fd); + if (sha1_stat) { + int pos; + if (sha1_stat->valid && + !match_stat_data(&sha1_stat->stat, &st)) + ; /* no content change, ss->sha1 still good */ + else if (check_index && + (pos =3D cache_name_pos(fname, strlen(fname))) >=3D 0 && + !ce_stage(active_cache[pos]) && + ce_uptodate(active_cache[pos]) && + !would_convert_to_git(fname, NULL, 0, 0)) + hashcpy(sha1_stat->sha1, active_cache[pos]->sha1); + else + hash_sha1_file(buf, size, "blob", sha1_stat->sha1); + fill_stat_data(&sha1_stat->stat, &st); + sha1_stat->valid =3D 1; + } } =20 el->filebuf =3D buf; @@ -589,6 +622,13 @@ int add_excludes_from_file_to_list(const char *fna= me, return 0; } =20 +int add_excludes_from_file_to_list(const char *fname, const char *base= , + int baselen, struct exclude_list *el, + int check_index) +{ + return add_excludes(fname, base, baselen, el, check_index, NULL); +} + struct exclude_list *add_exclude_list(struct dir_struct *dir, int group_type, const char *src) { diff --git a/dir.h b/dir.h index 6c45e9d..cdca71b 100644 --- a/dir.h +++ b/dir.h @@ -73,6 +73,12 @@ struct exclude_list_group { struct exclude_list *el; }; =20 +struct sha1_stat { + struct stat_data stat; + unsigned char sha1[20]; + int valid; +}; + struct dir_struct { int nr, alloc; int ignored_nr, ignored_alloc; --=20 2.3.0.rc1.137.g477eb31