This includes adding a path argument to cgit_commit_link() and updating all its callers. The callers from within the commit page (i.e. the "commit", "unidiff"/"side-by-side diff" and "parent" links) all preserve the path limit of the current commit page. All other callers pass NULL (i.e. no path limit). Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
		
			
				
	
	
		
			129 строки
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			129 строки
		
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* ui-commit.c: generate commit view
 | 
						|
 *
 | 
						|
 * Copyright (C) 2006 Lars Hjemli
 | 
						|
 *
 | 
						|
 * Licensed under GNU General Public License v2
 | 
						|
 *   (see COPYING for full license text)
 | 
						|
 */
 | 
						|
 | 
						|
#include "cgit.h"
 | 
						|
#include "html.h"
 | 
						|
#include "ui-shared.h"
 | 
						|
#include "ui-diff.h"
 | 
						|
#include "ui-log.h"
 | 
						|
 | 
						|
void cgit_print_commit(char *hex, const char *prefix)
 | 
						|
{
 | 
						|
	struct commit *commit, *parent;
 | 
						|
	struct commitinfo *info;
 | 
						|
	struct commit_list *p;
 | 
						|
	unsigned char sha1[20];
 | 
						|
	char *tmp;
 | 
						|
	int parents = 0;
 | 
						|
 | 
						|
	if (!hex)
 | 
						|
		hex = ctx.qry.head;
 | 
						|
 | 
						|
	if (get_sha1(hex, sha1)) {
 | 
						|
		cgit_print_error(fmt("Bad object id: %s", hex));
 | 
						|
		return;
 | 
						|
	}
 | 
						|
	commit = lookup_commit_reference(sha1);
 | 
						|
	if (!commit) {
 | 
						|
		cgit_print_error(fmt("Bad commit reference: %s", hex));
 | 
						|
		return;
 | 
						|
	}
 | 
						|
	info = cgit_parse_commit(commit);
 | 
						|
 | 
						|
	load_ref_decorations(DECORATE_FULL_REFS);
 | 
						|
 | 
						|
	html("<table summary='commit info' class='commit-info'>\n");
 | 
						|
	html("<tr><th>author</th><td>");
 | 
						|
	html_txt(info->author);
 | 
						|
	if (!ctx.cfg.noplainemail) {
 | 
						|
		html(" ");
 | 
						|
		html_txt(info->author_email);
 | 
						|
	}
 | 
						|
	html("</td><td class='right'>");
 | 
						|
	cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
 | 
						|
	html("</td></tr>\n");
 | 
						|
	html("<tr><th>committer</th><td>");
 | 
						|
	html_txt(info->committer);
 | 
						|
	if (!ctx.cfg.noplainemail) {
 | 
						|
		html(" ");
 | 
						|
		html_txt(info->committer_email);
 | 
						|
	}
 | 
						|
	html("</td><td class='right'>");
 | 
						|
	cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
 | 
						|
	html("</td></tr>\n");
 | 
						|
	html("<tr><th>commit</th><td colspan='2' class='sha1'>");
 | 
						|
	tmp = sha1_to_hex(commit->object.sha1);
 | 
						|
	cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
 | 
						|
	html(" (");
 | 
						|
	cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
 | 
						|
	html(") (");
 | 
						|
	if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
 | 
						|
		cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
 | 
						|
	else
 | 
						|
		cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
 | 
						|
	html(")</td></tr>\n");
 | 
						|
	html("<tr><th>tree</th><td colspan='2' class='sha1'>");
 | 
						|
	tmp = xstrdup(hex);
 | 
						|
	cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
 | 
						|
		       ctx.qry.head, tmp, NULL);
 | 
						|
	if (prefix) {
 | 
						|
		html(" /");
 | 
						|
		cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
 | 
						|
	}
 | 
						|
	html("</td></tr>\n");
 | 
						|
      	for (p = commit->parents; p ; p = p->next) {
 | 
						|
		parent = lookup_commit_reference(p->item->object.sha1);
 | 
						|
		if (!parent) {
 | 
						|
			html("<tr><td colspan='3'>");
 | 
						|
			cgit_print_error("Error reading parent commit");
 | 
						|
			html("</td></tr>");
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
		html("<tr><th>parent</th>"
 | 
						|
		     "<td colspan='2' class='sha1'>");
 | 
						|
		cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
 | 
						|
				 ctx.qry.head,
 | 
						|
				 sha1_to_hex(p->item->object.sha1), prefix, 0);
 | 
						|
		html(" (");
 | 
						|
		cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
 | 
						|
			       sha1_to_hex(p->item->object.sha1), prefix, 0);
 | 
						|
		html(")</td></tr>");
 | 
						|
		parents++;
 | 
						|
	}
 | 
						|
	if (ctx.repo->snapshots) {
 | 
						|
		html("<tr><th>download</th><td colspan='2' class='sha1'>");
 | 
						|
		cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
 | 
						|
					  hex, ctx.repo->snapshots);
 | 
						|
		html("</td></tr>");
 | 
						|
	}
 | 
						|
	html("</table>\n");
 | 
						|
	html("<div class='commit-subject'>");
 | 
						|
	if (ctx.repo->commit_filter)
 | 
						|
		cgit_open_filter(ctx.repo->commit_filter);
 | 
						|
	html_txt(info->subject);
 | 
						|
	if (ctx.repo->commit_filter)
 | 
						|
		cgit_close_filter(ctx.repo->commit_filter);
 | 
						|
	show_commit_decorations(commit);
 | 
						|
	html("</div>");
 | 
						|
	html("<div class='commit-msg'>");
 | 
						|
	if (ctx.repo->commit_filter)
 | 
						|
		cgit_open_filter(ctx.repo->commit_filter);
 | 
						|
	html_txt(info->msg);
 | 
						|
	if (ctx.repo->commit_filter)
 | 
						|
		cgit_close_filter(ctx.repo->commit_filter);
 | 
						|
	html("</div>");
 | 
						|
	if (parents < 3) {
 | 
						|
		if (parents)
 | 
						|
			tmp = sha1_to_hex(commit->parents->item->object.sha1);
 | 
						|
		else
 | 
						|
			tmp = NULL;
 | 
						|
		cgit_print_diff(ctx.qry.sha1, tmp, prefix);
 | 
						|
	}
 | 
						|
	cgit_free_commitinfo(info);
 | 
						|
}
 |