crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add log filtering by path and link to it from tree view

Browse Source 
This enables path-filtering in log-view, and adds a link per entry in
tree-view to show the log for each file/directory.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2007-05-14 11:10:59 +02:00
parent 4fdf571c88
commit 9fb53af215
6 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cgit.c
View File

@ -108,9 +108,10 @@ static void cgit_print_repo_page(struct cacheitem *item)
if (!strcmp(cgit_query_page, "log")) {
cgit_print_log(cgit_query_head, cgit_query_ofs,
cgit_max_commit_count, cgit_query_search);
cgit_max_commit_count, cgit_query_search,
cgit_query_path);
} else if (!strcmp(cgit_query_page, "tree")) {
cgit_print_tree(cgit_query_sha1, cgit_query_path);
cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
} else if (!strcmp(cgit_query_page, "commit")) {
cgit_print_commit(cgit_query_sha1);
} else if (!strcmp(cgit_query_page, "view")) {

5
cgit.css
View File

@ -189,6 +189,11 @@ td.filesize {
font-family: monospace;
}
td.links {
font-size: 80%;
padding-left: 2em;
}
td.filemode {
font-family: monospace;
}

4
cgit.h
View File

@ -169,10 +169,10 @@ extern void cgit_print_snapshot_start(const char *mimetype,
extern void cgit_print_repolist(struct cacheitem *item);
extern void cgit_print_summary();
extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep);
extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path);
extern void cgit_print_view(const char *hex, char *path);
extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
extern void cgit_print_tree(const char *hex, char *path);
extern void cgit_print_tree(const char *rev, const char *hex, char *path);
extern void cgit_print_commit(const char *hex);
extern void cgit_print_diff(const char *old_hex, const char *new_hex, char *path);
extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,

3
ui-commit.c
View File

@ -186,7 +186,8 @@ void cgit_print_commit(const char *hex)
cgit_print_date(info->committer_date);
html("</td></tr>\n");
html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
query = fmt("id=%s", sha1_to_hex(commit->tree->object.sha1));
query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1),
sha1_to_hex(commit->tree->object.sha1));
html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
for (p = commit->parents; p ; p = p->next) {

8
ui-log.c
View File

@ -53,16 +53,20 @@ void print_commit(struct commit *commit)
}
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
{
struct rev_info rev;
struct commit *commit;
const char *argv[3] = {NULL, tip, NULL};
const char *argv[] = {NULL, tip, NULL, NULL, NULL};
int argc = 2;
int i;
if (grep)
argv[argc++] = fmt("--grep=%s", grep);
if (path) {
argv[argc++] = "--";
argv[argc++] = path;
}
init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT;

25
ui-tree.c
View File

@ -8,9 +8,10 @@
#include "cgit.h"
char *curr_rev;
static int print_entry(const unsigned char *sha1, const char *base,
int baselen, const char *pathname, unsigned int mode,
static int print_entry(const unsigned char *sha1, const char *base,
int baselen, const char *pathname, unsigned int mode,
int stage)
{
char *name;
@ -35,30 +36,41 @@ static int print_entry(const unsigned char *sha1, const char *base,
sha1_to_hex(sha1)));
} else if (S_ISDIR(mode)) {
html("class='ls-dir'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "tree",
fmt("id=%s&path=%s%s/",
html_attr(cgit_pageurl(cgit_query_repo, "tree",
fmt("h=%s&id=%s&path=%s%s/",
curr_rev,
sha1_to_hex(sha1),
cgit_query_path ? cgit_query_path : "",
pathname)));
} else {
html("class='ls-blob'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "view",
fmt("id=%s&path=%s%s", sha1_to_hex(sha1),
fmt("h=%s&id=%s&path=%s%s", curr_rev,
sha1_to_hex(sha1),
cgit_query_path ? cgit_query_path : "",
pathname)));
}
htmlf("'>%s</a></div></td>", name);
htmlf("<td class='filesize'>%li</td>", size);
html("<td class='links'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "log",
fmt("h=%s&path=%s%s",
curr_rev,
cgit_query_path ? cgit_query_path : "",
pathname)));
html("'>history</a></td>");
html("</tr>\n");
free(name);
return 0;
}
void cgit_print_tree(const char *hex, char *path)
void cgit_print_tree(const char *rev, const char *hex, char *path)
{
struct tree *tree;
unsigned char sha1[20];
curr_rev = xstrdup(rev);
if (get_sha1_hex(hex, sha1)) {
cgit_print_error(fmt("Invalid object id: %s", hex));
return;
@ -75,6 +87,7 @@ void cgit_print_tree(const char *hex, char *path)
html("<th class='left'>Mode</th>");
html("<th class='left'>Name</th>");
html("<th class='right'>Size</th>");
html("<th/>");
html("</tr>\n");
read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
html("</table>\n");