From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-9.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 8E5B61F744 for ; Sun, 26 Jun 2016 04:15:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751998AbcFZEO5 (ORCPT ); Sun, 26 Jun 2016 00:14:57 -0400 Received: from sub3.mail.dreamhost.com ([69.163.253.7]:38946 "EHLO homiemail-a17.g.dreamhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751882AbcFZEOo (ORCPT ); Sun, 26 Jun 2016 00:14:44 -0400 Received: from homiemail-a17.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a17.g.dreamhost.com (Postfix) with ESMTP id 268552B206A; Sat, 25 Jun 2016 21:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=novalis.org; h=from:to:cc :subject:date:message-id:in-reply-to:references; s=novalis.org; bh=WIprC3ktRB6TrO4Y4wUK/BnHHoQ=; b=LsIKRznxF1JFM9R5qTGdczQEaBey ZSc/lk6uP2kjS32ACU5afPWZEJcSrmMFr9RPaBGJkxHHldI6fNF+Z8BL0f4r7HPK VZigstNaJWHLCkdy8DaTIeQ0tT4l9sHVUZyf5vC3r3mzPMkO8lrEUPp6FCoj3F8Z f1+INjaqhMLYyak= Received: from frank.cable.rcn.com (207-38-164-98.c3-0.43d-ubr2.qens-43d.ny.cable.rcn.com [207.38.164.98]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: novalis@novalis.org) by homiemail-a17.g.dreamhost.com (Postfix) with ESMTPSA id 8AA062B205C; Sat, 25 Jun 2016 21:14:43 -0700 (PDT) From: David Turner To: git@vger.kernel.org, pclouds@gmail.com, kamggg@gmail.com Cc: David Turner , Junio C Hamano Subject: [PATCH v13 14/20] watchman: add a config option to enable the extension Date: Sun, 26 Jun 2016 00:14:18 -0400 Message-Id: <1466914464-10358-14-git-send-email-novalis@novalis.org> X-Mailer: git-send-email 2.8.0.rc4.20.g1d4f562 In-Reply-To: <1466914464-10358-1-git-send-email-novalis@novalis.org> References: <1466914464-10358-1-git-send-email-novalis@novalis.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: David Turner For installations that have centrally-managed configuration, it's easier to set a config once than to run update-index on every repository. Signed-off-by: David Turner Signed-off-by: Junio C Hamano --- .gitignore | 1 + Documentation/config.txt | 4 ++++ Makefile | 1 + read-cache.c | 6 ++++++ t/t1701-watchman-extension.sh | 37 +++++++++++++++++++++++++++++++++++++ test-dump-watchman.c | 16 ++++++++++++++++ 6 files changed, 65 insertions(+) create mode 100755 t/t1701-watchman-extension.sh create mode 100644 test-dump-watchman.c diff --git a/.gitignore b/.gitignore index b92f122..e6a5b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -188,6 +188,7 @@ /test-dump-cache-tree /test-dump-split-index /test-dump-untracked-cache +/test-dump-watchman /test-fake-ssh /test-scrap-cache-tree /test-genrandom diff --git a/Documentation/config.txt b/Documentation/config.txt index 2cd6bdd..15001ce 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1848,6 +1848,10 @@ imap:: The configuration variables in the 'imap' section are described in linkgit:git-imap-send[1]. +index.addwatchmanextension:: + Automatically add the watchman extension to the index whenever + it is written. + index.version:: Specify the version with which new index files should be initialized. This does not affect existing repositories. diff --git a/Makefile b/Makefile index 7f4ab41..25ab7b4 100644 --- a/Makefile +++ b/Makefile @@ -599,6 +599,7 @@ TEST_PROGRAMS_NEED_X += test-delta TEST_PROGRAMS_NEED_X += test-dump-cache-tree TEST_PROGRAMS_NEED_X += test-dump-split-index TEST_PROGRAMS_NEED_X += test-dump-untracked-cache +TEST_PROGRAMS_NEED_X += test-dump-watchman TEST_PROGRAMS_NEED_X += test-fake-ssh TEST_PROGRAMS_NEED_X += test-genrandom TEST_PROGRAMS_NEED_X += test-hashmap diff --git a/read-cache.c b/read-cache.c index bc3c989..8141559 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2436,6 +2436,7 @@ static int do_write_index(struct index_state *istate, int newfd, int entries = istate->cache_nr; struct stat st; struct strbuf previous_name_buf = STRBUF_INIT, *previous_name; + int watchman = 0; for (i = removed = extended = 0; i < entries; i++) { if (cache[i]->ce_flags & CE_REMOVE) @@ -2459,6 +2460,11 @@ static int do_write_index(struct index_state *istate, int newfd, if (istate->version == 3 || istate->version == 2) istate->version = extended ? 3 : 2; + if (!git_config_get_bool("index.addwatchmanextension", &watchman) && + watchman && + !the_index.last_update) + the_index.last_update = xstrdup(""); + hdr_version = istate->version; hdr.hdr_signature = htonl(CACHE_SIGNATURE); diff --git a/t/t1701-watchman-extension.sh b/t/t1701-watchman-extension.sh new file mode 100755 index 0000000..71f1d46 --- /dev/null +++ b/t/t1701-watchman-extension.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +test_description='watchman extension smoke tests' + +# These don't actually test watchman interaction -- just the +# index extension + +. ./test-lib.sh + +test_expect_success 'enable watchman' ' + test_commit a && + test-dump-watchman .git/index >actual && + echo "last_update: (null)" >expect && + test_cmp expect actual && + git update-index --watchman && + test-dump-watchman .git/index >actual && + echo "last_update: " >expect && + test_cmp expect actual +' + +test_expect_success 'disable watchman' ' + git update-index --no-watchman && + test-dump-watchman .git/index >actual && + echo "last_update: (null)" >expect && + test_cmp expect actual +' + +test_expect_success 'auto-enable watchman' ' + test_config index.addwatchmanextension true && + test_commit c && + test-dump-watchman .git/index >actual && + echo "last_update: " >expect && + test_cmp expect actual +' + + +test_done diff --git a/test-dump-watchman.c b/test-dump-watchman.c new file mode 100644 index 0000000..0314fa5 --- /dev/null +++ b/test-dump-watchman.c @@ -0,0 +1,16 @@ +#include "cache.h" +#include "ewah/ewok.h" + +int main(int argc, char **argv) +{ + do_read_index(&the_index, argv[1], 1); + printf("last_update: %s\n", the_index.last_update ? + the_index.last_update : "(null)"); + + /* + * For now, we just dump last_update, since it is not reasonable + * to populate the extension itself in tests. + */ + + return 0; +} -- 1.9.1