From mboxrd@z Thu Jan 1 00:00:00 1970 From: Denis Cheng Subject: [PATCH] add pretty format configuration to git log/show/whatchanged Date: Sun, 2 Mar 2008 03:50:56 +0800 Message-ID: <1204401056-8763-1-git-send-email-crquan@gmail.com> References: Cc: git@vger.kernel.org To: Johannes Schindelin , Junio C Hamano X-From: git-owner@vger.kernel.org Sat Mar 01 20:51:50 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JVXkL-0000iH-31 for gcvg-git-2@gmane.org; Sat, 01 Mar 2008 20:51:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756859AbYCATvK (ORCPT ); Sat, 1 Mar 2008 14:51:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756789AbYCATvK (ORCPT ); Sat, 1 Mar 2008 14:51:10 -0500 Received: from wa-out-1112.google.com ([209.85.146.181]:31440 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756691AbYCATvI (ORCPT ); Sat, 1 Mar 2008 14:51:08 -0500 Received: by wa-out-1112.google.com with SMTP id v27so5640194wah.23 for ; Sat, 01 Mar 2008 11:51:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=m0kgnZ6ua9vZhi76nBdI3KYi7SJ9ETX9nN3+DxP/AdE=; b=L68nRGtUkjIAZaxbtOdskikOtSqkZflkoO4UkYjQonaAeULAh43E2AJ4UpAtOmPM0YMTBEeqakkQmgOfCfPvCvTvlFlSVEuZV8LwsTVxHNj44BE74A8dY4VIPRQOhDfhS24QSYfwfWIM0em8wtYKunsWobdx9X2rpZJdRML5RQ4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=N8xpwA/b2GdejmUSDnCKudoacXaNJi5pOwT1f+NPM1SXH/De267N2o4v22VQfr835950Iyq9Px+E/snyTjpLgmb/pe2crMj40hVw9p3vW1dPTmT2qH/XxFuRD3te5aEr55oYvsWsE1JCTJuKtanx3n3KmN2CTJJg0us3W4nES7Y= Received: by 10.114.175.16 with SMTP id x16mr13729234wae.116.1204401067535; Sat, 01 Mar 2008 11:51:07 -0800 (PST) Received: from tux ( [121.34.60.168]) by mx.google.com with ESMTPS id j6sm22037006wah.6.2008.03.01.11.51.04 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 01 Mar 2008 11:51:06 -0800 (PST) Received: by tux (sSMTP sendmail emulation); Sun, 2 Mar 2008 03:50:56 +0800 X-Mailer: git-send-email 1.5.3.8 In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: * New configuration variable "format.pretty" can be used in git log/show/whatchanged. the "format.pretty" configuration's design background is that I often use "--pretty=fuller" on my command line, and different "--pretty=format:..." on my different local repos, I hope there is a configuration to store this to git-config, and I think many people also need this to avoid specifying "--pretty=..." every time. with applying the patch, code in `git log/show/whatchanged` executed in the following order: 1. call to gitconfig will set static fmt_pretty according to user's git-config: if the user never config "format.pretty", fmt_pretty doesn't need to be initialized; 2. rev->commit_format set to CMIT_FMT_DEFAULT in init_revisions; 3. set rev->commit_format according to fmt_pretty if the user has configured "format.pretty" in git-config, else default to CMIT_FMT_DEFAULT; 4. setup_revisions will accept "--pretty=" from the command line; so the pretty format's setting precedence will be: 1. the command line "--pretty="; 2. "format.pretty" from the git-config; 3. default CMIT_FMT_DEFAULT; here documentation of `git config/log/show/whatchanged` also updated. Signed-off-by: Denis Cheng --- to Johannes: rev->commit_format default to CMIT_FMT_DEFAULT instead of fmt_pretty could avoid an extra call to get_commit_format. --- Documentation/config.txt | 5 +++++ Documentation/git-whatchanged.txt | 9 ++++----- Documentation/pretty-options.txt | 8 ++++++++ builtin-log.c | 9 +++++++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 4027726..8a0dff9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -556,6 +556,11 @@ format.suffix:: `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it). +format.pretty:: + The default pretty format for log/show/whatchanged command, + See linkgit:git-log[1], linkgit:git-show[1], + linkgit:git-whatchanged[1]. + gc.aggressiveWindow:: The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index 54947b6..a6e7bd4 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -38,11 +38,6 @@ OPTIONS Show git internal diff output, but for the whole tree, not just the top level. ---pretty=:: - Controls the output format for the commit logs. - can be one of 'raw', 'medium', 'short', 'full', - and 'oneline'. - -m:: By default, differences for merge commits are not shown. With this flag, show differences to that commit from all @@ -51,6 +46,10 @@ OPTIONS However, it is not very useful in general, although it *is* useful on a file-by-file basis. +include::pretty-options.txt[] + +include::pretty-formats.txt[] + Examples -------- git-whatchanged -p v2.6.12.. include/scsi drivers/scsi:: diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 973d8dd..15e01fa 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -4,6 +4,14 @@ where '' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'email', 'raw' and 'format:'. When omitted, the format defaults to 'medium'. ++ +Note: now you can specify the default pretty format in the repository +configuration (see linkgit:git-config[1]), like this in .git/config: ++ +----------------------- +[format] + pretty = fuller +----------------------- --abbrev-commit:: Instead of showing the full 40-byte hexadecimal commit object diff --git a/builtin-log.c b/builtin-log.c index bbadbc0..23c05bc 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -20,6 +20,7 @@ static int default_show_root = 1; static const char *fmt_patch_subject_prefix = "PATCH"; +static const char *fmt_pretty; static void add_name_decoration(const char *prefix, const char *name, struct object *obj) { @@ -54,6 +55,8 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, rev->abbrev = DEFAULT_ABBREV; rev->commit_format = CMIT_FMT_DEFAULT; + if (fmt_pretty) + rev->commit_format = get_commit_format(fmt_pretty); rev->verbose_header = 1; DIFF_OPT_SET(&rev->diffopt, RECURSIVE); rev->show_root_diff = default_show_root; @@ -221,6 +224,12 @@ static int cmd_log_walk(struct rev_info *rev) static int git_log_config(const char *var, const char *value) { + if (!strcmp(var, "format.pretty")) { + if (!value) + config_error_nonbool(var); + fmt_pretty = xstrdup(value); + return 0; + } if (!strcmp(var, "format.subjectprefix")) { if (!value) config_error_nonbool(var); -- 1.5.4.2