[PATCH 1/3] pretty: Pass graph width to pretty formatting for use in '%>|(N)'
From: Josef Kufner <hidden>
Date: 2016-06-15 23:06:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/3] pretty: Pass graph width to pretty formatting for use in '%>|(N)' · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 1/3] pretty: Pass graph width to pretty formatting for use in '%>|(N)' · Duy Nguyen <hidden>
- 2016-06-15 · Re: [PATCH 1/3] pretty: Pass graph width to pretty formatting for use in '%>|(N)' · Junio C Hamano <hidden>
Pass graph width to pretty formatting, so N in '%>|(N)' includes columns consumed by graph rendered when --graph option is in use. Example: git log --all --graph --pretty='format: [%>|(20)%h] %ar%d' All commit hashes should be aligned at 20th column from edge of the terminal, not from the edge of the graph. Signed-off-by: Josef Kufner <redacted> --- commit.h | 1 + graph.c | 7 +++++++ graph.h | 5 +++++ log-tree.c | 2 ++ pretty.c | 1 + 5 files changed, 16 insertions(+)
diff --git a/commit.h b/commit.h
index 5d58be0..0a9a707 100644
--- a/commit.h
+++ b/commit.h@@ -160,6 +160,7 @@ struct pretty_print_context { * should not be counted on by callers. */ struct string_list in_body_headers; + int graph_width; }; struct userformat_want {
diff --git a/graph.c b/graph.c
index c25a09a..4802411 100644
--- a/graph.c
+++ b/graph.c@@ -671,6 +671,13 @@ static void graph_output_padding_line(struct git_graph *graph, graph_pad_horizontally(graph, sb, graph->num_new_columns * 2); } + +int graph_width(struct git_graph *graph) +{ + return graph->width; +} + + static void graph_output_skip_line(struct git_graph *graph, struct strbuf *sb) { /*
diff --git a/graph.h b/graph.h
index 0be62bd..3f48c19 100644
--- a/graph.h
+++ b/graph.h@@ -68,6 +68,11 @@ int graph_next_line(struct git_graph *graph, struct strbuf *sb); /* + * Return current width of the graph in on-screen characters. + */ +int graph_width(struct git_graph *graph); + +/* * graph_show_*: helper functions for printing to stdout */
diff --git a/log-tree.c b/log-tree.c
index 7b1b57a..08fd5b6 100644
--- a/log-tree.c
+++ b/log-tree.c@@ -686,6 +686,8 @@ void show_log(struct rev_info *opt) ctx.output_encoding = get_log_output_encoding(); if (opt->from_ident.mail_begin && opt->from_ident.name_begin) ctx.from_ident = &opt->from_ident; + if (opt->graph) + ctx.graph_width = graph_width(opt->graph); pretty_print_commit(&ctx, commit, &msgbuf); if (opt->add_signoff)
diff --git a/pretty.c b/pretty.c
index 151c2ae..f1cf9e2 100644
--- a/pretty.c
+++ b/pretty.c@@ -1297,6 +1297,7 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */ if (!start) start = sb->buf; occupied = utf8_strnwidth(start, -1, 1); + occupied += c->pretty_ctx->graph_width; padding = (-padding) - occupied; } while (1) {
--
2.5.1