Since ranges may change in different branches, we should
make sure we do not pass range to parent until all the
ranges get 'combined' at the commit which is a split commit.
So, topological traversing is necessary.
Signed-off-by: Bo Yang <struggleyb.nku@xxxxxxxxx>
---
builtin/log.c | 5 ++++-
line.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
line.h | 2 ++
3 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index f204129..87d6b2f 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -632,7 +632,10 @@ int cmd_log(int argc, const char **argv, const char *prefix)
memset(&opt, 0, sizeof(opt));
opt.def = "HEAD";
cmd_log_init(argc, argv, prefix, &rev, &opt);
- return cmd_log_walk(&rev);
+ if (rev.line)
+ return cmd_line_log_walk(&rev);
+ else
+ return cmd_log_walk(&rev);
}
/* format-patch */
diff --git a/line.c b/line.c
index 29bda11..46d0937 100644
--- a/line.c
+++ b/line.c
@@ -1183,3 +1183,55 @@ static void line_log_flush(struct rev_info *rev, struct commit *c)
}
}
+int cmd_line_log_walk(struct rev_info *rev)
+{
+ struct commit *commit;
+ struct commit_list *list = NULL;
+ struct diff_line_range *r = NULL;
+
+ if (prepare_revision_walk(rev))
+ die("revision walk prepare failed");
+
+ list = rev->commits;
+ if (list) {
+ list->item->object.flags |= RANGE_UPDATE;
+ list = list->next;
+ }
+ /* Clear the flags */
+ while (list) {
+ list->item->object.flags &= 0x0;
+ list = list->next;
+ }
+
+ list = rev->commits;
+ while (list) {
+ commit = list->item;
+
+ if (commit->object.flags & RANGE_UPDATE) {
+ assign_parents_range(rev, commit);
+ }
+
+ if (commit->object.flags & NEED_PRINT) {
+ line_log_flush(rev, commit);
+ }
+
+ r = lookup_line_range(rev, commit);
+ if (r) {
+ cleanup(r);
+ r = NULL;
+ add_line_range(rev, commit, r);
+ }
+
+ r = lookup_decoration(&rev->nontrivial_merge, &commit->object);
+ if (r) {
+ cleanup(r);
+ r = NULL;
+ add_decoration(&rev->nontrivial_merge, &commit->object, r);
+ }
+
+ list = list->next;
+ }
+
+ return 0;
+}
+
diff --git a/line.h b/line.h
index b6f328c..203c323 100644
--- a/line.h
+++ b/line.h
@@ -123,4 +123,6 @@ extern void add_line_range(struct rev_info *revs, struct commit *commit, struct
extern struct diff_line_range *lookup_line_range(struct rev_info *revs, struct commit *commit);
+extern int cmd_line_log_walk(struct rev_info *rev);
+
#endif
--
1.7.1.577.g36cf0.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html