From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 01/19] dir.c: optionally compute sha-1 of a .gitignore file
Date: Mon, 27 Oct 2014 15:46:03 -0700 [thread overview]
Message-ID: <xmqq7fzl5dxw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1414411846-4450-2-git-send-email-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Mon, 27 Oct 2014 19:10:28 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> This is not used anywhere yet. But the goal is to compare quickly if a
> .gitignore file has changed when we have the SHA-1 of both old (cached
> somewhere) and new (from index or a tree) versions.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
> ---
> dir.c | 50 +++++++++++++++++++++++++++++++++++++++++++-------
> dir.h | 5 +++++
> 2 files changed, 48 insertions(+), 7 deletions(-)
>
> diff --git a/dir.c b/dir.c
> index bd274a7..33a35c1 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -466,7 +466,8 @@ void add_exclude(const char *string, const char *base,
> x->el = el;
> }
>
> -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 *ss)
> {
> int pos, len;
> unsigned long sz;
> @@ -485,6 +486,10 @@ static void *read_skip_worktree_file_from_index(const char *path, size_t *size)
> return NULL;
> }
> *size = xsize_t(sz);
> + if (ss) {
> + memset(&ss->stat, 0, sizeof(ss->stat));
> + hashcpy(ss->sha1, active_cache[pos]->sha1);
> + }
> return data;
> }
>
> @@ -529,11 +534,18 @@ static void trim_trailing_spaces(char *buf)
> *last_space = '\0';
> }
>
> -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.
> + */
Hmm, do we want a separate parameter for that? Wouldn't it be
sufficient and cleaner to pass is_null_sha1(ss->sha1[]), or
alternatively have an element ss->valid that is initialized to
false?
That is...
> @@ -571,6 +587,19 @@ int add_excludes_from_file_to_list(const char *fname,
> }
> buf[size++] = '\n';
> close(fd);
> + if (ss) {
> + int pos;
> + if (ss_valid && !match_stat_data(&ss->stat, &st))
s/ss_valid/ss->valid/;
> + ; /* no content change, ss->sha1 still good */
> + else if (check_index &&
> + (pos = cache_name_pos(fname, strlen(fname))) >= 0 &&
> + !ce_stage(active_cache[pos]) &&
> + ce_uptodate(active_cache[pos]))
> + hashcpy(ss->sha1, active_cache[pos]->sha1);
> + else
> + hash_sha1_file(buf, size, "blob", ss->sha1);
> + fill_stat_data(&ss->stat, &st);
And toggle "ss->valid = 1"; here...
> @@ -589,6 +618,13 @@ int add_excludes_from_file_to_list(const char *fname,
> return 0;
> }
>
> +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, 0);
> +}
> +
> 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..032d197 100644
> --- a/dir.h
> +++ b/dir.h
> @@ -73,6 +73,11 @@ struct exclude_list_group {
> struct exclude_list *el;
> };
>
> +struct sha1_stat {
> + struct stat_data stat;
> + unsigned char sha1[20];
> +};
> +
> struct dir_struct {
> int nr, alloc;
> int ignored_nr, ignored_alloc;
next prev parent reply other threads:[~2014-10-27 22:46 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 12:10 [PATCH 00/19] Untracked cache to speed up "git status" Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 01/19] dir.c: optionally compute sha-1 of a .gitignore file Nguyễn Thái Ngọc Duy
2014-10-27 22:46 ` Junio C Hamano [this message]
2014-10-28 0:12 ` Duy Nguyen
2014-10-28 17:37 ` Torsten Bögershausen
2014-11-02 1:25 ` Duy Nguyen
2014-10-27 12:10 ` [PATCH 02/19] untracked cache: record .gitignore information and dir hierarchy Nguyễn Thái Ngọc Duy
2014-10-28 17:37 ` Torsten Bögershausen
2014-10-27 12:10 ` [PATCH 03/19] untracked cache: initial untracked cache validation Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 04/19] untracked cache: invalidate dirs recursively if .gitignore changes Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 05/19] untracked cache: make a wrapper around {open,read,close}dir() Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 06/19] untracked cache: record/validate dir mtime and reuse cached output Nguyễn Thái Ngọc Duy
2014-10-30 16:19 ` Eric Sunshine
2014-10-27 12:10 ` [PATCH 07/19] untracked cache: mark what dirs should be recursed/saved Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 08/19] untracked cache: don't open non-existent .gitignore Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 09/19] untracked cache: save to an index extension Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 10/19] untracked cache: load from UNTR " Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 11/19] untracked cache: invalidate at index addition or removal Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 12/19] read-cache.c: split racy stat test to a separate function Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 13/19] untracked cache: avoid racy timestamps Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 14/19] untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 15/19] untracked cache: mark index dirty if untracked cache is updated Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 16/19] status: enable untracked cache Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 17/19] update-index: manually enable or disable " Nguyễn Thái Ngọc Duy
2014-10-27 12:10 ` [PATCH 18/19] update-index: test the system before enabling " Nguyễn Thái Ngọc Duy
2014-10-28 17:37 ` Torsten Bögershausen
2014-11-03 12:16 ` Duy Nguyen
2014-11-03 18:09 ` Junio C Hamano
2014-10-28 23:25 ` Eric Sunshine
2014-10-27 12:10 ` [PATCH 19/19] t7063: tests for " Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 00/22] untracked cache updates Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 01/22] dir.c: optionally compute sha-1 of a .gitignore file Nguyễn Thái Ngọc Duy
2014-11-17 19:31 ` David Turner
2014-11-08 9:39 ` [PATCH v2 02/22] untracked cache: record .gitignore information and dir hierarchy Nguyễn Thái Ngọc Duy
2014-11-08 17:08 ` brian m. carlson
2014-11-17 20:35 ` David Turner
2014-11-08 9:39 ` [PATCH v2 03/22] untracked cache: initial untracked cache validation Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 04/22] untracked cache: invalidate dirs recursively if .gitignore changes Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 05/22] untracked cache: make a wrapper around {open,read,close}dir() Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 06/22] untracked cache: record/validate dir mtime and reuse cached output Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 07/22] untracked cache: mark what dirs should be recursed/saved Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 08/22] untracked cache: don't open non-existent .gitignore Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 09/22] untracked cache: save to an index extension Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 10/22] untracked cache: load from UNTR " Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 11/22] untracked cache: invalidate at index addition or removal Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 12/22] read-cache.c: split racy stat test to a separate function Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 13/22] untracked cache: avoid racy timestamps Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 14/22] untracked cache: print stats with $GIT_TRACE_UNTRACKED_STATS Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 15/22] untracked cache: mark index dirty if untracked cache is updated Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 16/22] untracked-cache: temporarily disable with $GIT_DISABLE_UNTRACKED_CACHE Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 17/22] status: enable untracked cache Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 18/22] update-index: manually enable or disable " Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 19/22] update-index: test the system before enabling " Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 20/22] t7063: tests for " Nguyễn Thái Ngọc Duy
2014-11-08 9:39 ` [PATCH v2 21/22] mingw32: add uname() Nguyễn Thái Ngọc Duy
2014-11-09 3:32 ` Eric Sunshine
2014-11-09 8:36 ` Duy Nguyen
2014-11-09 11:46 ` Torsten Bögershausen
2014-11-09 18:47 ` Junio C Hamano
2014-11-08 9:39 ` [PATCH v2 22/22] untracked cache: guard and disable on system changes Nguyễn Thái Ngọc Duy
2014-11-09 3:39 ` Eric Sunshine
2014-11-09 8:34 ` Duy Nguyen
2014-11-09 21:39 ` Torsten Bögershausen
2014-11-09 23:47 ` Duy Nguyen
2014-11-10 20:48 ` Torsten Bögershausen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7fzl5dxw.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox