From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 2/4] ui-blame: Break out emit_blame_entry into component methods
Date: Sat, 21 Oct 2017 15:33:43 +0100 [thread overview]
Message-ID: <20171021143343.GD2393@john.keeping.me.uk> (raw)
In-Reply-To: <20171018041735.31592-3-whydoubt@gmail.com>
On Tue, Oct 17, 2017 at 11:17:33PM -0500, Jeff Smith wrote:
> Signed-off-by: Jeff Smith <whydoubt at gmail.com>
Reviewed-by: John Keeping <john at keeping.me.uk>
> ---
> ui-blame.c | 44 ++++++++++++++++++++++++++++++--------------
> 1 file changed, 30 insertions(+), 14 deletions(-)
>
> diff --git a/ui-blame.c b/ui-blame.c
> index a5ac590..9b84147 100644
> --- a/ui-blame.c
> +++ b/ui-blame.c
> @@ -41,36 +41,52 @@ static char *emit_suspect_detail(struct blame_origin *suspect)
> return strbuf_detach(&detail, NULL);
> }
>
> -static void emit_blame_entry(struct blame_scoreboard *sb,
> - struct blame_entry *ent)
> +static void emit_blame_entry_hash(struct blame_entry *ent)
> {
> struct blame_origin *suspect = ent->suspect;
> struct object_id *oid = &suspect->commit->object.oid;
> +
> + char *detail = emit_suspect_detail(suspect);
> + cgit_commit_link(find_unique_abbrev(oid->hash, DEFAULT_ABBREV), detail,
> + NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
> + free(detail);
> +}
> +
> +static void emit_blame_entry_linenumber(struct blame_entry *ent)
> +{
> const char *numberfmt = "<a id='n%1$d' href='#n%1$d'>%1$d</a>\n";
> +
> + unsigned long lineno = ent->lno;
> + while (lineno < ent->lno + ent->num_lines)
> + htmlf(numberfmt, ++lineno);
> +}
> +
> +static void emit_blame_entry_line(struct blame_scoreboard *sb,
> + struct blame_entry *ent)
> +{
> const char *cp, *cpend;
>
> - char *detail = emit_suspect_detail(suspect);
> + cp = blame_nth_line(sb, ent->lno);
> + cpend = blame_nth_line(sb, ent->lno + ent->num_lines);
> +
> + html_ntxt(cp, cpend - cp);
> +}
>
> +static void emit_blame_entry(struct blame_scoreboard *sb,
> + struct blame_entry *ent)
> +{
> html("<tr><td class='sha1 hashes'>");
> - cgit_commit_link(find_unique_abbrev(oid->hash, DEFAULT_ABBREV), detail,
> - NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
> + emit_blame_entry_hash(ent);
> html("</td>\n");
>
> - free(detail);
> -
> if (ctx.cfg.enable_tree_linenumbers) {
> - unsigned long lineno = ent->lno;
> html("<td class='linenumbers'><pre>");
> - while (lineno < ent->lno + ent->num_lines)
> - htmlf(numberfmt, ++lineno);
> + emit_blame_entry_linenumber(ent);
> html("</pre></td>\n");
> }
>
> - cp = blame_nth_line(sb, ent->lno);
> - cpend = blame_nth_line(sb, ent->lno + ent->num_lines);
> -
> html("<td class='lines'><pre><code>");
> - html_ntxt(cp, cpend - cp);
> + emit_blame_entry_line(sb, ent);
> html("</code></pre></td></tr>\n");
> }
>
next prev parent reply other threads:[~2017-10-21 14:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 4:17 [PATCH 0/4] Add ui-blame syntax highlighting whydoubt
2017-10-18 4:17 ` [PATCH 1/4] ui-blame: Distinguish hashes column from lines column whydoubt
2017-10-21 14:33 ` john
2017-10-18 4:17 ` [PATCH 2/4] ui-blame: Break out emit_blame_entry into component methods whydoubt
2017-10-21 14:33 ` john [this message]
2017-10-18 4:17 ` [PATCH 3/4] ui-blame: Make each column into a single table cell whydoubt
2017-10-21 14:34 ` john
2017-10-18 4:17 ` [PATCH 4/4] ui-blame: Allow syntax highlighting whydoubt
2017-10-21 14:43 ` john
2017-10-21 21:53 ` whydoubt
2017-10-24 14:30 ` Jason
2017-10-29 2:23 ` [PATCH 4/4 v2] " whydoubt
2017-10-29 2:26 ` whydoubt
2017-10-29 2:43 ` [PATCH 4/4 v3] " whydoubt
2017-10-29 22:23 ` Jason
2017-11-05 12:36 ` john
2018-01-19 10:41 ` [PATCH 0/4] Add ui-blame " Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171021143343.GD2393@john.keeping.me.uk \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).