cgit.css: try to make diffs look a little bit nicer
This makes the diffview look more like 'git-diff' in a terminal. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Этот коммит содержится в:
родитель
a1a0cd8b5a
Коммит
a342ac6b4d
13
cgit.css
13
cgit.css
@ -294,19 +294,18 @@ div.diffstat-summary {
|
|||||||
padding-top: 0.5em;
|
padding-top: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
table.diff th {
|
|
||||||
padding: 1em 0em 0.1em 0.1em;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
table.diff td {
|
table.diff td {
|
||||||
border: solid 1px black;
|
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
white-space: pre;
|
white-space: pre;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
table.diff td div.head {
|
||||||
|
font-weight: bold;
|
||||||
|
padding-top: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
table.diff td div.hunk {
|
table.diff td div.hunk {
|
||||||
background: #ccc;
|
color: #009;
|
||||||
}
|
}
|
||||||
|
|
||||||
table.diff td div.add {
|
table.diff td div.add {
|
||||||
|
32
ui-diff.c
32
ui-diff.c
@ -31,12 +31,33 @@ static void print_line(char *line, int len)
|
|||||||
line[len-1] = c;
|
line[len-1] = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void header(unsigned char *sha1, char *path1,
|
||||||
|
unsigned char *sha2, char *path2)
|
||||||
|
{
|
||||||
|
char *abbrev1, *abbrev2;
|
||||||
|
|
||||||
|
html("<tr><td>");
|
||||||
|
html("<div class='head'>");
|
||||||
|
html("diff --git a/");
|
||||||
|
html_txt(path1);
|
||||||
|
html(" b/");
|
||||||
|
html_txt(path2);
|
||||||
|
abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
|
||||||
|
abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
|
||||||
|
htmlf("\nindex %s..%s", abbrev1, abbrev2);
|
||||||
|
free(abbrev1);
|
||||||
|
free(abbrev2);
|
||||||
|
html("\n--- a/");
|
||||||
|
html_txt(path1);
|
||||||
|
html("\n+++ b/");
|
||||||
|
html_txt(path2);
|
||||||
|
html("</div>");
|
||||||
|
}
|
||||||
|
|
||||||
static void filepair_cb(struct diff_filepair *pair)
|
static void filepair_cb(struct diff_filepair *pair)
|
||||||
{
|
{
|
||||||
html("<tr><th>");
|
header(pair->one->sha1, pair->one->path,
|
||||||
html_txt(pair->two->path);
|
pair->two->sha1, pair->two->path);
|
||||||
html("</th></tr>");
|
|
||||||
html("<tr><td>");
|
|
||||||
if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
|
if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
|
||||||
cgit_print_error("Error running diff");
|
cgit_print_error("Error running diff");
|
||||||
html("</tr></td>");
|
html("</tr></td>");
|
||||||
@ -63,9 +84,8 @@ void cgit_print_diff(const char *old_hex, const char *new_hex, char *path)
|
|||||||
html("<table class='diff'>");
|
html("<table class='diff'>");
|
||||||
switch(type) {
|
switch(type) {
|
||||||
case OBJ_BLOB:
|
case OBJ_BLOB:
|
||||||
if (path)
|
|
||||||
htmlf("<tr><th>%s</th></tr>", path);
|
|
||||||
html("<tr><td>");
|
html("<tr><td>");
|
||||||
|
header(sha1, path, sha2, path);
|
||||||
if (cgit_diff_files(sha1, sha2, print_line))
|
if (cgit_diff_files(sha1, sha2, print_line))
|
||||||
cgit_print_error("Error running diff");
|
cgit_print_error("Error running diff");
|
||||||
html("</tr></td>");
|
html("</tr></td>");
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user