summaryrefslogtreecommitdiffabout
path: root/ui-patch.c
authorLars Hjemli <hjemli@gmail.com>2008-03-17 22:13:16 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-03-17 22:51:47 (UTC)
commite01f1403b9b501c563b1fe0e0052460a95945528 (patch) (unidiff)
treeeff9fd11272714db70bf2ac7116511f03d800af6 /ui-patch.c
parent0537a7d1cfdf7934d91798a623030fd454b356af (diff)
downloadcgit-e01f1403b9b501c563b1fe0e0052460a95945528.zip
cgit-e01f1403b9b501c563b1fe0e0052460a95945528.tar.gz
cgit-e01f1403b9b501c563b1fe0e0052460a95945528.tar.bz2
Fix segfault in patch view for root commit
The code for patch view assumed the current commit would always have a parent, which made cgit segfault when that wasn't the case. This fixes the bug and adds a test-script for patch view which includes a test for the inital commit. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-patch.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-patch.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui-patch.c b/ui-patch.c
index e7a010a..7ee2c41 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -1,110 +1,114 @@
1/* ui-patch.c: generate patch view 1/* ui-patch.c: generate patch view
2 * 2 *
3 * Copyright (C) 2007 Lars Hjemli 3 * Copyright (C) 2007 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
11static void print_line(char *line, int len) 11static void print_line(char *line, int len)
12{ 12{
13 char c = line[len-1]; 13 char c = line[len-1];
14 14
15 line[len-1] = '\0'; 15 line[len-1] = '\0';
16 htmlf("%s\n", line); 16 htmlf("%s\n", line);
17 line[len-1] = c; 17 line[len-1] = c;
18} 18}
19 19
20static void header(unsigned char *sha1, char *path1, int mode1, 20static void header(unsigned char *sha1, char *path1, int mode1,
21 unsigned char *sha2, char *path2, int mode2) 21 unsigned char *sha2, char *path2, int mode2)
22{ 22{
23 char *abbrev1, *abbrev2; 23 char *abbrev1, *abbrev2;
24 int subproject; 24 int subproject;
25 25
26 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); 26 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
27 htmlf("diff --git a/%s b/%s\n", path1, path2); 27 htmlf("diff --git a/%s b/%s\n", path1, path2);
28 28
29 if (is_null_sha1(sha1)) 29 if (is_null_sha1(sha1))
30 path1 = "dev/null"; 30 path1 = "dev/null";
31 if (is_null_sha1(sha2)) 31 if (is_null_sha1(sha2))
32 path2 = "dev/null"; 32 path2 = "dev/null";
33 33
34 if (mode1 == 0) 34 if (mode1 == 0)
35 htmlf("new file mode %.6o\n", mode2); 35 htmlf("new file mode %.6o\n", mode2);
36 36
37 if (mode2 == 0) 37 if (mode2 == 0)
38 htmlf("deleted file mode %.6o\n", mode1); 38 htmlf("deleted file mode %.6o\n", mode1);
39 39
40 if (!subproject) { 40 if (!subproject) {
41 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); 41 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
42 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); 42 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
43 htmlf("index %s..%s", abbrev1, abbrev2); 43 htmlf("index %s..%s", abbrev1, abbrev2);
44 free(abbrev1); 44 free(abbrev1);
45 free(abbrev2); 45 free(abbrev2);
46 if (mode1 != 0 && mode2 != 0) { 46 if (mode1 != 0 && mode2 != 0) {
47 htmlf(" %.6o", mode1); 47 htmlf(" %.6o", mode1);
48 if (mode2 != mode1) 48 if (mode2 != mode1)
49 htmlf("..%.6o", mode2); 49 htmlf("..%.6o", mode2);
50 } 50 }
51 htmlf("\n--- a/%s\n", path1); 51 htmlf("\n--- a/%s\n", path1);
52 htmlf("+++ b/%s\n", path2); 52 htmlf("+++ b/%s\n", path2);
53 } 53 }
54} 54}
55 55
56static void filepair_cb(struct diff_filepair *pair) 56static void filepair_cb(struct diff_filepair *pair)
57{ 57{
58 header(pair->one->sha1, pair->one->path, pair->one->mode, 58 header(pair->one->sha1, pair->one->path, pair->one->mode,
59 pair->two->sha1, pair->two->path, pair->two->mode); 59 pair->two->sha1, pair->two->path, pair->two->mode);
60 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 60 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
61 if (S_ISGITLINK(pair->one->mode)) 61 if (S_ISGITLINK(pair->one->mode))
62 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 62 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
63 if (S_ISGITLINK(pair->two->mode)) 63 if (S_ISGITLINK(pair->two->mode))
64 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 64 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
65 return; 65 return;
66 } 66 }
67 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 67 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
68 html("Error running diff"); 68 html("Error running diff");
69} 69}
70 70
71void cgit_print_patch(char *hex, struct cacheitem *item) 71void cgit_print_patch(char *hex, struct cacheitem *item)
72{ 72{
73 struct commit *commit; 73 struct commit *commit;
74 struct commitinfo *info; 74 struct commitinfo *info;
75 unsigned char sha1[20], old_sha1[20]; 75 unsigned char sha1[20], old_sha1[20];
76 char *patchname; 76 char *patchname;
77 77
78 if (!hex) 78 if (!hex)
79 hex = cgit_query_head; 79 hex = cgit_query_head;
80 80
81 if (get_sha1(hex, sha1)) { 81 if (get_sha1(hex, sha1)) {
82 cgit_print_error(fmt("Bad object id: %s", hex)); 82 cgit_print_error(fmt("Bad object id: %s", hex));
83 return; 83 return;
84 } 84 }
85 commit = lookup_commit_reference(sha1); 85 commit = lookup_commit_reference(sha1);
86 if (!commit) { 86 if (!commit) {
87 cgit_print_error(fmt("Bad commit reference: %s", hex)); 87 cgit_print_error(fmt("Bad commit reference: %s", hex));
88 return; 88 return;
89 } 89 }
90 info = cgit_parse_commit(commit); 90 info = cgit_parse_commit(commit);
91 hashcpy(old_sha1, commit->parents->item->object.sha1); 91
92 if (commit->parents && commit->parents->item)
93 hashcpy(old_sha1, commit->parents->item->object.sha1);
94 else
95 hashclr(old_sha1);
92 96
93 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 97 patchname = fmt("%s.patch", sha1_to_hex(sha1));
94 cgit_print_snapshot_start("text/plain", patchname, item); 98 cgit_print_snapshot_start("text/plain", patchname, item);
95 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); 99 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
96 htmlf("From: %s%s\n", info->author, info->author_email); 100 htmlf("From: %s%s\n", info->author, info->author_email);
97 html("Date: "); 101 html("Date: ");
98 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); 102 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n");
99 htmlf("Subject: %s\n\n", info->subject); 103 htmlf("Subject: %s\n\n", info->subject);
100 if (info->msg && *info->msg) { 104 if (info->msg && *info->msg) {
101 htmlf("%s", info->msg); 105 htmlf("%s", info->msg);
102 if (info->msg[strlen(info->msg) - 1] != '\n') 106 if (info->msg[strlen(info->msg) - 1] != '\n')
103 html("\n"); 107 html("\n");
104 } 108 }
105 html("---\n"); 109 html("---\n");
106 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); 110 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
107 html("--\n"); 111 html("--\n");
108 htmlf("cgit %s\n", CGIT_VERSION); 112 htmlf("cgit %s\n", CGIT_VERSION);
109 cgit_free_commitinfo(info); 113 cgit_free_commitinfo(info);
110} 114}