all repos — cgit @ 271ac5a7e6b5b67f54fdd16e8542aa282f1c7140

a hyperfast web frontend for git written in c

ui-diff.c (view raw)

  1/* ui-diff.c: show diff between two blobs
  2 *
  3 * Copyright (C) 2006 Lars Hjemli
  4 *
  5 * Licensed under GNU General Public License v2
  6 *   (see COPYING for full license text)
  7 */
  8
  9#include "cgit.h"
 10
 11
 12/*
 13 * print a single line returned from xdiff
 14 */
 15static void print_line(char *line, int len)
 16{
 17	char *class = "ctx";
 18	char c = line[len-1];
 19
 20	if (line[0] == '+')
 21		class = "add";
 22	else if (line[0] == '-')
 23		class = "del";
 24	else if (line[0] == '@')
 25		class = "hunk";
 26
 27	htmlf("<div class='%s'>", class);
 28	line[len-1] = '\0';
 29	html_txt(line);
 30	html("</div>");
 31	line[len-1] = c;
 32}
 33
 34static void header(unsigned char *sha1, char *path1, int mode1,
 35		   unsigned char *sha2, char *path2, int mode2)
 36{
 37	char *abbrev1, *abbrev2;
 38	int subproject;
 39
 40	subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
 41	html("<tr><td>");
 42	html("<div class='head'>");
 43	html("diff --git a/");
 44	html_txt(path1);
 45	html(" b/");
 46	html_txt(path2);
 47
 48	if (is_null_sha1(sha1))
 49		path1 = "dev/null";
 50	if (is_null_sha1(sha2))
 51		path2 = "dev/null";
 52
 53	if (mode1 == 0)
 54		htmlf("<br/>new file mode %.6o", mode2);
 55
 56	if (mode2 == 0)
 57		htmlf("<br/>deleted file mode %.6o", mode1);
 58
 59	if (!subproject) {
 60		abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
 61		abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
 62		htmlf("<br/>index %s..%s", abbrev1, abbrev2);
 63		free(abbrev1);
 64		free(abbrev2);
 65		if (mode1 != 0 && mode2 != 0) {
 66			htmlf(" %.6o", mode1);
 67			if (mode2 != mode1)
 68				htmlf("..%.6o", mode2);
 69		}
 70		html("<br/>--- a/");
 71		html_txt(path1);
 72		html("<br/>+++ b/");
 73		html_txt(path2);
 74	}
 75	html("</div>");
 76}
 77
 78static void filepair_cb(struct diff_filepair *pair)
 79{
 80	header(pair->one->sha1, pair->one->path, pair->one->mode,
 81	       pair->two->sha1, pair->two->path, pair->two->mode);
 82	if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) {
 83		if (S_ISDIRLNK(pair->one->mode))
 84			print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
 85		if (S_ISDIRLNK(pair->two->mode))
 86			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 87		return;
 88	}
 89	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
 90		cgit_print_error("Error running diff");
 91}
 92
 93void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
 94{
 95	unsigned char sha1[20], sha2[20];
 96	enum object_type type;
 97	unsigned long size;
 98	struct commit *commit;
 99
100	if (head && !old_hex && !new_hex) {
101		get_sha1(head, sha1);
102		commit = lookup_commit_reference(sha1);
103		if (commit && !parse_commit(commit)) {
104			html("<table class='diff'>");
105			cgit_diff_commit(commit, filepair_cb);
106			html("</td></tr></table>");
107		}
108		return;
109	}
110
111	get_sha1(old_hex, sha1);
112	get_sha1(new_hex, sha2);
113
114	type = sha1_object_info(sha1, &size);
115	if (type == OBJ_BAD) {
116		type = sha1_object_info(sha2, &size);
117		if (type == OBJ_BAD) {
118			cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
119			return;
120		}
121	}
122
123	html("<table class='diff'>");
124	switch(type) {
125	case OBJ_BLOB:
126		html("<tr><td>");
127		header(sha1, path, 0644, sha2, path, 0644);
128		if (cgit_diff_files(sha1, sha2, print_line))
129			cgit_print_error("Error running diff");
130		html("</tr></td>");
131		break;
132	case OBJ_TREE:
133		cgit_diff_tree(sha1, sha2, filepair_cb);
134		break;
135	default:
136		cgit_print_error(fmt("Unhandled object type: %s",
137				     typename(type)));
138		break;
139	}
140	html("</td></tr></table>");
141}