summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
Diffstat (limited to 'ui-diff.c') (more/less context) (show whitespace changes)
-rw-r--r--ui-diff.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 4fcf852..2a22009 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -1,22 +1,23 @@
1/* ui-diff.c: show diff between two blobs 1/* ui-diff.c: show diff between two blobs
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10#include "html.h"
11#include "ui-shared.h"
11 12
12unsigned char old_rev_sha1[20]; 13unsigned char old_rev_sha1[20];
13unsigned char new_rev_sha1[20]; 14unsigned char new_rev_sha1[20];
14 15
15/* 16/*
16 * print a single line returned from xdiff 17 * print a single line returned from xdiff
17 */ 18 */
18static void print_line(char *line, int len) 19static void print_line(char *line, int len)
19{ 20{
20 char *class = "ctx"; 21 char *class = "ctx";
21 char c = line[len-1]; 22 char c = line[len-1];
22 23
@@ -62,31 +63,31 @@ static void header(unsigned char *sha1, char *path1, int mode1,
62 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); 63 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
63 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); 64 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
64 htmlf("<br/>index %s..%s", abbrev1, abbrev2); 65 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
65 free(abbrev1); 66 free(abbrev1);
66 free(abbrev2); 67 free(abbrev2);
67 if (mode1 != 0 && mode2 != 0) { 68 if (mode1 != 0 && mode2 != 0) {
68 htmlf(" %.6o", mode1); 69 htmlf(" %.6o", mode1);
69 if (mode2 != mode1) 70 if (mode2 != mode1)
70 htmlf("..%.6o", mode2); 71 htmlf("..%.6o", mode2);
71 } 72 }
72 html("<br/>--- a/"); 73 html("<br/>--- a/");
73 if (mode1 != 0) 74 if (mode1 != 0)
74 cgit_tree_link(path1, NULL, NULL, cgit_query_head, 75 cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
75 sha1_to_hex(old_rev_sha1), path1); 76 sha1_to_hex(old_rev_sha1), path1);
76 else 77 else
77 html_txt(path1); 78 html_txt(path1);
78 html("<br/>+++ b/"); 79 html("<br/>+++ b/");
79 if (mode2 != 0) 80 if (mode2 != 0)
80 cgit_tree_link(path2, NULL, NULL, cgit_query_head, 81 cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
81 sha1_to_hex(new_rev_sha1), path2); 82 sha1_to_hex(new_rev_sha1), path2);
82 else 83 else
83 html_txt(path2); 84 html_txt(path2);
84 } 85 }
85 html("</div>"); 86 html("</div>");
86} 87}
87 88
88static void filepair_cb(struct diff_filepair *pair) 89static void filepair_cb(struct diff_filepair *pair)
89{ 90{
90 header(pair->one->sha1, pair->one->path, pair->one->mode, 91 header(pair->one->sha1, pair->one->path, pair->one->mode,
91 pair->two->sha1, pair->two->path, pair->two->mode); 92 pair->two->sha1, pair->two->path, pair->two->mode);
92 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 93 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
@@ -98,25 +99,25 @@ static void filepair_cb(struct diff_filepair *pair)
98 } 99 }
99 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 100 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
100 cgit_print_error("Error running diff"); 101 cgit_print_error("Error running diff");
101} 102}
102 103
103void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) 104void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
104{ 105{
105 enum object_type type; 106 enum object_type type;
106 unsigned long size; 107 unsigned long size;
107 struct commit *commit, *commit2; 108 struct commit *commit, *commit2;
108 109
109 if (!new_rev) 110 if (!new_rev)
110 new_rev = cgit_query_head; 111 new_rev = ctx.qry.head;
111 get_sha1(new_rev, new_rev_sha1); 112 get_sha1(new_rev, new_rev_sha1);
112 type = sha1_object_info(new_rev_sha1, &size); 113 type = sha1_object_info(new_rev_sha1, &size);
113 if (type == OBJ_BAD) { 114 if (type == OBJ_BAD) {
114 cgit_print_error(fmt("Bad object name: %s", new_rev)); 115 cgit_print_error(fmt("Bad object name: %s", new_rev));
115 return; 116 return;
116 } 117 }
117 if (type != OBJ_COMMIT) { 118 if (type != OBJ_COMMIT) {
118 cgit_print_error(fmt("Unhandled object type: %s", 119 cgit_print_error(fmt("Unhandled object type: %s",
119 typename(type))); 120 typename(type)));
120 return; 121 return;
121 } 122 }
122 123