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 09/19] untracked cache: save to an index extension Date: Mon, 27 Oct 2014 19:10:36 +0700 Message-ID: <1414411846-4450-10-git-send-email-pclouds@gmail.com> References: <1414411846-4450-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?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Oct 27 13:11:36 2014 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 1Xij95-0002uT-RD for gcvg-git-2@plane.gmane.org; Mon, 27 Oct 2014 13:11:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752530AbaJ0MLd convert rfc822-to-quoted-printable (ORCPT ); Mon, 27 Oct 2014 08:11:33 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:43550 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751935AbaJ0MLc (ORCPT ); Mon, 27 Oct 2014 08:11:32 -0400 Received: by mail-pd0-f171.google.com with SMTP id r10so5547117pdi.30 for ; Mon, 27 Oct 2014 05:11:31 -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=69qW5GvKVsQEH4mLTdnC18TAep7Ar19PpGyhwB6S8nE=; b=MvS3mr+2yrccAOLyuf1FMONNC1WIiNhNDD+P/uk+c60f3Y+Yg6Ptu6XcjmWKa8dBat aTjzcmugjw+NirxEFgENIlxNCKwEP4Q3SqwCXF6cwQNWo/k1K/CP8j8MMsWIQW5ztELl DZS4HfhxVhtD9jiwWqS9sqVsBj8oUkpa979q8rIe+8H/KxtPR90LW0bA89KTgak5neHb wYQ8QP0l3C5r9FSEvG0lVdqoId/RLntqtTahI3UkIYg6v1oLVl66XN0mGa1bSi86CXaJ tWinFWeca5h5eDUsftEjXyeXeA+so34HYDW7uDt/xJo1ODpqNWZvBqLp8tOMg5ocMUcA h9LA== X-Received: by 10.66.240.100 with SMTP id vz4mr23551950pac.27.1414411891594; Mon, 27 Oct 2014 05:11:31 -0700 (PDT) Received: from lanh ([115.73.192.230]) by mx.google.com with ESMTPSA id bf2sm10774662pbb.13.2014.10.27.05.11.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Oct 2014 05:11:31 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Mon, 27 Oct 2014 19:11:34 +0700 X-Mailer: git-send-email 2.1.0.rc0.78.gc0d8480 In-Reply-To: <1414411846-4450-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- cache.h | 3 +++ dir.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++++ dir.h | 1 + read-cache.c | 12 +++++++++ 4 files changed, 101 insertions(+) diff --git a/cache.h b/cache.h index 5b86065..4f903fa 100644 --- a/cache.h +++ b/cache.h @@ -298,6 +298,8 @@ static inline unsigned int canon_mode(unsigned int = mode) #define SPLIT_INDEX_ORDERED (1 << 6) =20 struct split_index; +struct untracked_cache; + struct index_state { struct cache_entry **cache; unsigned int version; @@ -311,6 +313,7 @@ struct index_state { struct hashmap name_hash; struct hashmap dir_hash; unsigned char sha1[20]; + struct untracked_cache *untracked; }; =20 extern struct index_state the_index; diff --git a/dir.c b/dir.c index d4f9830..d696388 100644 --- a/dir.c +++ b/dir.c @@ -12,6 +12,7 @@ #include "refs.h" #include "wildmatch.h" #include "pathspec.h" +#include "varint.h" =20 struct path_simplify { int len; @@ -2145,3 +2146,87 @@ void clear_directory(struct dir_struct *dir) } strbuf_release(&dir->basebuf); } + +struct ondisk_untracked_cache { + struct stat_data info_exclude_stat; + struct stat_data excludes_file_stat; + uint32_t dir_flags; + unsigned char info_exclude_sha1[20]; + unsigned char excludes_file_sha1[20]; + char exclude_per_dir[1]; +}; + +static void stat_data_to_disk(struct stat_data *to, const struct stat_= data *from) +{ + to->sd_ctime.sec =3D htonl(from->sd_ctime.sec); + to->sd_ctime.nsec =3D htonl(from->sd_ctime.nsec); + to->sd_mtime.sec =3D htonl(from->sd_mtime.sec); + to->sd_mtime.nsec =3D htonl(from->sd_mtime.nsec); + to->sd_dev =3D htonl(from->sd_dev); + to->sd_ino =3D htonl(from->sd_ino); + to->sd_uid =3D htonl(from->sd_uid); + to->sd_gid =3D htonl(from->sd_gid); + to->sd_size =3D htonl(from->sd_size); +} + +static void write_one_dir(struct strbuf *out, struct untracked_cache_d= ir *untracked) +{ + struct stat_data stat_data; + unsigned char intbuf[16]; + unsigned int intlen, value; + int i; + + stat_data_to_disk(&stat_data, &untracked->stat_data); + strbuf_add(out, &stat_data, sizeof(stat_data)); + strbuf_add(out, untracked->exclude_sha1, 20); + + /* + * untracked_nr should be reset whenever valid is clear, but + * for safety.. + */ + if (!untracked->valid) { + untracked->untracked_nr =3D 0; + untracked->check_only =3D 0; + } + + value =3D untracked->valid; + value |=3D untracked->check_only << 1; + value |=3D untracked->untracked_nr << 2; + intlen =3D encode_varint(value, intbuf); + strbuf_add(out, intbuf, intlen); + + /* skip non-recurse directories */ + for (i =3D 0, value =3D 0; i < untracked->dirs_nr; i++) + if (untracked->dirs[i]->recurse) + value++; + intlen =3D encode_varint(value, intbuf); + strbuf_add(out, intbuf, intlen); + + strbuf_add(out, untracked->name, strlen(untracked->name) + 1); + + for (i =3D 0; i < untracked->untracked_nr; i++) + strbuf_add(out, untracked->untracked[i], + strlen(untracked->untracked[i]) + 1); + + for (i =3D 0; i < untracked->dirs_nr; i++) + if (untracked->dirs[i]->recurse) + write_one_dir(out, untracked->dirs[i]); +} + +void write_untracked_extension(struct strbuf *out, struct untracked_ca= che *untracked) +{ + struct ondisk_untracked_cache *ouc; + int len =3D 0; + if (untracked->exclude_per_dir) + len =3D strlen(untracked->exclude_per_dir); + ouc =3D xmalloc(sizeof(*ouc) + len); + stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclud= e.stat); + stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_f= ile.stat); + hashcpy(ouc->info_exclude_sha1, untracked->ss_info_exclude.sha1); + hashcpy(ouc->excludes_file_sha1, untracked->ss_excludes_file.sha1); + ouc->dir_flags =3D htonl(untracked->dir_flags); + memcpy(ouc->exclude_per_dir, untracked->exclude_per_dir, len + 1); + strbuf_add(out, ouc, sizeof(*ouc) + len); + if (untracked->root) + write_one_dir(out, untracked->root); +} diff --git a/dir.h b/dir.h index c302dcb..7ef0f63 100644 --- a/dir.h +++ b/dir.h @@ -297,4 +297,5 @@ static inline int dir_path_match(const struct dir_e= ntry *ent, has_trailing_dir); } =20 +void write_untracked_extension(struct strbuf *out, struct untracked_ca= che *untracked); #endif diff --git a/read-cache.c b/read-cache.c index 8f3e9eb..efff4e2 100644 --- a/read-cache.c +++ b/read-cache.c @@ -38,6 +38,7 @@ static struct cache_entry *refresh_cache_entry(struct= cache_entry *ce, #define CACHE_EXT_TREE 0x54524545 /* "TREE" */ #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */ #define CACHE_EXT_LINK 0x6c696e6b /* "link" */ +#define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */ =20 /* changes that can be kept in $GIT_DIR/index (basically all extension= s) */ #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \ @@ -2035,6 +2036,17 @@ static int do_write_index(struct index_state *is= tate, int newfd, if (err) return -1; } + if (istate->untracked) { + struct strbuf sb =3D STRBUF_INIT; + + write_untracked_extension(&sb, istate->untracked); + err =3D write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED, + sb.len) < 0 || + ce_write(&c, newfd, sb.buf, sb.len) < 0; + strbuf_release(&sb); + if (err) + return -1; + } =20 if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st)) return -1; --=20 2.1.0.rc0.78.gc0d8480