From patchwork Sat Nov 10 05:46:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10676889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71BFD109C for ; Sat, 10 Nov 2018 05:46:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D4762E3F4 for ; Sat, 10 Nov 2018 05:46:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C55C2E3DC; Sat, 10 Nov 2018 05:46:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7FAE2E3DC for ; Sat, 10 Nov 2018 05:46:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728895AbeKJPaj (ORCPT ); Sat, 10 Nov 2018 10:30:39 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:35500 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728580AbeKJPaj (ORCPT ); Sat, 10 Nov 2018 10:30:39 -0500 Received: by mail-lf1-f65.google.com with SMTP id e26so1046035lfc.2 for ; Fri, 09 Nov 2018 21:46:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PRAk8EByl87gQ3pIkj8Qaq2NEOT2THURhj3uc2Y+9dk=; b=DaamNcrUhXUlDXyo8YvW3Bvs828n3JoW9+QFEKMFenQ+scgPBIKNQlwHf550jk9gd5 +LdDQRgLcHCl+YZYQUPCu0nx7pzDKt3y3fZfNiZXXWajKB3t/Y3j1KJiwdbxS5y2RlLZ +5+LEvF1cGpMJUc7rfsypFE1QusYGf2+lydsuYxo8jB5QGBtbLDAJi4CyJJ4KvWGhWqE Q/fqysCMoKSVFRuO9pLiwunXz7xxcc0Dsvk/RriqXGzMUMxBVm99nid/iiIaMsC1ZSVB hNSNMRvj1Nibv3qS8Nh7yc2P6Lb03D0S94izppHq5TpY6mwNiRgwKN7uazE+ew2614cl lpeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PRAk8EByl87gQ3pIkj8Qaq2NEOT2THURhj3uc2Y+9dk=; b=BpcZCt3XvRxjq9MB1rj6TnMiLCSv8JL2ZlBztlA1s7ywprSZVSS6C9fZ6/6VFRh74+ Oa/wEeT1wHoLzCJujNNJyJr154GWAD7hKCECYrw/Zwfjp4X3eLpjjSCcdM5yTn8lcRKg 9UcUTo/CjLkE4Zq0GekZgZSsxt1qBLtNnFmUeLcsIolOvcuNrxUvFmA/3zGSkbzIlB6M r8cvxJ0y5Ef2UCPbsJJTwb7L3lID7skoo6GfiF9AeTxS8iI3kUatsSRXajynupVnGSC6 35X3Kt/yOtyP7KYmJ3fOA38CkUHcZ4zb6juqtssK3YLoLKovTOrbncLNY2J9JZOFHltl smCw== X-Gm-Message-State: AGRZ1gKHSwOolJb2H/A00v+ggfREKGQ7jRG0B0lBUJmW441OW9H7uheJ FLpnShtJusnn3JFjLPF6VunAMffy X-Google-Smtp-Source: AJdET5fgatzw9bFHHL17styzI1Yb00BjQv9qvr/Khrl7L9XNUEnpVBg1Jhq3Uw+F16kiZFZ6ExjtKA== X-Received: by 2002:a19:641d:: with SMTP id y29mr6844121lfb.14.1541828812256; Fri, 09 Nov 2018 21:46:52 -0800 (PST) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id g2-v6sm2441597ljg.9.2018.11.09.21.46.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 21:46:51 -0800 (PST) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= Subject: [PATCH 00/22] Kill the_index part 5 Date: Sat, 10 Nov 2018 06:46:23 +0100 Message-Id: <20181110054646.10149-1-pclouds@gmail.com> X-Mailer: git-send-email 2.19.1.1231.g84aef82467 MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I lied about part 5 being final. This series contains most of my WIP series [2] except sha1-name.c, read-cache.c and merge-recursive.c because there will be conflicts on 'pu' so they will be in part 6. At least this only results in two small conflicts in sequencer.c. I did start pushing the_repository out of library code [1] in the bottom half of this series. There aren't big surprises except that cache-tree API now take _both_ struct repository and struct index_state. The reason is cache-tree can work on temporary indexes and repo->index is about $GIT_DIR/index. [1] Stefan and I make a good team. He keeps adding the_repository. I keep removing. We both hold hands leading commit counts (with Brian just a bit behind frantically replacing sha1 with oid to keep up). Meanwhile Junio is crying in the corner because of too many conflicts. :-D [2] https://public-inbox.org/git/20181019145237.16079-1-pclouds@gmail.com/ Nguyễn Thái Ngọc Duy (22): wt-status.c: remove implicit dependency on the_index wt-status.c: remove implicit dependency the_repository list-objects-filter.c: remove implicit dependency on the_index list-objects.c: reduce the_repository references notes-merge.c: remove implicit dependency on the_index notes-merge.c: remove implicit dependency the_repository transport.c: remove implicit dependency on the_index sequencer.c: remove implicit dependency on the_index sequencer.c: remove implicit dependency on the_repository blame.c: remove implicit dependency the_repository bisect.c: remove the_repository reference branch.c: remove the_repository reference bundle.c: remove the_repository references cache-tree.c: remove the_repository references delta-islands.c: remove the_repository references diff-lib.c: remove the_repository references line-log.c: remove the_repository reference notes-cache.c: remove the_repository references pack-check.c: remove the_repository references pack-*.c: remove the_repository references rerere.c: remove the_repository references rebase-interactive.c: remove the_repository references bisect.c | 48 ++-- bisect.h | 5 +- blame.c | 39 +-- branch.c | 21 +- branch.h | 8 +- builtin/am.c | 4 +- builtin/bisect--helper.c | 2 +- builtin/branch.c | 6 +- builtin/bundle.c | 7 +- builtin/checkout.c | 5 +- builtin/commit.c | 8 +- builtin/fsck.c | 3 +- builtin/merge-ours.c | 2 +- builtin/merge.c | 2 +- builtin/notes.c | 2 +- builtin/pack-objects.c | 6 +- builtin/pull.c | 3 +- builtin/push.c | 3 +- builtin/read-tree.c | 4 +- builtin/rebase--interactive.c | 19 +- builtin/rebase.c | 13 +- builtin/rerere.c | 10 +- builtin/reset.c | 4 +- builtin/revert.c | 8 +- bundle.c | 26 +- bundle.h | 9 +- cache-tree.c | 26 +- cache-tree.h | 4 +- combine-diff.c | 2 +- delta-islands.c | 24 +- delta-islands.h | 9 +- diff-lib.c | 7 +- diff.c | 12 +- diff.h | 5 +- diffcore-pickaxe.c | 4 +- grep.c | 2 +- line-log.c | 2 +- list-objects-filter.c | 10 +- list-objects-filter.h | 2 + list-objects.c | 13 +- notes-cache.c | 12 +- notes-cache.h | 6 +- notes-merge.c | 16 +- notes-merge.h | 5 +- pack-bitmap-write.c | 6 +- pack-bitmap.c | 13 +- pack-bitmap.h | 3 +- pack-check.c | 9 +- pack-objects.c | 6 +- pack-objects.h | 5 +- pack.h | 4 +- read-cache.c | 2 +- rebase-interactive.c | 6 +- rebase-interactive.h | 5 +- ref-filter.c | 2 +- rerere.c | 26 +- rerere.h | 6 +- sequencer.c | 453 +++++++++++++++++++--------------- sequencer.h | 27 +- transport.c | 9 +- transport.h | 3 +- unpack-trees.c | 2 +- userdiff.c | 5 +- userdiff.h | 4 +- wt-status.c | 94 ++++--- wt-status.h | 21 +- 66 files changed, 650 insertions(+), 489 deletions(-)