From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 230561F4B4 for ; Fri, 1 Jan 2021 02:37:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727115AbhAACgO (ORCPT ); Thu, 31 Dec 2020 21:36:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727038AbhAACgN (ORCPT ); Thu, 31 Dec 2020 21:36:13 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8FA4C06179E for ; Thu, 31 Dec 2020 18:34:57 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id y23so8379088wmi.1 for ; Thu, 31 Dec 2020 18:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=L/WVsRYrspMW4RmRifIMouf1b8GyIYjbnvZIWb8/lPo=; b=ugWDDGAn6vkhORea0Inc5egp5ocmWoGDEKnUm4NSyy7t//NSPMt1fHIOkV2BMJAoqH 7gouky3hBes78wGl0wQtj9ohSJoikwOG+InlV6Qy8xlcdaiF31BnbvEzYNEp7wIA2L95 M5lqylC9Wya8txiLlf3O0RKgkavDmDTFyjc9HVbMYFZiA37dKQg+hXyYkXDQEkt0zU5v X/oUo8iP5WCfPIEupcsJ6I+4QhFtNCv+4kY3hsEu3bynGOWnDE0gMju1Hu7kcWccvCRf I0Vcgf6+ZJ9Ui4+58gXuJFhvxcWD3JfoZ5yjRZuCVbVwcdpKuN7jtl1zb48YqVkkZfFz bmHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=L/WVsRYrspMW4RmRifIMouf1b8GyIYjbnvZIWb8/lPo=; b=SoP565o1z6+v9GaD5C91DIUaQIMGqqerBJDrmIi3GOVxDsis+lGB+9iJhSUoutz0Sx +cKkiLLtvQ/XXOxl3q28mrZ75icnfQzAgQ2tLEIS6J06VT7ZcREvR/jHG/RLcifwzoMi t9ydy0kzc87z7jQ+1dDW7njqeKlpbh1Jdf3OPRPOdaaxxzI/0DfVMHJjlU1Cf4wA4myN Gwh/PWlmy/fb/qhg2cHdhyCVM6dXDfpBPsoWxl0WLNUCVk5PV+0vUqTMhpULiDyi+jnn Ukzlpd4xbVOeg6wzTeAamhgiwl2v1UQw1hjf974TUzxhEQVU3DmBMwL8sW6JSbar/+j5 wahg== X-Gm-Message-State: AOAM532TTa9wT66RZVCplAGOd5gJiJhwGsNflOWNjz7ujbzCZrTSkCTl OonY+x/5ZPZvK4LS5HbFYQiwCzlkIdo= X-Google-Smtp-Source: ABdhPJygLsaBvVLkdpXWBnPxCkbtF9vDkdjIl7ySvahOYH2o9uAW2jPHL9LIPW5dL/WstpnPhQkIog== X-Received: by 2002:a1c:67c5:: with SMTP id b188mr14066691wmc.147.1609468496406; Thu, 31 Dec 2020 18:34:56 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h5sm73543173wrp.56.2020.12.31.18.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 18:34:55 -0800 (PST) Message-Id: In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Fri, 01 Jan 2021 02:34:46 +0000 Subject: [PATCH v2 08/10] merge-ort: implement format_commit() Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Derrick Stolee , Elijah Newren , Elijah Newren Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren This implementation is based on a mixture of print_commit() and output_commit_title() from merge-recursive.c so that it can be used to take over both functions. Signed-off-by: Elijah Newren --- merge-ort.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/merge-ort.c b/merge-ort.c index 2dfab1858fc..bf704bcd34d 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -328,7 +328,19 @@ static void format_commit(struct strbuf *sb, int indent, struct commit *commit) { - die("Not yet implemented."); + struct merge_remote_desc *desc; + struct pretty_print_context ctx = {0}; + ctx.abbrev = DEFAULT_ABBREV; + + strbuf_addchars(sb, ' ', indent); + desc = merge_remote_util(commit); + if (desc) { + strbuf_addf(sb, "virtual %s\n", desc->name); + return; + } + + format_commit_message(commit, "%h %s", sb, &ctx); + strbuf_addch(sb, '\n'); } __attribute__((format (printf, 4, 5))) -- gitgitgadget