summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-02 16:00:44 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-02 16:00:44 -0700
commited73fe56428eecd2b635473f6a517a183c4713a3 (patch)
tree42b21a016eca79cfee341a1bc0dbf5118acdb01e /revision.h
parent4de1179afcb1105a43cf167b513afda42c4f152d (diff)
parent499926670665570d785bc7baca4d7cd4420823dc (diff)
downloadgit-ed73fe56428eecd2b635473f6a517a183c4713a3.tar.gz
Merge branch 'tr/line-log'
* tr/line-log: git-log(1): remove --full-line-diff description line-log: fix documentation formatting log -L: improve comments in process_all_files() log -L: store the path instead of a diff_filespec log -L: test merge of parallel modify/rename t4211: pass -M to 'git log -M -L...' test log -L: fix overlapping input ranges log -L: check range set invariants when we look it up Speed up log -L... -M log -L: :pattern:file syntax to find by funcname Implement line-history search (git log -L) Export rewrite_parents() for 'log -L' Refactor parse_loc
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/revision.h b/revision.h
index 878a5556fd..a313a13405 100644
--- a/revision.h
+++ b/revision.h
@@ -97,7 +97,8 @@ struct rev_info {
cherry_mark:1,
bisect:1,
ancestry_path:1,
- first_parent_only:1;
+ first_parent_only:1,
+ line_level_traverse:1;
/* Diff flags */
unsigned int diff:1,
@@ -176,6 +177,9 @@ struct rev_info {
int count_left;
int count_right;
int count_same;
+
+ /* line level range that we are chasing */
+ struct decoration line_log_data;
};
#define REV_TREE_SAME 0
@@ -242,4 +246,14 @@ enum commit_action {
extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
+enum rewrite_result {
+ rewrite_one_ok,
+ rewrite_one_noparents,
+ rewrite_one_error
+};
+
+typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp);
+
+extern int rewrite_parents(struct rev_info *revs, struct commit *commit,
+ rewrite_parent_fn_t rewrite_parent);
#endif