From patchwork Wed Mar 19 18:34:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14022997 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 EA5F71DFD98 for ; Wed, 19 Mar 2025 18:37:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742409476; cv=none; b=QsqvPGQQSbqugEND+/z+f89ZfBzqXgClyVc8YWclPxtJZApNgh1720EUXV0jFMGOe11YQFDd2A516jhszQZjimyvJ8aOLrfoM4N1jbCtbxYxqLvl+bwsYaF9TuifDLjJz4mVrFZIv4KoO3QmnVAP2s97L8PmnipIojjimliM/3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742409476; c=relaxed/simple; bh=9Oixtf8VtLt11mtugwndN5WDyIGQO6bIWKsWs5kuz2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EIjSmEiQTChXF1XZUPJJxTuep2Pigp6LQF4AjY2b+yWIeiChPSPfxGz1EqX+T7DkFOzoq2u87Zat7Jeq16QwuNyX4lo16cnfStD6l+j18ydKsyXySnfMqfg9TIs4+AdLVxZJfdVR4JVjKlDZdUv3iPv4nOENzl51suKHdYtNNas= 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=Q0NyborF; arc=none smtp.client-ip=209.85.210.50 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="Q0NyborF" Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-72bc3987a05so571630a34.1 for ; Wed, 19 Mar 2025 11:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742409474; x=1743014274; 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=Q0NyborFbQJHblecZv3oqnQYhVeu6aNuYsiHU64Flg52w2pcmpk9hfoq6+JDOKSMqk NtV0PosNUav8qp+pCyKRw1aAR/0vdQVC8OzX/Wnc+WOiDE74HHRwx4bAzIyxDtefr3tg tWZZW8arZswbs+itKbrVACSSqcInhwiFlt90nhs3+Fp4DU/FoB2Hkd+GCj5EMttsDhsb zZ+YpgpaJjcRihj9ZU1Lb9+pBopbyESuRF6hr/L2xHAEk6TaNOX1XRQC16Dsa4qkMurm NbZhe39cEEPaGKkHEllIdzUwP3z6GstdEWMRxz7wCqnlhpgNtB5nBSgaUKwGSGs0vzCx 5E9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742409474; x=1743014274; 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=uSV/JWazkvUtCRqo4A9Z/wTG82gyGRmHBinoQ8E/fE0NaEHBh/Ju3fv2kPsFmbHOOW fuQpSfAlQwaanNhu7GT8iFIyI4FstI7qaWBaaJWIwOVkAiZjCGnx88Gl4P3fTL8/Im14 1EsXuZ4f6o0a/cpy2Tph3ahKMiadh3XPHBWc2S6O7JFdYPjNTX85wd94uJ7gFJ4tYX8L MnwDPCVbF3CGh5JEyYZNE17ktqSK6hPAwPJlzevaGxPVrXIjIxNZulgtG43f/CoZMlK5 39NwwpZB4o3tLFMtNczzRw0BWwP5OwQiB1uZ0uo/mq+jyCKA/MjX90Jy3qPLzwRMeVAq L8gQ== X-Gm-Message-State: AOJu0YxhJZRTeDjqsEFhfPRJKxS3FWEtdljGfgDNzwuiZAcWdGfcjAeq qP/7XZ9u2bBvNUCskeNjLsWnpxtqWLfqfn/TiV7kEMdpaYJddJ6g0Mv+XQ== X-Gm-Gg: ASbGncsLhH6kxs9e6ZetDm0GZEdU/JZAqHd/LGCN3Fss+gbIbve61JznLmQGoi5Wwzl Dt1dv4U/Ljdf55X0ZK/xbaIruf+JLa0EcgoXn5hArzM/83GIlMUjgvRoXrSq5ST7yXldWOOBA+B HRye8EP68z5TK37Bvo/I/gPfzzqM6IToUYWkl/OkmO3CRRfbwxpwpmBd8cAcq+YDC2Te9mW5dSn UtTU4zy4uB5wiU6gYIev3JeakgykcX9dz2dwmwXBnZ8baKcPahJrAKn/3ieTq1pyyRdcJMiTDVF DEtwVzvxhDQBuy8HK6/nRNbuJCzK8/bJC3Jc5QBXmQynK4FvDxWe/JO1l1DFGSg= X-Google-Smtp-Source: AGHT+IF+5TO0pEvfG4Yld5OEiq3wpS0pBfs+3rWkAoPY+pHRN0C7KUSUqi6KmzKCH3h89rEjf17V+A== X-Received: by 2002:a9d:5606:0:b0:72a:b2a:476 with SMTP id 46e09a7af769-72c02d8fa22mr351450a34.3.1742409473860; Wed, 19 Mar 2025 11:37:53 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e796sm2561943a34.48.2025.03.19.11.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 11:37:53 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, Justin Tobler Subject: [PATCH v4 1/5] rev-list: inline `show_object_with_name()` in `show_object()` Date: Wed, 19 Mar 2025 13:34:06 -0500 Message-ID: <20250319183410.1225428-2-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250319183410.1225428-1-jltobler@gmail.com> References: <20250313235747.9583-1-jltobler@gmail.com> <20250319183410.1225428-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 Wed Mar 19 18:34:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14022998 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (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 CF2EF20967B for ; Wed, 19 Mar 2025 18:37:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742409477; cv=none; b=styUGlssAvoNNpnFe+wSo3yFOPOhbN8WOr3hQpB6uAkvalgbxJsEjrXLxvvlhnMaMNUVRbj7YQmoFJ0ao5YqUrMBPTC29qVu1HWh//xG3yQvIpivB0GRiXfSQsukcuD4junsgt05tx026T7s+gD8Z/mrFCGN8OH+5orh1I96j0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742409477; c=relaxed/simple; bh=opPvqbuSojM7C18Au7j9w0k+hzvHe5F6EHrCLfwU8KE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TvatnlHpVW58C6UYqiWVby1qKIwyBiNiD3PDOoskHCoZTQoG59DU6zFGSqVvsQEUNhB81krgFVgR2OsFiblR6ry8GpHJuvbSM0eLt24qnADZ4vOL1BzQXAU9E2LW4zIu9v+Ajxx+enJeLVZt3yCSUzYs+hrX7T6PtrVjmUqEdjg= 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=TgEca7dg; arc=none smtp.client-ip=209.85.210.52 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="TgEca7dg" Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-72bd5f25ea6so3149a34.1 for ; Wed, 19 Mar 2025 11:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742409474; x=1743014274; 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=TgEca7dghiN30tVbCxrBVtewxoTmRUAZdRwGhDtTr5pb6/xs6/dSCyIXtGabNYku11 xQE2eMdhebH0lSWEU3Cu1SAUjvCZi3+20fRcFYLp7vOr7pSEUMNjYUzC2Cf5/JizUdKj HSOAdUOwulaXGzYE904/xv/PaojflPy6x1bdJ7Kw6J1lfpRGTFrnQ2kx9KR1jxp9zX8g Y9gPSD9lb0ERvhcIqSCamev2Ofx9On8fio+ojkptLnmNQi9AjBsdX8QTd1z4VrYnw4q7 0aw3sFLfqGtlz+wqxdg+zhFt99PxzGoiCk5kjJVTF40CAxVzS9ulyWJ2h5Vnh3nWdgN/ 7YqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742409474; x=1743014274; 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=P20bpLHLQdNN4pM/J6SPwOi0NdyT8yBJGwp1oWk8e+xN7IsTWdlIYumbAQ/R5xMD3X 3K2OZE3SlICVcVPeWQVudk8M7huQgA+TaL83c7PtzFOuWE0RDhggiWkVK7JIhMRGAWsZ 2TuxFCcWuuQB0cFeF34Gwe44e/IJbLY7WGl/Yqf90bneI2qrL9qtqnllB18tUlb/zsJu G5zEUPGalR1+vvNKB8tUbb//UUGYeNZcVgTTC430UMfVKYf34grBfoQlsQ/iTJ59ZWbh k+sEWTH16ViWLnUdFE+w8lOufvmgJhBtj7z9Pw1Wk33PhlP+9yjSuplvw33S92lYiixp WNkw== X-Gm-Message-State: AOJu0YwjkjdmdVsRD6vwKWjcDZsw9StAtLpDxVmMrmPYvWblJwrwOCIx x/wdz3BxngDsVNJdugOX25JWTjyPP3plxt+xYV7NcisEBaH1Ii/DAtSNsw== X-Gm-Gg: ASbGncvgCbivwGQB5/TaqNh+Hc71nw9XJhEzjCHbE2m+3t0wrhBidwwaM2QpGm/PYFK WvOC4OYFo4HhyWC/i05eFvUm+Ijt+5tGZTKZml1jh6brmwfLROblT/oQMfzxwpi+JkVGji1joSF 1sVILf15PkGmMiYmJQGYzkynoc7bE0p+TxNstXVQpN1IoqRKwpoN3IZHxCI8HGlBQq5AnFMxBTI jLyEtoibBqR08OjaE/R2TD/zDo+6rm0Ij8bQLHj6+9+PUVvZboH0DWjusiMl217l//LFIRQtuEf DcIkwv+pO9Pcyfrfqfkui7corHSFcHacMp7+t6x4Lf2XtGLVnEW/vxPywdob2pA= X-Google-Smtp-Source: AGHT+IGSE7m07a51szMZXJCXx5qvnPWbdsjz5jPL6RXFyj3umaVSECETcYhuwIzMRfuN944x10HZRw== X-Received: by 2002:a05:6830:6d84:b0:72b:95e5:edab with SMTP id 46e09a7af769-72bfbdbec9fmr3377369a34.1.1742409474646; Wed, 19 Mar 2025 11:37:54 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e796sm2561943a34.48.2025.03.19.11.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 11:37:54 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, Justin Tobler Subject: [PATCH v4 2/5] rev-list: refactor early option parsing Date: Wed, 19 Mar 2025 13:34:07 -0500 Message-ID: <20250319183410.1225428-3-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250319183410.1225428-1-jltobler@gmail.com> References: <20250313235747.9583-1-jltobler@gmail.com> <20250319183410.1225428-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 Wed Mar 19 18:34:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14022999 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 8351D20B7E8 for ; Wed, 19 Mar 2025 18:37:56 +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=1742409478; cv=none; b=apRrs4NMU238qZ4xKHejUX+DxWerrnMDB1osmN4usRO/wfxqDcwr2OXtloAxpEKxCUQl4EPLPx3N+jBPGEmv4gzRZ6gNxIxZqCnHG7U4j7LVlbbDYDHOlHQ0w++C3jPoKdUkYWS/T74LxyluUU5cfEsWO6XOsYtkp0Vf1aZEKjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742409478; c=relaxed/simple; bh=1ri0Yvle3HOAwEKdNm9itxSgSocxZMnxm5aOWYaWHhw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QA4vI0fCW7D+Z3Lf7fFObNaoOsTkuniibGG/LMJiRshJor9O7PXwm671ooE0a2j63kRyQyvmpEdzJFzSHj6bLkSJsjvopxl4BGlXZhzJ6ks3W5g+RhSqjfOht+roSmaZVwz6nrDtxITwHQ4kOLWyzjTFtg7D82zcLmwf0K91C+A= 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=bBiP+WtQ; 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="bBiP+WtQ" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-72bb9725de4so517a34.3 for ; Wed, 19 Mar 2025 11:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742409475; x=1743014275; 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=tQVXCYQtc1oR2c6RpGn5NHX8fVCOMoNbZ3Y9aQTvuHU=; b=bBiP+WtQJS+CI+mVjh0fAEeY4UuzAyZIISimEeHGdeDjBfBd7NHir/5Nl2VX6PHHeq /v2mcZKiOw76y3x8DImKZejkVL3hYNQyh64HXLwidIgPsH7R5RuAe1GnpJ9QN3qfhc9x rXE0m/u0P28r3lz0J7m59gtEwVDQdGbpgFmpugHj77RH9zwUtrNgo/2joLxRaes7BcWT CnacBUuIVHGa/Z8FaZnAXyiFu1semJNVR+kmk81SG+1kmqZIssZ5Puwdc4+soUSJDweC rTkazNQQPy7tzc7mRJj/QvKiz0Yr5uIj7HJZ28iyDMG+nKjeoWGLWjbMo7wiZlq2np2L Y+XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742409475; x=1743014275; 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=tQVXCYQtc1oR2c6RpGn5NHX8fVCOMoNbZ3Y9aQTvuHU=; b=c41z+OAPUh4IENr5VrCOOCwQYn1rq9y1dyvuhMsE/WAlNNH4D2dVdFi1R4iHgDi8GE uJXdJStZJKqHjsqcq+l0882parLKuqyPj1KVtOWn7rKmHqhrYT7Aj9rg4PbkDS2QvxUW CEMuoNV69Y7gQ0fF7xMOGHtAvNETBosHvNf3kCfeQjhzeRS1/INwhfFNfIjEm43r4N80 9ioEKOzBpk/qZCOSg/uV4jSuws/L4xU5ZZLU2hC2UILj/atK35zPVEXMOg9WBpepXBG/ 8yHw1ecbs7/09BDjtRfUyLH3awTT/Cgfc9ucNeuRBax4Y4P7lC9DYacKEsXjjyu/so2v doVw== X-Gm-Message-State: AOJu0YzZOq7XbhcogY0QYvxnylt2Vf/IrZsRJriGOTK+Hhq1ByyWDWMJ SBGeGykpuUdBA431HcTLgGCzFu3lVCLHZmx2Kjrc14y3XbnP/Q/r3GLv9g== X-Gm-Gg: ASbGnctmqIMysFILmRtITOJ2k0SttLe7t31x8j8Wh2dGFm7TFpD4SG26zZCr78c6MkB QGr3FDdCSGa2jxG8De4pAV0Xe4Lz+BikcxkQOoQAkDhHRcGiXhRMhhqbyIptSPVvKyS1Cryo7Xt 2w6MWVq1ncbN5/IEj8IMQBQa2+vcrVOn3YGo66uE+ObUuptPjEBfRDZH7l/KVfk9HvD+wv20eG3 axJ5xb3NivxXNfwdLW8lhIGAM1zGFpq/ORUZgbYLJNyWc6YE8WGgURacxlPUBpwODlDPmrNrmPB e0HNrI2Qyi7xA6C0bL9IB2KUZmNiHOcWqmG1hGb5vLIoWGAMyHqL X-Google-Smtp-Source: AGHT+IG9nvHXNPhOL1TBLlyb+AUpIr+MOtL0obOKhaf37geJPsInrk1lBLeDDQ4WqjKcMIicyD4wrQ== X-Received: by 2002:a05:6830:6d84:b0:72b:95e5:edab with SMTP id 46e09a7af769-72bfbdbec9fmr3377402a34.1.1742409475409; Wed, 19 Mar 2025 11:37:55 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e796sm2561943a34.48.2025.03.19.11.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 11:37:54 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, Justin Tobler Subject: [PATCH v4 3/5] rev-list: support delimiting objects with NUL bytes Date: Wed, 19 Mar 2025 13:34:08 -0500 Message-ID: <20250319183410.1225428-4-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250319183410.1225428-1-jltobler@gmail.com> References: <20250313235747.9583-1-jltobler@gmail.com> <20250319183410.1225428-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. For now, the `--objects` flag is 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 when used in combination with `-z` are rejected. Signed-off-by: Justin Tobler --- Documentation/rev-list-options.adoc | 21 +++++++++++++++++ builtin/rev-list.c | 35 ++++++++++++++++++++++++----- t/t6000-rev-list-misc.sh | 35 +++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 5 deletions(-) diff --git a/Documentation/rev-list-options.adoc b/Documentation/rev-list-options.adoc index 785c0786e0..aef83813b8 100644 --- a/Documentation/rev-list-options.adoc +++ b/Documentation/rev-list-options.adoc @@ -361,6 +361,27 @@ 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. 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..17de99d9ca 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,9 @@ 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")) { + line_term = '\0'; + info_term = '\0'; } } @@ -757,6 +768,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..886e2fc710 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" "$oid2" "$oid1" >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 From patchwork Wed Mar 19 18:34:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14023000 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 9533420DD79 for ; Wed, 19 Mar 2025 18:37:57 +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=1742409479; cv=none; b=kAVk4tXwyWqUP/4lMVH/cBMhQvNnpzn2rnDDAxud9sZkYqfbIcXkJ52uUS4DeDonLt3zJGFO52rsckUqfkRDpq4IfMfA9e75letZvLX4AvOpzIoJPgLGBTLXJ0ZIyEpghr+Lite60h6g7FviVt0c/2m3ZO9d8DcTjKlpStyOITI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742409479; c=relaxed/simple; bh=gXDQJKbFBhCIQvbvXidpm/80r5b+InmZo7SUxtpcx00=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bSBnmDOjGGOyjdTJ9JvNi7TPJECC8q2kXcB3l1UfAfyjeuh38+o9MwbccnrIyJwR157iwsPEYChXk+6HKGylixoy+IgnRwAGlZOW/yz9J28q9/iRWh46m9a0pzQ+8g7QEsLnB9jf3EE0jNdKKky6YWNbx6ySvbdutXLZdOZs3aQ= 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=nOEbIA+K; 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="nOEbIA+K" Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-7272f3477e9so732a34.3 for ; Wed, 19 Mar 2025 11:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742409476; x=1743014276; 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=wSFvkJN6PmVD85g/GecVusCu/GUn+xS+6RuX8NMYTL0=; b=nOEbIA+Kgz6uCThNbuAZeRUstTSXpemL190Ryk7skH4/k8L7qAejH5436HEDxnXT7h HAbDEEwT7xa9z9BmvaLSWnqAXuCUiOSE8l3xrE7r9JdW9iyxkXYPXVQiy27eLli4/sfS 5jmeB/yxxHx/15l+PgPquYsGawCxGzQR8t7pwSWL66fKq3zc+bPG++3FS0Kc6v+Urb4z vyMedv6aMa6xBVZeoZ+z5A8fRY1s09sZd2xHnDrW3ZZVtQG5KiSrg1LFWOHE+0hkbZZ6 l+nVnSU0ayB+Cb4emR2dAeCfpe2JjrlbPYsj6Iax6TpT25tEcAVnk9UiaAwuitUycPNH NUog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742409476; x=1743014276; 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=wSFvkJN6PmVD85g/GecVusCu/GUn+xS+6RuX8NMYTL0=; b=YmBYU1PVBYJB8GvesnbPJnfqPgQR7Q3uRO3Rq/koDID1Fj772mGxrcpE4jVVsU3gDH 6s4U/pYhbaY2aeXs0RB2USHX8IC7H6Sejul4ZjFfozwFzM4hcEVXUvE8Q5vX0JVakGWG CtWqFxBJThft/e4W7x8a8/aqaoq714KDVhCRA3BO5Ao6w6IMKtHzQOS8IQwNO38TyEPy 7XL0nI7QoFKh2vcq4TaBrcZZaKa5VIrAc/Qpjs/27Ozwn9OSqSMMiONPegVJSY3scrXS /1vaOjwbfZMukzrlmB4pAycH+fzTBTRVEcdqyWEMcNWeIX/91l0aI7oDsziInagd8dSH GK1A== X-Gm-Message-State: AOJu0Yx8ZG8sy6DF90t9I5SzuUPeLwRkgKmmxPgg3BU534NHTcz3UVZe 8Ti4Gp741A4MuSCqAGwegP7syahzoj3Kc+io5YSkbOMgrMNu15NBXb2p9A== X-Gm-Gg: ASbGncu2KCbizVnbulbZ6oZpLFlOHfBduoba/f5tmAvN7duzw2gdYd7agLt3QwprtHg bH+a6p6fped9+2Qn1/JaOvKbrW+uexjlV/FbL62Bb/fy9Rp36X/R8wIohFUoTqC6Hi4IInpaI8j SYiiuKnoetLi62S138UplchNXdbZEpaipyko6lPXT/9104q+wwQl6rwpWyG986GZ067vVsp6+0O Y9+vpdCA+UDY9bdTuH+z8VLNjXm1cYwuDSMq1WiqDv+BvUP1hBrpHc2Jz6Au8GAb3u/uWCeOYLo xurFYaHQvC/3mjT2NRgdXkWp6j6WnnRA8Eo4pQgED9ehv6fdvd/w X-Google-Smtp-Source: AGHT+IGI+EiQYSOjXAE7crbhWx3k9Db3ndTdB/GrX/I77ZoJgeIcrFt8iOFnX+p62rQkK92m7fzTfA== X-Received: by 2002:a05:6830:620e:b0:72b:9387:84b2 with SMTP id 46e09a7af769-72bfbf536c8mr3040129a34.27.1742409476207; Wed, 19 Mar 2025 11:37:56 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e796sm2561943a34.48.2025.03.19.11.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 11:37:55 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, Justin Tobler Subject: [PATCH v4 4/5] rev-list: support NUL-delimited --boundary option Date: Wed, 19 Mar 2025 13:34:09 -0500 Message-ID: <20250319183410.1225428-5-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250319183410.1225428-1-jltobler@gmail.com> References: <20250313235747.9583-1-jltobler@gmail.com> <20250319183410.1225428-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 aef83813b8..3fc9902d6b 100644 --- a/Documentation/rev-list-options.adoc +++ b/Documentation/rev-list-options.adoc @@ -371,17 +371,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 17de99d9ca..bcb880f109 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; @@ -778,7 +783,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 886e2fc710..33881274a4 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" "$oid2" "$oid1" >expect && + git -C repo rev-list -z --boundary HEAD~.. >actual && + + test_cmp expect actual +' + test_done From patchwork Wed Mar 19 18:34:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tobler X-Patchwork-Id: 14023001 Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (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 B9637210F45 for ; Wed, 19 Mar 2025 18:37:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742409480; cv=none; b=TqBKy+FM1RR5dXm5iw27qfOTMys9P+9hWPAbsEHWscsVjY3N73LTeULxPdPUw0bFkoTAm+2ZeZmwqPeilMub+igNSnW82lq8kU3BTfXDrKJXRamcIwZDFiYRIwz/O7c6B3dmzfIElpsB0G42cuzPHZjDIeCVPaxyWO4cyE2VXRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742409480; c=relaxed/simple; bh=CvdNutqQRxbGZikEHGpdXLo9MmKELXtFxSzeHpPFnFA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ETGxRdNFBpW9BP0zO16Q6Ad0Vjxi2eFxUQnLiV81m+/pEbjq1Khvb/Ip7mZJ26q0U+fmtYzU0oOmAoK935RiQL9kD6IChKx0HlO73Kh5JUdJx4GUrX5b+8GgGnNsZtVaZovuht+nTRD2xGUFH24hDM/thSGFLHQ426ILZ9LMbV8= 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=b9M4m5Zf; arc=none smtp.client-ip=209.85.210.47 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="b9M4m5Zf" Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-72bd5f25ea6so3164a34.1 for ; Wed, 19 Mar 2025 11:37:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742409477; x=1743014277; 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=tpjgqQG+8Z9+f94T6PAqRQHf2Xr+mAoRcV4YasCAg/Q=; b=b9M4m5ZftAoHt4MXjEl8RdjQDKELZvIk/Ks6XQuzQN4hg+5ZtKOAKGQdltDgBOMFdS 6FqFH4UMSaZUGtVHuCtUDLSdiU6bkm36OmCM6NG3NyYHRgD1Dz3g7XTVnkkLI+InIQH+ xcxOtEmgh+5X4roj3NlCiu5UjXNm+QrXvwL8RxXl6CKxkjGbmch/qi1E/ehOntDYoT3E KBLIULP4oTh+YVmHHlGsYTHPJX9oQBq43VUcKlNoBXPY9d8fykhy8iqxTjxLHrWeiECB wu+myLaSh6X2Ceat0pwcWQenKE3Up1fk91aF9XZvFd4rgTVFWRyazogKXHOGtkSezH1/ Vadg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742409477; x=1743014277; 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=tpjgqQG+8Z9+f94T6PAqRQHf2Xr+mAoRcV4YasCAg/Q=; b=gthMRY7pPW2vMV5lefJqXCzI5lDLoBQRicUEijxH7TR0UA67IUlqiDo6L/BqbGV5ks nu4N9oY7KxIB6tV/T/YPVhTgYnJIeKJvVYeANTcttEmazGAM2AkNHBYpd2Z9JGnss46S thddj59vfC2JN9s7Igj/DfBZl9JKiWOaHnUgTEOHAJlHZG8kC1MCH9/6OORZMmj9iq+m dsUnBERoxOBrRnrFjjDpzwrJSEYP0yE8ytQOdtDyOavowP6tAxSsoa/KbHSzA6QI9PDg 0W2M1BrKTpKW5qWFBvIs10IREh+OJ4QbpppumBuFHVeMxp+Lu0J3rPn4XuTYiZadQ9xs 0OtA== X-Gm-Message-State: AOJu0YyeQtQiZBp0a01D9TYscWOemGs1hbCV/W4kpys8a6AyOhYx1jry yBgjCv9BIqpQd0c3tVrmlSjtu2oVlNqYnuxZb20f8d/JH78F6tdEPAE1ug== X-Gm-Gg: ASbGncsx7Tzy0VPGYfhzJBkIHB01XKahAM1uU27Ns9SPiETTXigUIN+4mIhMr6wl3G0 inqhRlzAOBbMxagTLr8JLU7aUwIjbbRdBDiwaBFDH0W1iGGPr2afOKufCCDOAYfRINx6Zwy012f h1p3O67jMSguSxp1oJoE4KXq9/60UQme/R5/MV9mP/HzLBRk955sXktFxg0nSADlJFM0z6ikHix I+87IsufGcvCs61NygHu923Dr3KRSl3H1zpBitj7BC6xu8H/4MHJPKDaX34HqfUB2VEqbVHPWYS 4tFs+KtUKO4i54xZq8RbXdtTHkWUeTEIs4gHQY+DF8B4G7TUmibW X-Google-Smtp-Source: AGHT+IH9eDjSapeNdfpMA+xuNwHE5QvJ1WoPe/jLbhcCE0tUH6b93sP2Th7ekMc5SziE+Um5uLrbBQ== X-Received: by 2002:a05:6830:6882:b0:72b:a92b:5797 with SMTP id 46e09a7af769-72bfbdd1b86mr3348806a34.9.1742409477301; Wed, 19 Mar 2025 11:37:57 -0700 (PDT) Received: from denethor.localdomain ([136.50.74.45]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-72bb274e796sm2561943a34.48.2025.03.19.11.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 11:37:56 -0700 (PDT) From: Justin Tobler To: git@vger.kernel.org Cc: ps@pks.im, christian.couder@gmail.com, Justin Tobler Subject: [PATCH v4 5/5] rev-list: support NUL-delimited --missing option Date: Wed, 19 Mar 2025 13:34:10 -0500 Message-ID: <20250319183410.1225428-6-jltobler@gmail.com> X-Mailer: git-send-email 2.49.0.rc2 In-Reply-To: <20250319183410.1225428-1-jltobler@gmail.com> References: <20250313235747.9583-1-jltobler@gmail.com> <20250319183410.1225428-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 3fc9902d6b..0e5605a85e 100644 --- a/Documentation/rev-list-options.adoc +++ b/Documentation/rev-list-options.adoc @@ -380,10 +380,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 bcb880f109..e6ee3f82ee 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); } @@ -783,7 +796,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