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 2/6] read-cache: new extension to mark what file is watched Date: Sun, 12 Jan 2014 18:03:38 +0700 Message-ID: <1389524622-6702-3-git-send-email-pclouds@gmail.com> References: <1389524622-6702-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 Sun Jan 12 11:58:51 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 1W2Ikl-0006hX-3X for gcvg-git-2@plane.gmane.org; Sun, 12 Jan 2014 11:58:51 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751227AbaALK6p convert rfc822-to-quoted-printable (ORCPT ); Sun, 12 Jan 2014 05:58:45 -0500 Received: from mail-pb0-f52.google.com ([209.85.160.52]:60588 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751202AbaALK6i (ORCPT ); Sun, 12 Jan 2014 05:58:38 -0500 Received: by mail-pb0-f52.google.com with SMTP id uo5so6259292pbc.11 for ; Sun, 12 Jan 2014 02:58:38 -0800 (PST) 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=M94hthit91+MF1eWBMsYtNUCY2TLfkOjVCcEL7rOD80=; b=Qz/6FJ2lBA/71AoFVcVcNSN33jNX7q+iEIHEJIV9+DI4xZyIRGq5/zNQb0irW2iejF Vrc8XGPiVGTzLgVyeLhaalCmpyjbG76uEQyfmRpoEXCiD22DakHHZMBeWg4dV4DLyjmb Y0y+uk0Cr6Jv/525i1y7KfAD4LzueEiBoncJQwEuAn2/+0oteTrr4D7RZYLJbYzBQPYV 0mv+SoFAuGWq7imdMXugB61e4p0K78oS3fMneoVKJxDXSA4ebtjYS5F9ttZhkAfyfNsB ZAEZB+Vw5ejDGTXe9GC6Na9G3ZNq6KvlahMT5NeJkHNM0q3SirPxp9u/mvGnWF1ZcJrH C8TA== X-Received: by 10.68.236.35 with SMTP id ur3mr22883247pbc.137.1389524318323; Sun, 12 Jan 2014 02:58:38 -0800 (PST) Received: from lanh ([115.73.194.184]) by mx.google.com with ESMTPSA id sx8sm38670853pab.5.2014.01.12.02.58.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 12 Jan 2014 02:58:37 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Sun, 12 Jan 2014 18:03:56 +0700 X-Mailer: git-send-email 1.8.5.2.240.g8478abd In-Reply-To: <1389524622-6702-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: If an entry is "watched", git lets an external program decide if the entry is modified or not. It's more like --assume-unchanged, but designed to be controlled by machine. We are running out of on-disk ce_flags, so instead of extending on-disk entry format again, "watched" flags are in-core only and stored as extension instead. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- cache.h | 1 + read-cache.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 7f7f306..dfa8622 100644 --- a/cache.h +++ b/cache.h @@ -168,6 +168,7 @@ struct cache_entry { =20 /* used to temporarily mark paths matched by pathspecs */ #define CE_MATCHED (1 << 26) +#define CE_WATCHED (1 << 27) =20 /* * Extended on-disk flags diff --git a/read-cache.c b/read-cache.c index 3b6daf1..098d3b6 100644 --- a/read-cache.c +++ b/read-cache.c @@ -33,6 +33,7 @@ static struct cache_entry *refresh_cache_entry(struct= cache_entry *ce, int reall #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) #define CACHE_EXT_TREE 0x54524545 /* "TREE" */ #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */ +#define CACHE_EXT_WATCH 0x57415443 /* "WATC" */ =20 struct index_state the_index; =20 @@ -1289,6 +1290,19 @@ static int verify_hdr(struct cache_header *hdr, return 0; } =20 +static void read_watch_extension(struct index_state *istate, uint8_t *= data, + unsigned long sz) +{ + int i; + if ((istate->cache_nr + 7) / 8 !=3D sz) { + error("invalid 'WATC' extension"); + return; + } + for (i =3D 0; i < istate->cache_nr; i++) + if (data[i / 8] & (1 << (i % 8))) + istate->cache[i]->ce_flags |=3D CE_WATCHED; +} + static int read_index_extension(struct index_state *istate, const char *ext, void *data, unsigned long sz) { @@ -1299,6 +1313,9 @@ static int read_index_extension(struct index_stat= e *istate, case CACHE_EXT_RESOLVE_UNDO: istate->resolve_undo =3D resolve_undo_read(data, sz); break; + case CACHE_EXT_WATCH: + read_watch_extension(istate, data, sz); + break; default: if (*ext < 'A' || 'Z' < *ext) return error("index uses %.4s extension, which we do not understand= ", @@ -1777,7 +1794,7 @@ int write_index(struct index_state *istate, int n= ewfd) { git_SHA_CTX c; struct cache_header hdr; - int i, err, removed, extended, hdr_version; + int i, err, removed, extended, hdr_version, has_watches =3D 0; struct cache_entry **cache =3D istate->cache; int entries =3D istate->cache_nr; struct stat st; @@ -1786,6 +1803,8 @@ int write_index(struct index_state *istate, int n= ewfd) for (i =3D removed =3D extended =3D 0; i < entries; i++) { if (cache[i]->ce_flags & CE_REMOVE) removed++; + else if (cache[i]->ce_flags & CE_WATCHED) + has_watches++; =20 /* reduce extended entries if possible */ cache[i]->ce_flags &=3D ~CE_EXTENDED; @@ -1857,6 +1876,26 @@ int write_index(struct index_state *istate, int = newfd) if (err) return -1; } + if (has_watches) { + int id, sz =3D (entries - removed + 7) / 8; + uint8_t *data =3D xmalloc(sz); + memset(data, 0, sz); + for (i =3D 0, id =3D 0; i < entries && has_watches; i++) { + struct cache_entry *ce =3D cache[i]; + if (ce->ce_flags & CE_REMOVE) + continue; + if (ce->ce_flags & CE_WATCHED) { + data[id / 8] |=3D 1 << (id % 8); + has_watches--; + } + id++; + } + err =3D write_index_ext_header(&c, newfd, CACHE_EXT_WATCH, sz) < 0 + || ce_write(&c, newfd, data, sz) < 0; + free(data); + if (err) + return -1; + } =20 if (ce_flush(&c, newfd) || fstat(newfd, &st)) return -1; --=20 1.8.5.2.240.g8478abd