From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 2/3] wt-status.c: move cut-line print code out to wt_status_add_cut_line Date: Mon, 17 Feb 2014 19:15:31 +0700 Message-ID: <1392639332-7703-3-git-send-email-pclouds@gmail.com> References: <1392521840-21628-1-git-send-email-pclouds@gmail.com> <1392639332-7703-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Feb 17 13:16:23 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WFN7U-00014D-3X for gcvg-git-2@plane.gmane.org; Mon, 17 Feb 2014 13:16:20 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751594AbaBQMQF convert rfc822-to-quoted-printable (ORCPT ); Mon, 17 Feb 2014 07:16:05 -0500 Received: from mail-pb0-f44.google.com ([209.85.160.44]:63186 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752321AbaBQMQD (ORCPT ); Mon, 17 Feb 2014 07:16:03 -0500 Received: by mail-pb0-f44.google.com with SMTP id rq2so15250276pbb.31 for ; Mon, 17 Feb 2014 04:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=4iiDbQr33ZVZJrwRayFVRDImgJpOla4UXBN/UEc+T1Y=; b=BcfZLuLgcL5QO3O0kM5j3AwR5f39Z25jrV0Rg2icED33jvQ64V0/QpmwNITCcATKfi ikQQMH6kM0/4dQT9i39WjTwGzc0dVesH6J4WbxQ9mxbmg8ZSeAstCgHeJTIYEN8KnV7T Ofjdgjq+Swtr/uqZLkPU/Njs0f5Eb/1ZviCcN3+f7iyvvuHOmk/MROAd+rR8XqVSYMrQ 9PN47fVomo7xTnJKwV8SJQicbwR9aZfSVNlPEnsObX1ZfAo18zKDAnE4AKlY09bwADhi Jy65ooFI81+ub0IwYPp46PTXS3xPyJLdavzzYJnOBs2nSEgNi7fzoFmR8dfs2frjwkr6 hCfQ== X-Received: by 10.66.164.165 with SMTP id yr5mr25771414pab.63.1392639363440; Mon, 17 Feb 2014 04:16:03 -0800 (PST) Received: from lanh ([115.73.228.211]) by mx.google.com with ESMTPSA id q7sm45239227pbc.20.2014.02.17.04.16.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Feb 2014 04:16:02 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Mon, 17 Feb 2014 19:16:14 +0700 X-Mailer: git-send-email 1.8.5.2.240.g8478abd In-Reply-To: <1392639332-7703-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- wt-status.c | 19 ++++++++++++------- wt-status.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/wt-status.c b/wt-status.c index 65e35c3..ed31b6a 100644 --- a/wt-status.c +++ b/wt-status.c @@ -808,6 +808,17 @@ void wt_status_truncate_message_at_cut_line(struct= strbuf *buf) strbuf_release(&pattern); } =20 +void wt_status_add_cut_line(FILE *fp) +{ + const char *explanation =3D _("Do not touch the line above.\nEverythi= ng below will be removed."); + struct strbuf buf =3D STRBUF_INIT; + + fprintf(fp, "%c %s", comment_line_char, cut_line); + strbuf_add_commented_lines(&buf, explanation, strlen(explanation)); + fputs(buf.buf, fp); + strbuf_release(&buf); +} + static void wt_status_print_verbose(struct wt_status *s) { struct rev_info rev; @@ -833,14 +844,8 @@ static void wt_status_print_verbose(struct wt_stat= us *s) * diff before committing. */ if (s->fp !=3D stdout) { - const char *explanation =3D _("Do not touch the line above.\nEveryth= ing below will be removed."); - struct strbuf buf =3D STRBUF_INIT; - rev.diffopt.use_color =3D 0; - fprintf(s->fp, "%c %s", comment_line_char, cut_line); - strbuf_add_commented_lines(&buf, explanation, strlen(explanation)); - fputs(buf.buf, s->fp); - strbuf_release(&buf); + wt_status_add_cut_line(s->fp); } run_diff_index(&rev, 1); } diff --git a/wt-status.h b/wt-status.h index 30a4812..b56ce3f 100644 --- a/wt-status.h +++ b/wt-status.h @@ -92,6 +92,7 @@ struct wt_status_state { }; =20 void wt_status_truncate_message_at_cut_line(struct strbuf *); +void wt_status_add_cut_line(FILE *fp); void wt_status_prepare(struct wt_status *s); void wt_status_print(struct wt_status *s); void wt_status_collect(struct wt_status *s); --=20 1.8.5.2.240.g8478abd