From patchwork Thu Mar 13 23:57:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14016095 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 244DD2E3367 for ; Fri, 14 Mar 2025 00:01:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910504; cv=none; b=c1Kwpk9+hDkkJaR6eEGqlodLZE2AadJFOIJKxJWlpuFmiX0G+DqX42KiGYws8xfXvvWQTviMsDEqDJKNdroAF3aJm1sbpSwAkD991mA3GJnPPC/3l/e/3q11FrlLwKY3g2vR0KfIuRdw+ZN5etfEVlctxXPn639atWTZXRXj/dA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910504; c=relaxed/simple; bh=9Oixtf8VtLt11mtugwndN5WDyIGQO6bIWKsWs5kuz2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IoiG7mnAZPVGnFjr+KPYq8j5jsNbELlkWooBEzThJSsNXUGoYf0c2OfsqDJ3NQLt9pa7uIqrRA9BH7c//e5KwcxcjUxTwhP1wsZY5g4h56xQ6xDF9gY1lLjKZU6vFLDYeMZxnefxrxbKb9Gnlj+ezf0zw52td6a05ZajTdfyk4o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jQHeG5Kd; arc=none smtp.client-ip=209.85.210.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jQHeG5Kd" Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-72726025fa5so407135a34.0 for ; Thu, 13 Mar 2025 17:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741910502; x=1742515302; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UNuZlJ4W5k6Ov8daMR9JpIecLLiQjZVFryYurms4G8k=; b=jQHeG5KdM9PGK20UyqjWciHe+vCRPz4XYzCABsR12M5fyz+UkOPfxQH0BhRHd5RlzT NVry6DqxzZ1FxsKRgPosdraHeczTtqgEFiNXbDMAAPwNo2SUCf7UWNGv6NnWmBVEUlZZ ysERX+5QoAdjWNfQPaePGz3/GsgnwxWkWV7P4x5gPgt/TTjwzUQGGkWh2Ht1C4j0AKrU 0CMhgbyaqV2ZO8tbBNu9yR3xg5cerhpfQivDOam4+GzGa0YpJ4CM3A+O3rsuFjn+MPWe MCy4vYS1LuwvHy0fYj3DUqNWnwUa7j2HJ0YRL+8Ibk5nqW+Aet1Jd5hdFRLe3xgkRvge BhSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741910502; x=1742515302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UNuZlJ4W5k6Ov8daMR9JpIecLLiQjZVFryYurms4G8k=; b=OyFF+HCU7zgRcZsZGNka3rtOSS5TqAn5pE4Z+zxXShPMYWABAoKzlpISjaWfdLsybt tfmKc5qdvWCiZRN1pX9QeuNh+p5RUJ81vcTHq+lOuZr/C8dGnCa3M0p4GGKcyj8jZOUt hJu6/WtvO/Bq40fGokMGnQgIhwvB9WHpshufwA9VII+fxdMAc68smOjfWyd9aUhK/338 zDWWfjF/8vxWm3FDdKF/O9jiRD9Dg/ZmYLqPnu9PiMqhHW5JfLQwyWOATiS6+Gv8hfWL tz29ayDGV7ZiZzN2yc23eJRQwAaOJGAZFUjvLTdE58YNBaavMRoWAC2swIgissTItWi7 5Epg== X-Gm-Message-State: AOJu0Yw6iagZ0k62FMXKRPyA85xFUraDaLvwolQj8mIu+zeLHbvcP6RX W+CvB1KqXrHfRneoOduN1CW4CQJbn3Jt9f188orp4kJ+ZCU4KvXqS1SIPg== X-Gm-Gg: ASbGncvhUetRr/eYcKfguUzHRAApHUWdXKO9fQJjTL89OasGApcyCNL39mpyW47N5VK nk99TB4pMa10aosBjrCKagF53LQMfLZPHTWBxjGhklFSRkrNc3nLikNmrYhchLeM0r5XuNWJbZ4 tBhGBawsSRr2IdUZiQaWFUbRj9hSnCbcifbA1WQp3JLj9Xc71QNW1Qj4/dmD1f6/w2bku8cH71C hxW9xDhSeBqO7pS4oQhFF2rPBHEUUIKhtOZ+ilj5oqlnhvsF+emX6HSOYqwSS/qSatHZtaFrhHF hQonNo/rZIzv+a4luKmLiPbtVlzwhx8sDSUE29PxVvF7ZIgDVxe7 X-Google-Smtp-Source: AGHT+IFdS2hMVBk9twn6yKuGYc83t+KBif3xvlOw12Xj4u38ePSp9nRkPzmRA35XyRosXf+YHQsvvg== X-Received: by 2002:a05:6830:43a2:b0:72b:a3f3:deb6 with SMTP id 46e09a7af769-72bbc200fe6mr212088a34.4.1741910501747; Thu, 13 Mar 2025 17:01:41 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e973sm423485a34.43.2025.03.13.17.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 17:01:39 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, peff@peff.net, ben.knoble@gmail.com, Justin Tobler Subject: [PATCH v3 1/6] rev-list: inline `show_object_with_name()` in `show_object()` Date: Thu, 13 Mar 2025 18:57:42 -0500 Message-ID: <20250313235747.9583-2-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250313235747.9583-1-jltobler@gmail.com> References: <20250313001706.3390502-1-jltobler@gmail.com> <20250313235747.9583-1-jltobler@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The `show_object_with_name()` function only has a single call site. Inline call to `show_object_with_name()` in `show_object()` so the explicit function can be cleaned up and live closer to where it is used. While at it, factor out the code that prints the OID and newline for both objects with and without a name. In a subsequent commit, `show_object()` is modified to support printing object information in a NUL-delimited format. Signed-off-by: Justin Tobler --- builtin/rev-list.c | 13 +++++++++---- revision.c | 8 -------- revision.h | 2 -- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index bb26bee0d4..dcd079c16c 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -357,10 +357,15 @@ static void show_object(struct object *obj, const char *name, void *cb_data) return; } - if (arg_show_object_names) - show_object_with_name(stdout, obj, name); - else - printf("%s\n", oid_to_hex(&obj->oid)); + printf("%s", oid_to_hex(&obj->oid)); + + if (arg_show_object_names) { + putchar(' '); + for (const char *p = name; *p && *p != '\n'; p++) + putchar(*p); + } + + putchar('\n'); } static void show_edge(struct commit *commit) diff --git a/revision.c b/revision.c index c4390f0938..0eaebe4478 100644 --- a/revision.c +++ b/revision.c @@ -59,14 +59,6 @@ implement_shared_commit_slab(revision_sources, char *); static inline int want_ancestry(const struct rev_info *revs); -void show_object_with_name(FILE *out, struct object *obj, const char *name) -{ - fprintf(out, "%s ", oid_to_hex(&obj->oid)); - for (const char *p = name; *p && *p != '\n'; p++) - fputc(*p, out); - fputc('\n', out); -} - static void mark_blob_uninteresting(struct blob *blob) { if (!blob) diff --git a/revision.h b/revision.h index 71e984c452..21c6a69899 100644 --- a/revision.h +++ b/revision.h @@ -489,8 +489,6 @@ void mark_parents_uninteresting(struct rev_info *revs, struct commit *commit); void mark_tree_uninteresting(struct repository *r, struct tree *tree); void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees); -void show_object_with_name(FILE *, struct object *, const char *); - /** * Helpers to check if a reference should be excluded. */ From patchwork Thu Mar 13 23:57:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14016096 Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBD3C6125 for ; Fri, 14 Mar 2025 00:01:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910506; cv=none; b=GMqsFtQ6M4H42R9Sj7p/BAcL48nhSU4y/i2GytkkhE++iUE6AncSxm39KP9XeHl7vKZdyJIPiJ2oS3HLDGOZvV9AtOnrd6LgxhiEjtiZCchSEWW2gEaSqm5iyGUtCWPcXRqbmEMTYDiJi2l3YFr4KqvL7cjol+xzJQfhXDzW5rE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910506; c=relaxed/simple; bh=opPvqbuSojM7C18Au7j9w0k+hzvHe5F6EHrCLfwU8KE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BlUSktoIFBXwM6wdXL6llAEi1gIuWxOMy80mNuZUxEFfuzTGyLLtTMxfyaK4MQ6I6x0ZXCzyrwwEXURQuah0IVCPhOM9Ma0x7FKUN3nQhPWwK/BKcYOkIVa4t8UMSZqmzWJLuO9M2hKWB0+KUP9u9aEOUhEJWTBI6dgvTEmq1jo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GZh5S/9s; arc=none smtp.client-ip=209.85.210.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GZh5S/9s" Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-72726a65cbaso1044736a34.0 for ; Thu, 13 Mar 2025 17:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741910503; x=1742515303; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lFid9FOUBgE6oHvchTwDzqtDPMt9SuyhXyG5MJ9m4c4=; b=GZh5S/9sddXdcfK+Y+tghBBW6bZVlQpKPGDxKhX8iFwYGnWWp9Z0ypGOWRY/7Fmy7k cy1GC65YznxVhGa427ZHTuyuTp1T0PYRhZweEZenYBb0w4iQCSjblfesFdt55ecpSkam gfDnblmSP/wwrrBc96/oEJNMye8H/TQvnkuuizRHq0bXSoYJQbJsvqXd9pdA1+nRBU8G Yyvjjroz5J1G9is+91u59NguG7TBnaPhpcre3uHZJyWn11vvWmVmYQY0V41q8vOzdU/A 0VuxNbYA/0SsWRzSkBXz8EvvWO2m/+VsP32A5PzEjhNtub2sxOFM0Uuc+QyugWP4HT6t vMEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741910503; x=1742515303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lFid9FOUBgE6oHvchTwDzqtDPMt9SuyhXyG5MJ9m4c4=; b=XotBVdDsQfeIHd4ORAwfvjWVZft3z3DQRyyHr0Rfd0HzpNrJ380Llr9e389Pk3A0vK D9172iTUY6ufAAWrRHccoRwHUnSSJDDESPwpqIYwIuWOQwWnJpJa+8ncWVoUsavRIjhf 6nKGuPVocS2JgUU4QCeav4M0KaQc5DDDni7g+t+AEzuD9xJgH22291amBLAy3REy5yXL 4g75ekRJV9ZADnZBPIgpndjOUCfJexmSE1MaUcFeCagcTd1wDIwUqzdm0GzwMY/8opV5 mywlfgaBqx3fWC2NcSpxzoz2piNRCFYtSCOFDEhuev4oqeQ05srJLjSGIpoQlc/VvcfU i7Bg== X-Gm-Message-State: AOJu0Yy4Z839s9GBWFvAFFY29oxT9ZUcQdknBMFDECDOX/0DyYCT9R7T xN6xGEAJmI2DnHsAwo0c6kFewbkGYubGfC8s7o/qAPYOQPcOBCtBRUOQRg== X-Gm-Gg: ASbGncuFrs3Qgnzm9W51TOHlOX4B80BpxpxJuefaspsSX9W1+kQnGVdKqmOmnNASP5d xAOhevmr8cKZtdh1hP1pZTC3M54GtW8QCgz+4VeZ1GMGEsTP4Nt22cZVXriiOx8Ev4dmKNuJ5mE 8h5lpUFQTexPsjfrECK/PBPmZro+f3TYMA51lUnFasieVMqlysR6q2FhdVVmpxwWqtlNE2lCjCz 8P6dtHP0cT9fbsH/YKc4n9CFIKSxUv8pNDtQy1kOwKfMHcuJvIPS6a1fZ5+u7SV8WBV+BAU7sXV 6z2uF2kr0MPuz5ardQ+X2pkFKbWlRAtVNuFvIJqfiqfL8aVbtXCI X-Google-Smtp-Source: AGHT+IEAwhe15YGMuqY4OplZv+lxUEsA8kHKx2IKkR273OGEhPbbL2qCVrEUKA0/Z7iX4LVPtuXf0g== X-Received: by 2002:a05:6830:6995:b0:72a:3a7:a07c with SMTP id 46e09a7af769-72bbc254470mr249406a34.13.1741910503357; Thu, 13 Mar 2025 17:01:43 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e973sm423485a34.43.2025.03.13.17.01.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 17:01:42 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, peff@peff.net, ben.knoble@gmail.com, Justin Tobler Subject: [PATCH v3 2/6] rev-list: refactor early option parsing Date: Thu, 13 Mar 2025 18:57:43 -0500 Message-ID: <20250313235747.9583-3-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250313235747.9583-1-jltobler@gmail.com> References: <20250313001706.3390502-1-jltobler@gmail.com> <20250313235747.9583-1-jltobler@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Before invoking `setup_revisions()`, the `--missing` and `--exclude-promisor-objects` options are parsed early. In a subsequent commit, another option is added that must be parsed early. Refactor the code to parse both options in a single early pass. Signed-off-by: Justin Tobler --- builtin/rev-list.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index dcd079c16c..04d9c893b5 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -16,6 +16,7 @@ #include "object-file.h" #include "object-store-ll.h" #include "pack-bitmap.h" +#include "parse-options.h" #include "log-tree.h" #include "graph.h" #include "bisect.h" @@ -639,19 +640,15 @@ int cmd_rev_list(int argc, if (!strcmp(arg, "--exclude-promisor-objects")) { fetch_if_missing = 0; revs.exclude_promisor_objects = 1; - break; - } - } - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; - if (skip_prefix(arg, "--missing=", &arg)) { - if (revs.exclude_promisor_objects) - die(_("options '%s' and '%s' cannot be used together"), "--exclude-promisor-objects", "--missing"); - if (parse_missing_action_value(arg)) - break; + } else if (skip_prefix(arg, "--missing=", &arg)) { + parse_missing_action_value(arg); } } + die_for_incompatible_opt2(revs.exclude_promisor_objects, + "--exclude_promisor_objects", + arg_missing_action, "--missing"); + if (arg_missing_action) revs.do_not_die_on_missing_objects = 1; From patchwork Thu Mar 13 23:57:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14016097 Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 320812E3385 for ; Fri, 14 Mar 2025 00:01:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910508; cv=none; b=c8FkqGFGIi+9BCJibkdJFm24I7qKI1NZXPXJzLAnkD/RR3RB6XYQoS25jZXio69ciGzbZY1CRE1k8mmCZbipqagWM4BwNMIhSxvdq/AJh9z2psHlE05szLJeCFU+WlelC0zI/+swX0/3VgliKqU1Mf+yMKjfSrJwSZaVCPh+nvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910508; c=relaxed/simple; bh=XW5L3G90FzM5AEckAAFfWU3a2fE6OjPX2Pq2jhr5/c8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cWoaWof/9dbASwtS508SGYkcF6Hv/G4ORvAZA/uU7IzITEHYynZTuwONOIQ0WIm8dmm68VjHH6jcp3cztmSqhwvSa58QMQr4kZ/gR+ZcJXJTNOA/n+o09474QjOv1hez4r6wnPQIVOfLlDFr+fczNE/UiAdr5Em68uNMyQDZwpw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bKermL53; arc=none smtp.client-ip=209.85.210.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bKermL53" Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-72736498817so917488a34.1 for ; Thu, 13 Mar 2025 17:01:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741910505; x=1742515305; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=doN1OqOqzF/i94F7+VO7WMeXNO5T3b3R+IP2A8tbVIw=; b=bKermL53YkHvse9XyqHPq1KHwxNNWsRCGbSMKD7C6Y5w0/pMBmTsgqQEUI/N5sYRAa cDQr9RlaCXb2Mu/EIQ2Y9tYIJQOJyvP8I6Rh9dsoanohYLFUZ8wdZBaUOhtVoTKUDzeL 6iGoI67P+h+1VzcG5ukjLUav8yvAwwo1u/DfLOJYXVacztdGZwpDz6WZma8v9q6JJPkL gumCMPZtrtNgKZtCUDd2PSYoUY8MTq2KMvgr/KyTMdCHL2eJWGPLia/BPkdhnF6Iddt0 M/2NxcdTsyavuSZAQDGvbSOtmZ3Uu8mDC39Dfnasz4kAd//ANckGNX6gYME7LXx5CCBt o7wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741910505; x=1742515305; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=doN1OqOqzF/i94F7+VO7WMeXNO5T3b3R+IP2A8tbVIw=; b=XWisVVVSC1s/WvRBayiFlZ5aFvzN6BoDunUV3mLZpGLmYQSF7Jiq5RJq9kSZFmrTuU rzqGkfwBpi9binzTy5jRSG3iNMipHugnRZ7lxyEyBBfEaovi+C9XvI+aRdXTHphn7+3M tGils3dhIR8TF34bD3IkjZaE6GFtS3/l/CEi5gNzN9E7P0T+qgttymD1pLgQbPXnyYuu LkhXme4HnRl/TWpxirk3Dk7k9Zx6ud7xrbLDoVe3bJp3B6s+87F07NAp8kq+yJAlpA+J nGZN70JvEsuEfzhJGkCG1z+UKSAyMtL4/JR0w7WVuzmIUK5LVBtnvysOrQjzbhIh0Ncb cSLw== X-Gm-Message-State: AOJu0YzlYmm48Af+hM3+cmJQyBKBfBt1JmV++y8x1x4DAfXzz3yoj3h9 R/PvZcLNcVfXDiqFFrKqOjQodQ6q8Ae8EnDpk2l1HeJGMYrmWAwYENV3KQ== X-Gm-Gg: ASbGnctpUb9/kh0qMESWDC8NEfjzrqeGU4vXz9HtI+iRBK33VtYDxVeA8yTkXOX6Kwj 4mWFl8JsQQoTWPRM1N6nndFbc82ks42YfP31Zc2Xwz9jjoWWqK1zPomctWc81+qRRHD6EoIdUiC rygHo+enPwYzgoJKXv0SaaPU2y+p7YxKCjlnZJdxAIjnBn1W+DlZxZrDN4X9vGd4ziYmwwBc+KC RYvD+Y7vUealY38a+s2dAKvuoJn22lbULnhYZCroLEcJa+s/RarI46vcJfNoPUBEhTKJR6DFYJM NuuTIR9419J5mdOMY6RzpIK41tqJjFedEmEMEQajgDuYQyUnmv7m X-Google-Smtp-Source: AGHT+IGIi32I6zqxU5C5pw82cFaBLTJr7KrxU/4iQibF6lQ7iwTUEKP0AuA3Gx0VevjQffcqn4FOVg== X-Received: by 2002:a05:6830:4413:b0:72b:8f8b:33b with SMTP id 46e09a7af769-72bbc22c96cmr234825a34.10.1741910504946; Thu, 13 Mar 2025 17:01:44 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e973sm423485a34.43.2025.03.13.17.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 17:01:43 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, peff@peff.net, ben.knoble@gmail.com, Justin Tobler Subject: [PATCH v3 3/6] revision: support NUL-delimited --stdin mode Date: Thu, 13 Mar 2025 18:57:44 -0500 Message-ID: <20250313235747.9583-4-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250313235747.9583-1-jltobler@gmail.com> References: <20250313001706.3390502-1-jltobler@gmail.com> <20250313235747.9583-1-jltobler@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When `setup_revisions()` parses the `--stdin` option, revision and pathspec arguments are read from stdin. Each line of input is handled as a separate argument. Introduce the `nul_delim_stdin` field to `setup_revision_opt` that, when enabled, uses a NUL byte to delimit between stdin arguments instead of newline. Signed-off-by: Justin Tobler --- revision.c | 19 +++++++++++-------- revision.h | 3 ++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/revision.c b/revision.c index 0eaebe4478..5de6309830 100644 --- a/revision.c +++ b/revision.c @@ -2275,10 +2275,10 @@ int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsig return ret; } -static void read_pathspec_from_stdin(struct strbuf *sb, - struct strvec *prune) +static void read_pathspec_from_stdin(struct strbuf *sb, struct strvec *prune, + int line_term) { - while (strbuf_getline(sb, stdin) != EOF) + while (strbuf_getdelim_strip_crlf(sb, stdin, line_term) != EOF) strvec_push(prune, sb->buf); } @@ -2905,8 +2905,8 @@ static int handle_revision_pseudo_opt(struct rev_info *revs, return 1; } -static void read_revisions_from_stdin(struct rev_info *revs, - struct strvec *prune) +static void read_revisions_from_stdin(struct rev_info *revs, struct strvec *prune, + int line_term) { struct strbuf sb; int seen_dashdash = 0; @@ -2918,7 +2918,7 @@ static void read_revisions_from_stdin(struct rev_info *revs, warn_on_object_refname_ambiguity = 0; strbuf_init(&sb, 1000); - while (strbuf_getline(&sb, stdin) != EOF) { + while (strbuf_getdelim_strip_crlf(&sb, stdin, line_term) != EOF) { if (!sb.len) break; @@ -2946,7 +2946,7 @@ static void read_revisions_from_stdin(struct rev_info *revs, die("bad revision '%s'", sb.buf); } if (seen_dashdash) - read_pathspec_from_stdin(&sb, prune); + read_pathspec_from_stdin(&sb, prune, line_term); strbuf_release(&sb); warn_on_object_refname_ambiguity = save_warning; @@ -3019,13 +3019,16 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s } if (!strcmp(arg, "--stdin")) { + int term = opt && opt->nul_delim_stdin ? '\0' : '\n'; + if (revs->disable_stdin) { argv[left++] = arg; continue; } if (revs->read_from_stdin++) die("--stdin given twice?"); - read_revisions_from_stdin(revs, &prune_data); + read_revisions_from_stdin(revs, &prune_data, + term); continue; } diff --git a/revision.h b/revision.h index 21c6a69899..0e680c3667 100644 --- a/revision.h +++ b/revision.h @@ -439,7 +439,8 @@ struct setup_revision_opt { void (*tweak)(struct rev_info *); unsigned int assume_dashdash:1, allow_exclude_promisor_objects:1, - free_removed_argv_elements:1; + free_removed_argv_elements:1, + nul_delim_stdin:1; unsigned revarg_opt; }; int setup_revisions(int argc, const char **argv, struct rev_info *revs, From patchwork Thu Mar 13 23:57:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14016098 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40120134D4 for ; Fri, 14 Mar 2025 00:01:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910510; cv=none; b=l60f/UZLmhXKwBpF+Q+xwvBjBpZKHPIiiF270iTE8rZJafr7u1eGVi5JJh2AXChoORr01AZDv8mLuMHpe6SmstZkds6jqS9XHJP10TxXIEt2YMKp9GZxZ+D3MWO9utey1Hgc8Csd8nDCWk9xx7tSax5p6RQqYkhTFAmo55OFW6E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910510; c=relaxed/simple; bh=5RX2FQog4BdnWcv9Aziv1UKbUYW647SNrEAo7tDP85I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XHHe+3WjmsieD1EJsFiS7NmVBBqet0tnL+TdpVlq5oj4d6EY6UapMhUIZyJRP6J4bK0Fvzsse30xeR3tMD9W8aGUF4zFiKYElXLYJv3hlz5NkgSTPF+/326sYfKMXY9+lPVlWoFiyvsjMfPSyUKCzpkyr/D8+5FYIoGqtbuCQyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ac3HlXSO; arc=none smtp.client-ip=209.85.210.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ac3HlXSO" Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-71fbb0d035dso1102146a34.2 for ; Thu, 13 Mar 2025 17:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741910507; x=1742515307; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qp/lOqlelI6+YDHbYkUf4MK0mousxO5kVRQKYpeC4ac=; b=ac3HlXSOGvIwMJcPH+KoOl3Y2YZvXo0xp5jyAImaeIbzfE2jb29TXSLOM2sXkmXRfD ADnssa0X+9FWw+ZLjj/7AGDbetIhdOVXWjM+pmJ3lplJ9ayZGzFQnhY/BEkqgQvTsR5P 56kdhNUcHnq2WbWGyOgLSd3/an1JlZig/og0gIkRoKStKt78FxEhjHYvzy8HOv9i8gqQ shzULsN8pUtLyjGq8GvXM4bHhiltHVeU8fDvm9H/LfhSP6SZPm2ft5QBYrMxZGAIB0KE SJEQO9MjfPlQVOnVW17en23Vj6enY5mvenN/MKGEh/nbGykC95mFQTWKMAXLA+3m8L09 OPyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741910507; x=1742515307; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qp/lOqlelI6+YDHbYkUf4MK0mousxO5kVRQKYpeC4ac=; b=Jg7kz2oU6erfhEhcDxAqpxQG6N8CygrebYmbmMCgDAjG8V1rhuwWAT8h7MwlrH1WR0 +zeL6la2VRbgckiK9LJFXv/9oe2M5qxOAyBhaAvtgTrN8jU3Lk5XKdJgKbDZUF4TuMUw TYK9QEbzNDL4XEm/0+ncUY9BQnXSC8lYwX3Th8b1eG8r5F+r4ZdFxQtE6tx5khIM52s+ T4pRVEEymK7E3dbEIxgvCtv1CYF7XeCSR4hfNGMC9x2p0Pc2dzXg3g9HQoKIkpjmEOHl SDyhCu+H/oqaJkC8jbcSnjCKTSIi7fxJNpgmT8N0S3SluMYEjr4mn0dg1VDZqv9X2eSL h1tA== X-Gm-Message-State: AOJu0Yz5iot0/r9Cx8oH/geBEyIjilkXH8ETJKRjlBSKSxar9jhYsCaR cWwvda4IceXkDkSQB+X9aNzeYRP/MbXxgbNT9FWvqiNt4UlD9fjO+/Chkg== X-Gm-Gg: ASbGncsZxsGad7D7jHs1kgnQbIss1YbX2NfO+Hntbj5f/6h38ZCUGo3HtzhUo5KR9Mu EcF0cSzaItOF/RDKh/OPmXvS2P7VcmOy244F1L9Juna7hjTFvaDVNkHJuQdjL3aGiPyoLUJpe9q xM2Cobu4JvswQQKSansBnQQsgSe/USkpSp4Zlz2HyjjT0TiAs4EMQOZyoKV9eH2KY750AubAWc8 knVfxnpAaL8ay1DPex17SwtZDytgSsos6/xn97QFBrlfU207ozaUJXKJogMxtgDgy4sa0tDoqN5 53q49h/6F1+wbfd504Ihk1ImIyTgYEwBpBXZB9kc1CjiVfUHI0ea X-Google-Smtp-Source: AGHT+IFfoTOZ2XeS5aafJ7utXyE2QyW7p4tKRVI2vZ3o6Ao8itnvEZTkHzyZ7viHWoNd1chN1RXN/Q== X-Received: by 2002:a05:6830:921:b0:72b:8ec3:85a1 with SMTP id 46e09a7af769-72bbc1f67afmr200077a34.2.1741910507009; Thu, 13 Mar 2025 17:01:47 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e973sm423485a34.43.2025.03.13.17.01.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 17:01:45 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, peff@peff.net, ben.knoble@gmail.com, Justin Tobler Subject: [PATCH v3 4/6] rev-list: support delimiting objects with NUL bytes Date: Thu, 13 Mar 2025 18:57:45 -0500 Message-ID: <20250313235747.9583-5-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250313235747.9583-1-jltobler@gmail.com> References: <20250313001706.3390502-1-jltobler@gmail.com> <20250313235747.9583-1-jltobler@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When walking objects, git-rev-list(1) prints each object entry on a separate line. Some options, such as `--objects`, may print additional information about tree and blob object on the same line in the form: $ git rev-list --objects SP [] LF Note that in this form the SP is appended regardless of whether the tree or blob object has path information available. Paths containing a newline are also truncated at the newline. Introduce the `-z` option for git-rev-list(1) which reformats the output to use NUL-delimiters between objects and associated info in the following form: $ git rev-list -z --objects NUL [path= NUL] In this form, the start of each record is signaled by an OID entry that is all hexidecimal and does not contain any '='. Additional path info from `--objects` is appended to the record as a token/value pair `path=` as-is without any truncation. In this mode, revision and pathspec arguments provided on stdin with the `--stdin` option are also separated by a NUL byte instead of being newline delimited. For now, the `--objects` and `--stdin` flag are the only options that can be used in combination with `-z`. In a subsequent commit, NUL-delimited support for other options is added. Other options that do not make sense with be used in combination with `-z` are rejected. Signed-off-by: Justin Tobler --- Documentation/rev-list-options.adoc | 23 ++++++++++++++++++ builtin/rev-list.c | 36 +++++++++++++++++++++++++---- t/t6000-rev-list-misc.sh | 35 ++++++++++++++++++++++++++++ t/t6017-rev-list-stdin.sh | 9 ++++++++ 4 files changed, 98 insertions(+), 5 deletions(-) diff --git a/Documentation/rev-list-options.adoc b/Documentation/rev-list-options.adoc index 785c0786e0..14d82fdfbf 100644 --- a/Documentation/rev-list-options.adoc +++ b/Documentation/rev-list-options.adoc @@ -361,6 +361,29 @@ ifdef::git-rev-list[] --progress=
:: Show progress reports on stderr as objects are considered. The `
` text will be printed with each progress update. + +-z:: + Instead of being newline-delimited, each outputted object and its + accompanying metadata is delimited using NUL bytes. In this mode, when + the `--stdin` option is provided, revision and pathspec arguments on + stdin are also delimited using a NUL byte. Output is printed in the + following form: ++ +----------------------------------------------------------------------- + NUL [= NUL]... +----------------------------------------------------------------------- ++ +Additional object metadata, such as object paths, is printed using the +`=` form. Token values are printed as-is without any +encoding/truncation. An OID entry never contains a '=' character and thus +is used to signal the start of a new object record. Examples: ++ +----------------------------------------------------------------------- + NUL + NUL path= NUL +----------------------------------------------------------------------- ++ +This mode is only compatible with the `--objects` output option. endif::git-rev-list[] History Simplification diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 04d9c893b5..f048500679 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -65,6 +65,7 @@ static const char rev_list_usage[] = " --abbrev-commit\n" " --left-right\n" " --count\n" +" -z\n" " special purpose:\n" " --bisect\n" " --bisect-vars\n" @@ -97,6 +98,9 @@ static int arg_show_object_names = 1; #define DEFAULT_OIDSET_SIZE (16*1024) +static char line_term = '\n'; +static char info_term = ' '; + static int show_disk_usage; static off_t total_disk_usage; static int human_readable; @@ -264,7 +268,7 @@ static void show_commit(struct commit *commit, void *data) if (revs->commit_format == CMIT_FMT_ONELINE) putchar(' '); else if (revs->include_header) - putchar('\n'); + putchar(line_term); if (revs->verbose_header) { struct strbuf buf = STRBUF_INIT; @@ -361,12 +365,16 @@ static void show_object(struct object *obj, const char *name, void *cb_data) printf("%s", oid_to_hex(&obj->oid)); if (arg_show_object_names) { - putchar(' '); - for (const char *p = name; *p && *p != '\n'; p++) - putchar(*p); + if (line_term) { + putchar(info_term); + for (const char *p = name; *p && *p != '\n'; p++) + putchar(*p); + } else if (*name) { + printf("%cpath=%s", info_term, name); + } } - putchar('\n'); + putchar(line_term); } static void show_edge(struct commit *commit) @@ -642,6 +650,10 @@ int cmd_rev_list(int argc, revs.exclude_promisor_objects = 1; } else if (skip_prefix(arg, "--missing=", &arg)) { parse_missing_action_value(arg); + } else if (!strcmp(arg, "-z")) { + s_r_opt.nul_delim_stdin = 1; + line_term = '\0'; + info_term = '\0'; } } @@ -757,6 +769,20 @@ int cmd_rev_list(int argc, usage(rev_list_usage); } + + /* + * Reject options currently incompatible with -z. For some options, this + * is not an inherent limitation and support may be implemented in the + * future. + */ + if (!line_term) { + if (revs.graph || revs.verbose_header || show_disk_usage || + info.show_timestamp || info.header_prefix || bisect_list || + use_bitmap_index || revs.edge_hint || revs.left_right || + revs.cherry_mark || arg_missing_action || revs.boundary) + die(_("-z option used with unsupported option")); + } + if (revs.commit_format != CMIT_FMT_USERFORMAT) revs.include_header = 1; if (revs.commit_format != CMIT_FMT_UNSPECIFIED) { diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index 6289a2e8b0..dfbbc0aee6 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -182,4 +182,39 @@ test_expect_success 'rev-list --unpacked' ' test_cmp expect actual ' +test_expect_success 'rev-list -z' ' + test_when_finished rm -rf repo && + + git init repo && + test_commit -C repo 1 && + test_commit -C repo 2 && + + oid1=$(git -C repo rev-parse HEAD) && + oid2=$(git -C repo rev-parse HEAD~) && + + printf "%s\0%s\0" "$oid1" "$oid2" >expect && + git -C repo rev-list -z HEAD >actual && + + test_cmp expect actual +' + +test_expect_success 'rev-list -z --objects' ' + test_when_finished rm -rf repo && + + git init repo && + test_commit -C repo 1 && + test_commit -C repo 2 && + + oid1=$(git -C repo rev-parse HEAD:1.t) && + oid2=$(git -C repo rev-parse HEAD:2.t) && + path1=1.t && + path2=2.t && + + printf "%s\0path=%s\0%s\0path=%s\0" "$oid1" "$path1" "$oid2" "$path2" \ + >expect && + git -C repo rev-list -z --objects HEAD:1.t HEAD:2.t >actual && + + test_cmp expect actual +' + test_done diff --git a/t/t6017-rev-list-stdin.sh b/t/t6017-rev-list-stdin.sh index 4821b90e74..362a8b126a 100755 --- a/t/t6017-rev-list-stdin.sh +++ b/t/t6017-rev-list-stdin.sh @@ -148,4 +148,13 @@ test_expect_success '--not via stdin does not influence revisions from command l test_cmp expect actual ' +test_expect_success 'NUL-delimited stdin' ' + printf "%s\0%s\0%s\0" "HEAD" "--" "file-1" > input && + + git rev-list -z --objects HEAD -- file-1 >expect && + git rev-list -z --objects --stdin actual && + + test_cmp expect actual +' + test_done From patchwork Thu Mar 13 23:57:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14016099 Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C76101E50B for ; Fri, 14 Mar 2025 00:01:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910512; cv=none; b=XhoJq6JP2HNhXVZBKKawGRYPmuf8E1SMwckOcV6zAij32se0imHQpJoHXZXnYGG6N/49yFLhlkhHjjSjH39CJHCMFBa0hzWyoONXcZ7qNXWQt6zg6/yo8CyiduPZSpaxka0YkE0DMTVoBfrQG5ZeRQwSjSdqCy9997hw0M6X8v4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910512; c=relaxed/simple; bh=RDNGzbCsU3kCNV4aQC3gpVOyZI4Nw4JcEZrsQEskI5I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fzk7RkiCSIySTXDyy0OLxEh3WT94CdCz+I2M00XEyQQGP8KDvB6vtv3al3ReENFWZwyesVkojL6YDky+lVoH/fn2x7dEuLnIYT8BdwvNJ8Sgzfj5MsRsYmE8UGoxZMyfDuFz9jyoDVh0b2A1yP6USSwML6tVy9R9MNgxd53jqvc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iM+o8Rys; arc=none smtp.client-ip=209.85.160.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iM+o8Rys" Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-2bcc5c887efso1298895fac.2 for ; Thu, 13 Mar 2025 17:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741910509; x=1742515309; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5j143td9iLc7xHjexTds9sz9Dc0acNzIKSmWUTG6dcY=; b=iM+o8Rys8n1xf+C3jj0kWabhpcoIFjO7OmibfuqtVFaBs07uMDPd+w7e4wvIw9ZuC2 dw68xsKoN7N9be3743mIurcu7qnE/HTpeSAIpiOb4LszzLkU/JZOkd5Wntl0FAxLPsLX 8vyAxUeDbtZTFUJx0lEtn8DUZOmkvaE1Ra4bmbEtNXt7krvQhy6O0zMnEJjy6kLfOoG1 5RP6zA/67ZFFH39VMtBORc8aq4yjXHHdDHmYPB7L5Oz89AhxIwZ9ZnXAw5Uv9tgISJeB Tfih0rJaepHramIKePrLo0wBMUcKmAJnOgv+1pTKXHIjAt9OcbmIWMdZ0ty4kwdR4Uyy WsQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741910509; x=1742515309; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5j143td9iLc7xHjexTds9sz9Dc0acNzIKSmWUTG6dcY=; b=rbzJ0T+E4bYN/MhJsoyy51gZerPTpz7uyWi7eue4S6LNaO9eDqtLu6GkccDvbNmX9j 4lRn+03Ijh3R+O8GaaGki/pRTHnsCBMNOs0GSyNtseMGRSwmJqDYHBgblyekVVutU2qz ipll+8vr8934OGCN8zUVj601ZbWFz1OYhTKEVc0mKAdTIJdaBxrX9W7+nDrBiowFjLc2 tUc8F3SRwsknpNXNTYI1QHH39VAoLw8RbhIWYI3QqKvj5LQsfmXeIYg/JvFWSkZKws/w yTkvXmChKMaeYzGw4o8u7CNE7AFp7c4w8QevGjy0BpEkjDR/ccXpl8ZMoJvlFlwA7emR Mcfw== X-Gm-Message-State: AOJu0Yys2Z2XrdDxs5MyRD2RqutQCfo5fx9PK4sLdQmhXE/MB190xort 5/Az7jomgVpc55TrrMWtJ9B2zWDgadOvwxzZfFTwxwbi8ZRk/9T75V1yCw== X-Gm-Gg: ASbGnctdgKrRoH7KzpGmuh2nCK6IyI1rBtIALzCE75XPqy8KwbKB0seQrlJ8FRfL/IN gMjBA3rlsK2H46iUrVFiKQT83yQScwdEs6WqqVr+2p8upCUGNHedqWzolldExIejKUzPXRacmOa FKAMLUoceSn16xfAv4hjZxQ0wdO8WkISBNL3fB0UDvtusr04xSBVkE0EtQ5sGEgsCZu7infK2KU JI5wxg3j2VAhPs5UDOI7wmKlR6FK//oXpPWsgmJEprYT5tuFa9UhwfCcTFwA25pu4ASfCe6cvgq dQ3C2EMMUrvs3y+8K5q25HGLxAsuUlPob+H01OabIThK70RDykmN X-Google-Smtp-Source: AGHT+IGtqbIjYLifrGc+fB7pYaRzIsm4ej+ppIdOsWhdMTVwKV9teAmnMz9GN8Se880+Ur5dCvNO0Q== X-Received: by 2002:a05:6870:eca0:b0:2c2:343d:1368 with SMTP id 586e51a60fabf-2c69114d235mr340754fac.29.1741910509327; Thu, 13 Mar 2025 17:01:49 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e973sm423485a34.43.2025.03.13.17.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 17:01:47 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, peff@peff.net, ben.knoble@gmail.com, Justin Tobler Subject: [PATCH v3 5/6] rev-list: support NUL-delimited --boundary option Date: Thu, 13 Mar 2025 18:57:46 -0500 Message-ID: <20250313235747.9583-6-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250313235747.9583-1-jltobler@gmail.com> References: <20250313001706.3390502-1-jltobler@gmail.com> <20250313235747.9583-1-jltobler@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The `--boundary` option for git-rev-list(1) prints boundary objects found while performing the object walk in the form: $ git rev-list --boundary - LF Add support for printing boundary objects in a NUL-delimited format when the `-z` option is enabled. $ git rev-list -z --boundary NUL boundary=yes NUL In this mode, instead of prefixing the boundary OID with '-', a separate `boundary=yes` token/value pair is appended. Signed-off-by: Justin Tobler --- Documentation/rev-list-options.adoc | 12 +++++++----- builtin/rev-list.c | 9 +++++++-- t/t6000-rev-list-misc.sh | 16 ++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/Documentation/rev-list-options.adoc b/Documentation/rev-list-options.adoc index 14d82fdfbf..92ac31a8e8 100644 --- a/Documentation/rev-list-options.adoc +++ b/Documentation/rev-list-options.adoc @@ -373,17 +373,19 @@ ifdef::git-rev-list[] NUL [= NUL]... ----------------------------------------------------------------------- + -Additional object metadata, such as object paths, is printed using the -`=` form. Token values are printed as-is without any -encoding/truncation. An OID entry never contains a '=' character and thus -is used to signal the start of a new object record. Examples: +Additional object metadata, such as object paths or boundary objects, is +printed using the `=` form. Token values are printed as-is +without any encoding/truncation. An OID entry never contains a '=' character +and thus is used to signal the start of a new object record. Examples: + ----------------------------------------------------------------------- NUL NUL path= NUL + NUL boundary=yes NUL ----------------------------------------------------------------------- + -This mode is only compatible with the `--objects` output option. +This mode is only compatible with the `--objects` and `--boundary` output +options. endif::git-rev-list[] History Simplification diff --git a/builtin/rev-list.c b/builtin/rev-list.c index f048500679..7c6d4b25b0 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -240,13 +240,18 @@ static void show_commit(struct commit *commit, void *data) fputs(info->header_prefix, stdout); if (revs->include_header) { - if (!revs->graph) + if (!revs->graph && line_term) fputs(get_revision_mark(revs, commit), stdout); if (revs->abbrev_commit && revs->abbrev) fputs(repo_find_unique_abbrev(the_repository, &commit->object.oid, revs->abbrev), stdout); else fputs(oid_to_hex(&commit->object.oid), stdout); + + if (!line_term) { + if (commit->object.flags & BOUNDARY) + printf("%cboundary=yes", info_term); + } } if (revs->print_parents) { struct commit_list *parents = commit->parents; @@ -779,7 +784,7 @@ int cmd_rev_list(int argc, if (revs.graph || revs.verbose_header || show_disk_usage || info.show_timestamp || info.header_prefix || bisect_list || use_bitmap_index || revs.edge_hint || revs.left_right || - revs.cherry_mark || arg_missing_action || revs.boundary) + revs.cherry_mark || arg_missing_action) die(_("-z option used with unsupported option")); } diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index dfbbc0aee6..349bf5ec3d 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -217,4 +217,20 @@ test_expect_success 'rev-list -z --objects' ' test_cmp expect actual ' +test_expect_success 'rev-list -z --boundary' ' + test_when_finished rm -rf repo && + + git init repo && + test_commit -C repo 1 && + test_commit -C repo 2 && + + oid1=$(git -C repo rev-parse HEAD) && + oid2=$(git -C repo rev-parse HEAD~) && + + printf "%s\0%s\0boundary=yes\0" "$oid1" "$oid2" >expect && + git -C repo rev-list -z --boundary HEAD~.. >actual && + + test_cmp expect actual +' + test_done From patchwork Thu Mar 13 23:57:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14016100 Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61AB0B666 for ; Fri, 14 Mar 2025 00:01:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910516; cv=none; b=lzmId/Lr3tbHv7QIkhnFy6rJeKVNvPn1RVUvrp1eaZgWCrTH515vmcSCHiBkrhOhrA7EKFJXIS1oYE2M6ORHHBYx0Iij5NhxrITv2xXxOwlsmOaKCbgsrZ3hDaMv7ERvRCsf/KQaVgMhWTKHOqOvZFrQIQPITbaovdSOUv6I6PE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741910516; c=relaxed/simple; bh=88FZpwprawUSteQxa3xEbaTsl6pxzgSNK6v8lTNWCa0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HgqouZv0sfj3UvtJEtdgeSkVI/124y4kIENj8DpzD3pxGJZZdkSxkzF0uDt314GGHXhMbFYj1KEUHFVsRsmNFtEo/a1g/N3CbkSJ26ml2Id/tkImSirWNyxs/wonceTfNHaNHX9ezPiSFI/VqJdaHJAU3WyyVPzzddwh1qn4IKs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AcynQeiZ; arc=none smtp.client-ip=209.85.210.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AcynQeiZ" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-72726e4f96cso1082256a34.0 for ; Thu, 13 Mar 2025 17:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741910513; x=1742515313; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KHIaAkLgr1QyCTUkWHHHsjUZcVf5huqVvZpIuQz5XdU=; b=AcynQeiZ4yaLy0fUDrX7UaY2eDuAVO+SUhkDecuot9yvYwzj6KjFPN3pcyvV0MKwoj dsC45Frgrn3xMN2PKuwf+a7QBJwceuXxEmUmgtis4YHUoBgHjzITJ2vWm3WDkg5XGwwH RDdiOLRmc6T5A4BkvCUtF7NubCv2f5CgXb640Ydu0P+DUag3/DaZ548NmyL1tnCSU0qd B4ofhxBhE/kSH5XExaLtJc/ckd6vaOF7oGQjYdeSw14405Wcsxc2gRR9Q1ko3L6l2HdH s0TR/1up+FxBZKzwSuH67OR9wLadzz5JyZUGmLa6mJr6DpRdyYcK8j8hOQFvAQDZNZ0u WDPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741910513; x=1742515313; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KHIaAkLgr1QyCTUkWHHHsjUZcVf5huqVvZpIuQz5XdU=; b=wAi1iMUjJMWYxQj+ebeUWMb7Mjd6iUWZ+ZHpJkd0iu2wfjsk0kRRxGQqsI3ZYsf/Mw upHs8m5G+8Ms3pADQV2gC55jeDVZqozwLNYXPTnZDBzswlMliC5GdFW7GDsZTTDE1UIi Rx7ZYtyC8N/qk4mUQFLRGA+VSZnrOZOOYVOIvz4+uGlbTNwH9+rEhAkJls/zZShDoNUa lQEtBIlKJozHw4sKo2bLSHJaKlRtZ/997oIIkzDnaLTQJWVd9rCXhEFvzFH3537Bt53V QN0tkyiMU5rwNbbTrP0VMCaWVrB9YJTJFcworQ490npKjFiQPqideNC7VURwUw7fRi/t lGfQ== X-Gm-Message-State: AOJu0YxsSTtLIkfAndoPP8SSBsLH+fl+n9uQwuLvXi2oPjpEPvXhyfEb PXxOrVcgtyyrOv5+myRCE5HegMdOvseh+zzoS9ghoD7hius9tjmns5MM9w== X-Gm-Gg: ASbGncvOPdQfY+BumRzksw78k4As/EdXiD4Ybte648P8M5ObJHjPSOEhyDbPAotuuvR bm5yg4zSXWQw6I9dG3GFqoOfzhxQ/e63etJk98tGzg3fsOj8qYVoGwGOX9r0vd+HK3/b7OiLMSB MXA4CQVhIAkc/Z5XJBjQXVQ0+qp2Ho2HUOQuzlIzT1BOoj5y7PXHTucIDIO6Lu3dZE9ujLcV5DR sHjlOlnv2Vvs6rul/0zQ5+pGu/+ovkTYkF61ULZQ5bfQE01EnqAl2GvD0vtSDyRRbjlDq0gwSpF QnnPDMXvNo4kdBQs0jcHkNASs9vIvm3wS1wGK0qxtPbUYpnGFFIa X-Google-Smtp-Source: AGHT+IHNjDwVpfzJBna2j+/Nri2ki6eNo3+TYnXOwE0Xv7tsBweM/a0PIue5mZcEwhF4BJCgwaVDEA== X-Received: by 2002:a05:6830:2aa6:b0:72b:a06b:dd71 with SMTP id 46e09a7af769-72bbc23fc86mr250909a34.5.1741910513031; Thu, 13 Mar 2025 17:01:53 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e973sm423485a34.43.2025.03.13.17.01.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 17:01:49 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, peff@peff.net, ben.knoble@gmail.com, Justin Tobler Subject: [PATCH v3 6/6] rev-list: support NUL-delimited --missing option Date: Thu, 13 Mar 2025 18:57:47 -0500 Message-ID: <20250313235747.9583-7-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250313235747.9583-1-jltobler@gmail.com> References: <20250313001706.3390502-1-jltobler@gmail.com> <20250313235747.9583-1-jltobler@gmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The `--missing={print,print-info}` option for git-rev-list(1) prints missing objects found while performing the object walk in the form: $ git rev-list --missing=print-info ? [SP =]... LF Add support for printing missing objects in a NUL-delimited format when the `-z` option is enabled. $ git rev-list -z --missing=print-info NUL missing=yes NUL [= NUL]... In this mode, values containing special characters or spaces are printed as-is without being escaped or quoted. Instead of prefixing the missing OID with '?', a separate `missing=yes` token/value pair is appended. Signed-off-by: Justin Tobler --- Documentation/rev-list-options.adoc | 5 +++-- builtin/rev-list.c | 31 ++++++++++++++++++++--------- t/t6022-rev-list-missing.sh | 31 +++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 11 deletions(-) diff --git a/Documentation/rev-list-options.adoc b/Documentation/rev-list-options.adoc index 92ac31a8e8..f4764b72f5 100644 --- a/Documentation/rev-list-options.adoc +++ b/Documentation/rev-list-options.adoc @@ -382,10 +382,11 @@ and thus is used to signal the start of a new object record. Examples: NUL NUL path= NUL NUL boundary=yes NUL + NUL missing=yes NUL [= NUL]... ----------------------------------------------------------------------- + -This mode is only compatible with the `--objects` and `--boundary` output -options. +This mode is only compatible with the `--objects`, `--boundary`, and +`--missing` output options. endif::git-rev-list[] History Simplification diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 7c6d4b25b0..036fcc26d5 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -136,24 +136,37 @@ static void print_missing_object(struct missing_objects_map_entry *entry, { struct strbuf sb = STRBUF_INIT; + if (line_term) + printf("?%s", oid_to_hex(&entry->entry.oid)); + else + printf("%s%cmissing=yes", oid_to_hex(&entry->entry.oid), + info_term); + if (!print_missing_info) { - printf("?%s\n", oid_to_hex(&entry->entry.oid)); + putchar(line_term); return; } if (entry->path && *entry->path) { - struct strbuf path = STRBUF_INIT; + strbuf_addf(&sb, "%cpath=", info_term); + + if (line_term) { + struct strbuf path = STRBUF_INIT; - strbuf_addstr(&sb, " path="); - quote_path(entry->path, NULL, &path, QUOTE_PATH_QUOTE_SP); - strbuf_addbuf(&sb, &path); + quote_path(entry->path, NULL, &path, QUOTE_PATH_QUOTE_SP); + strbuf_addbuf(&sb, &path); - strbuf_release(&path); + strbuf_release(&path); + } else { + strbuf_addstr(&sb, entry->path); + } } if (entry->type) - strbuf_addf(&sb, " type=%s", type_name(entry->type)); + strbuf_addf(&sb, "%ctype=%s", info_term, type_name(entry->type)); + + fwrite(sb.buf, sizeof(char), sb.len, stdout); + putchar(line_term); - printf("?%s%s\n", oid_to_hex(&entry->entry.oid), sb.buf); strbuf_release(&sb); } @@ -784,7 +797,7 @@ int cmd_rev_list(int argc, if (revs.graph || revs.verbose_header || show_disk_usage || info.show_timestamp || info.header_prefix || bisect_list || use_bitmap_index || revs.edge_hint || revs.left_right || - revs.cherry_mark || arg_missing_action) + revs.cherry_mark) die(_("-z option used with unsupported option")); } diff --git a/t/t6022-rev-list-missing.sh b/t/t6022-rev-list-missing.sh index 3e2790d4c8..08e92dd002 100755 --- a/t/t6022-rev-list-missing.sh +++ b/t/t6022-rev-list-missing.sh @@ -198,4 +198,35 @@ do ' done +test_expect_success "-z nul-delimited --missing" ' + test_when_finished rm -rf repo && + + git init repo && + ( + cd repo && + git commit --allow-empty -m first && + + path="foo bar" && + echo foobar >"$path" && + git add -A && + git commit -m second && + + oid=$(git rev-parse "HEAD:$path") && + type="$(git cat-file -t $oid)" && + + obj_path=".git/objects/$(test_oid_to_path $oid)" && + + git rev-list -z --objects --no-object-names \ + HEAD ^"$oid" >expect && + printf "%s\0missing=yes\0path=%s\0type=%s\0" "$oid" "$path" \ + "$type" >>expect && + + mv "$obj_path" "$obj_path.hidden" && + git rev-list -z --objects --no-object-names \ + --missing=print-info HEAD >actual && + + test_cmp expect actual + ) +' + test_done