summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-18 20:56:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-18 20:56:36 (GMT)
commit34e98ea56414adc5a582e6368e8ec9c109dbee48 (patch)
tree7081c2475ea0c9df65dcc9933c32a51ae174c352 /revision.h
parent4baff50551545e2b6825973ec37bcaf03edb95fe (diff)
parent3a624b346db02a07b0317743b362d1a15c6c3c18 (diff)
downloadgit-34e98ea56414adc5a582e6368e8ec9c109dbee48.zip
git-34e98ea56414adc5a582e6368e8ec9c109dbee48.tar.gz
git-34e98ea56414adc5a582e6368e8ec9c109dbee48.tar.bz2
Merge branch 'lt/logopt'
* lt/logopt: Fix "git log --stat": make sure to set recursive with --stat. combine-diff: show diffstat with the first parent. git.c: LOGSIZE is unused after log printing cleanup. Log message printout cleanups (#3): fix --pretty=oneline Log message printout cleanups (#2) Log message printout cleanups rev-list --header: output format fix Fixes for option parsing log/whatchanged/show - log formatting cleanup. Simplify common default options setup for built-in log family. Tentative built-in "git show" Built-in git-whatchanged. rev-list option parser fix. Split init_revisions() out of setup_revisions() Fix up rev-list option parsing. Fix up default abbrev in setup_revisions() argument parser. Common option parsing for "git log --diff" and friends
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h23
1 files changed, 22 insertions, 1 deletions
diff --git a/revision.h b/revision.h
index 4b27043..48d7b4c 100644
--- a/revision.h
+++ b/revision.h
@@ -11,6 +11,7 @@
#define ADDED (1u<<7) /* Parents already parsed and added? */
struct rev_info;
+struct log_info;
typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
@@ -27,6 +28,7 @@ struct rev_info {
/* Traversal flags */
unsigned int dense:1,
no_merges:1,
+ no_walk:1,
remove_empty_trees:1,
lifo:1,
topo_order:1,
@@ -39,13 +41,32 @@ struct rev_info {
boundary:1,
parents:1;
+ /* Diff flags */
+ unsigned int diff:1,
+ full_diff:1,
+ show_root_diff:1,
+ no_commit_id:1,
+ verbose_header:1,
+ ignore_merges:1,
+ combine_merges:1,
+ dense_combined_merges:1,
+ always_show_header:1;
+
+ /* Format info */
+ unsigned int shown_one:1,
+ abbrev_commit:1;
+ unsigned int abbrev;
+ enum cmit_fmt commit_format;
+ struct log_info *loginfo;
+
/* special limits */
int max_count;
unsigned long max_age;
unsigned long min_age;
- /* paths limiting */
+ /* diff info for patches and for paths limiting */
struct diff_options diffopt;
+ struct diff_options pruning;
topo_sort_set_fn_t topo_setter;
topo_sort_get_fn_t topo_getter;