From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_SPAM,RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 9CC512023D for ; Wed, 17 May 2017 02:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752956AbdEQC7h (ORCPT ); Tue, 16 May 2017 22:59:37 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:36213 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752809AbdEQC7Z (ORCPT ); Tue, 16 May 2017 22:59:25 -0400 Received: by mail-pg0-f53.google.com with SMTP id x64so66006727pgd.3 for ; Tue, 16 May 2017 19:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wmWM+nVP/6WjQRaSMBVpG3pVBAJeJTIXayPLsb4n4TM=; b=Rbsjivv7zOvomc4/8RBrNparxvn33MBak7aVb0ayuTaT8yMB7/vPa2peoBJ2LJvhJi wOEUNaxc0uGGTgxTlX15K3d9eSD6xow0PQqIV2e5XEjmqkKh9RScn4khgG5Svi46RNby JsWdsmBnDVz5zmli6tzG5o3vosYsrzctoYEFOp4QJL5hu3ExUq6B/tWj5hkkHKMSQfXZ 6saRjCC5Q9MSVch2PUhGEM2U03a9wcLe5JlMUNDx370D2+/rcPWvGCIL6ZsKT94dxnWe deektcWiklDWH+nWUniRQasozj6wQ7GX58UrpufsZp/dvfXKP7WUlW5tbv6RCKcRZGxd 0ovQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wmWM+nVP/6WjQRaSMBVpG3pVBAJeJTIXayPLsb4n4TM=; b=Qr01knHQ1XiAjKLdngm6K/bHrrUu555jb1pEg/8JSbwwo85+7Be+SfgU2ATKRfE6aE xqdqM2FqCPJ3LygGLZz1LG1mexzdzqrDX+Jf3ZO0dEAtuUQT5JOlv0jQWYd7yvGrqPGg qQU3uLTREWhDvh30sONP+4A9GLvCIDr1L/zls//nxlVJwsa8K79HmmaQMAIJbxPC1l/m TPKGzfmnmx+QuyTP3T4ZqPEd7U9lvJnqKwtTXaKK9Qt62PpJtS/b6G8ljnc4K2jMzoKE Pi+tGIdnV0cBeXOKGdzXLrjtAajYjIQEQCYULz+RDfJUKW2YFp9E57VcmcP13vOzklb7 swNA== X-Gm-Message-State: AODbwcDrmCKetsPuhjyIYyzdVauUsOyxqEIBh2h3WAunMvAOP4sP/qIW uDYFEFGeQLc6+IBf X-Received: by 10.98.198.130 with SMTP id x2mr1301457pfk.232.1494989964790; Tue, 16 May 2017 19:59:24 -0700 (PDT) Received: from localhost ([2620:0:100e:422:b4bc:dafd:125e:c48a]) by smtp.gmail.com with ESMTPSA id h28sm673828pfd.55.2017.05.16.19.59.23 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 16 May 2017 19:59:23 -0700 (PDT) From: Stefan Beller To: git@vger.kernel.org Cc: jrnieder@gmail.com, gitster@pobox.com, jonathantanmy@google.com, bmwill@google.com, peff@peff.net, mhagger@alum.mit.edu, Stefan Beller Subject: [PATCHv2 17/20] diff.c: convert diff_summary to use emit_line_* Date: Tue, 16 May 2017 19:58:54 -0700 Message-Id: <20170517025857.32320-18-sbeller@google.com> X-Mailer: git-send-email 2.13.0.18.g7d86cc8ba0 In-Reply-To: <20170517025857.32320-1-sbeller@google.com> References: <20170514040117.25865-1-sbeller@google.com> <20170517025857.32320-1-sbeller@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In a later patch, I want to propose an option to detect&color moved lines in a diff, which cannot be done in a one-pass over the diff. Instead we need to go over the whole diff twice, because we cannot detect the first line of the two corresponding lines (+ and -) that got moved. So to prepare the diff machinery for two pass algorithms (i.e. buffer it all up and then operate on the result), move all emissions to places, such that the only emitting function is emit_line_0. This covers diff_summary. Signed-off-by: Stefan Beller --- diff.c | 64 ++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/diff.c b/diff.c index 4cd1b3c520..964b5cb5a7 100644 --- a/diff.c +++ b/diff.c @@ -4500,67 +4500,71 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt) } } -static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs) +static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs) { + struct strbuf sb = STRBUF_INIT; if (fs->mode) - fprintf(file, " %s mode %06o ", newdelete, fs->mode); + strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode); else - fprintf(file, " %s ", newdelete); - write_name_quoted(fs->path, file, '\n'); -} + strbuf_addf(&sb, " %s ", newdelete); + quote_c_style(fs->path, &sb, NULL, 0); + strbuf_addch(&sb, '\n'); + emit_line(opt, NULL, NULL, 1, 0, sb.buf, sb.len); + strbuf_release(&sb); +} -static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name, - const char *line_prefix) +static void show_mode_change(struct diff_options *opt, struct diff_filepair *p, + int show_name) { if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) { - fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode, - p->two->mode, show_name ? ' ' : '\n'); + struct strbuf sb = STRBUF_INIT; if (show_name) { - write_name_quoted(p->two->path, file, '\n'); + strbuf_addch(&sb, ' '); + quote_c_style(p->two->path, &sb, NULL, 0); } + emit_line_fmt(opt, NULL, NULL, 1, + " mode change %06o => %06o%s\n", + p->one->mode, p->two->mode, + show_name ? sb.buf : ""); + strbuf_release(&sb); } } -static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p, - const char *line_prefix) +static void show_rename_copy(struct diff_options *opt, const char *renamecopy, + struct diff_filepair *p) { char *names = pprint_rename(p->one->path, p->two->path); - - fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p)); + emit_line_fmt(opt, NULL, NULL, 1, " %s %s (%d%%)\n", + renamecopy, names, similarity_index(p)); free(names); - show_mode_change(file, p, 0, line_prefix); + show_mode_change(opt, p, 0); } static void diff_summary(struct diff_options *opt, struct diff_filepair *p) { - FILE *file = opt->file; - const char *line_prefix = diff_line_prefix(opt); - switch(p->status) { case DIFF_STATUS_DELETED: - fputs(line_prefix, file); - show_file_mode_name(file, "delete", p->one); + show_file_mode_name(opt, "delete", p->one); break; case DIFF_STATUS_ADDED: - fputs(line_prefix, file); - show_file_mode_name(file, "create", p->two); + show_file_mode_name(opt, "create", p->two); break; case DIFF_STATUS_COPIED: - fputs(line_prefix, file); - show_rename_copy(file, "copy", p, line_prefix); + show_rename_copy(opt, "copy", p); break; case DIFF_STATUS_RENAMED: - fputs(line_prefix, file); - show_rename_copy(file, "rename", p, line_prefix); + show_rename_copy(opt, "rename", p); break; default: if (p->score) { - fprintf(file, "%s rewrite ", line_prefix); - write_name_quoted(p->two->path, file, ' '); - fprintf(file, "(%d%%)\n", similarity_index(p)); + struct strbuf sb = STRBUF_INIT; + strbuf_addstr(&sb, " rewrite "); + quote_c_style(p->two->path, &sb, NULL, 0); + strbuf_addf(&sb, " (%d%%)\n", similarity_index(p)); + emit_line(opt, NULL, NULL, 1, 0, sb.buf, sb.len); } - show_mode_change(file, p, !p->score, line_prefix); + show_mode_change(opt, p, !p->score); break; } } -- 2.13.0.18.g7d86cc8ba0