crtxcr/cgitsb
1
0
포크 0
코드 이슈 풀 리퀘스트 릴리즈 위키 활동

ui-shared: Drop filepair_cb_raw() and helper

소스 검색 
Remove filepair_cb_raw() and all related functions. These are no longer
needed. We now use Git's internal functions for raw diff formatting
everywhere.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-08-27 10:40:51 +02:00 committed by Jason A. Donenfeld
부모 2da46fe5aa
커밋 d181d6593f
2개의 변경된 파일과 0개의 추가작업 그리고 73개의 파일을 삭제
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
ui-shared.c
파일 보기

@ -950,75 +950,3 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
} }
strbuf_release(&filename); strbuf_release(&filename);
} }
static void print_line_raw(char *line, int len)
{
char c = line[len-1];
line[len-1] = '\0';
htmlf("%s\n", line);
line[len-1] = c;
}
static void header_raw(unsigned char *sha1, char *path1, int mode1,
unsigned char *sha2, char *path2, int mode2)
{
char *abbrev1, *abbrev2;
int subproject;
subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
htmlf("diff --git a/%s b/%s\n", path1, path2);
if (mode1 == 0)
htmlf("new file mode %.6o\n", mode2);
if (mode2 == 0)
htmlf("deleted file mode %.6o\n", mode1);
if (!subproject) {
abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
htmlf("index %s..%s", abbrev1, abbrev2);
free(abbrev1);
free(abbrev2);
if (mode1 != 0 && mode2 != 0) {
htmlf(" %.6o", mode1);
if (mode2 != mode1)
htmlf("..%.6o", mode2);
}
if (is_null_sha1(sha1)) {
path1 = "dev/null";
htmlf("\n--- /%s\n", path1);
} else
htmlf("\n--- a/%s\n", path1);
if (is_null_sha1(sha2)) {
path2 = "dev/null";
htmlf("+++ /%s\n", path2);
} else
htmlf("+++ b/%s\n", path2);
}
}
void filepair_cb_raw(struct diff_filepair *pair)
{
unsigned long old_size = 0;
unsigned long new_size = 0;
int binary = 0;
header_raw(pair->one->sha1, pair->one->path, pair->one->mode,
pair->two->sha1, pair->two->path, pair->two->mode);
if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
if (S_ISGITLINK(pair->one->mode))
print_line_raw(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
if (S_ISGITLINK(pair->two->mode))
print_line_raw(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
return;
}
if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
&new_size, &binary, 0, 0, print_line_raw))
html("Error running diff");
if (binary)
html("Binary files differ\n");
}

1
ui-shared.h
파일 보기

@ -67,5 +67,4 @@ extern void cgit_print_snapshot_links(const char *repo, const char *head,
const char *hex, int snapshots); const char *hex, int snapshots);
extern void cgit_add_hidden_formfields(int incl_head, int incl_search, extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
const char *page); const char *page);
extern void filepair_cb_raw(struct diff_filepair *pair);
#endif /* UI_SHARED_H */ #endif /* UI_SHARED_H */