all repos — cgit @ 4a6201e318d1db69d126f08a3d80ce2d5cf7ac01

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("<div class='head'>");
 42	html("diff --git a/");
 43	html_txt(path1);
 44	html(" b/");
 45	html_txt(path2);
 46
 47	if (is_null_sha1(sha1))
 48		path1 = "dev/null";
 49	if (is_null_sha1(sha2))
 50		path2 = "dev/null";
 51
 52	if (mode1 == 0)
 53		htmlf("<br/>new file mode %.6o", mode2);
 54
 55	if (mode2 == 0)
 56		htmlf("<br/>deleted file mode %.6o", mode1);
 57
 58	if (!subproject) {
 59		abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
 60		abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
 61		htmlf("<br/>index %s..%s", abbrev1, abbrev2);
 62		free(abbrev1);
 63		free(abbrev2);
 64		if (mode1 != 0 && mode2 != 0) {
 65			htmlf(" %.6o", mode1);
 66			if (mode2 != mode1)
 67				htmlf("..%.6o", mode2);
 68		}
 69		html("<br/>--- a/");
 70		html_txt(path1);
 71		html("<br/>+++ b/");
 72		html_txt(path2);
 73	}
 74	html("</div>");
 75}
 76
 77static void filepair_cb(struct diff_filepair *pair)
 78{
 79	header(pair->one->sha1, pair->one->path, pair->one->mode,
 80	       pair->two->sha1, pair->two->path, pair->two->mode);
 81	if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) {
 82		if (S_ISDIRLNK(pair->one->mode))
 83			print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
 84		if (S_ISDIRLNK(pair->two->mode))
 85			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 86		return;
 87	}
 88	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
 89		cgit_print_error("Error running diff");
 90}
 91
 92void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
 93{
 94	unsigned char sha1[20], sha2[20];
 95	enum object_type type;
 96	unsigned long size;
 97	struct commit *commit;
 98
 99	html("<table class='diff'>");
100	html("<tr><td>");
101
102	if (head && !old_hex && !new_hex) {
103		get_sha1(head, sha1);
104		commit = lookup_commit_reference(sha1);
105		if (commit && !parse_commit(commit))
106			cgit_diff_commit(commit, filepair_cb);
107		else
108			cgit_print_error(fmt("Bad commit: %s", head));
109		return;
110	}
111
112	get_sha1(old_hex, sha1);
113	get_sha1(new_hex, sha2);
114
115	type = sha1_object_info(sha1, &size);
116	if (type == OBJ_BAD) {
117		type = sha1_object_info(sha2, &size);
118		if (type == OBJ_BAD) {
119			cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
120			return;
121		}
122	}
123
124	switch(type) {
125	case OBJ_BLOB:
126		header(sha1, path, 0644, sha2, path, 0644);
127		if (cgit_diff_files(sha1, sha2, print_line))
128			cgit_print_error("Error running diff");
129		break;
130	case OBJ_TREE:
131		cgit_diff_tree(sha1, sha2, filepair_cb);
132		break;
133	default:
134		cgit_print_error(fmt("Unhandled object type: %s",
135				     typename(type)));
136		break;
137	}
138	html("</td></tr>");
139	html("</table>");
140}