-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | add.png | bin | 168 -> 0 bytes | |||
-rw-r--r-- | cgit.css | 21 | ||||
-rw-r--r-- | del.png | bin | 168 -> 0 bytes | |||
-rw-r--r-- | ui-commit.c | 20 |
5 files changed, 27 insertions, 15 deletions
@@ -1,85 +1,84 @@ | |||
1 | CGIT_VERSION = 0.4 | 1 | CGIT_VERSION = 0.4 |
2 | 2 | ||
3 | prefix = /var/www/htdocs/cgit | 3 | prefix = /var/www/htdocs/cgit |
4 | 4 | ||
5 | SHA1_HEADER = <openssl/sha.h> | 5 | SHA1_HEADER = <openssl/sha.h> |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | CGIT_CONFIG = /etc/cgitrc | 7 | CGIT_CONFIG = /etc/cgitrc |
8 | CGIT_SCRIPT_NAME = cgit.cgi | 8 | CGIT_SCRIPT_NAME = cgit.cgi |
9 | 9 | ||
10 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 10 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
11 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 11 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ |
12 | ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ | 12 | ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ |
13 | ui-snapshot.o ui-blob.o | 13 | ui-snapshot.o ui-blob.o |
14 | 14 | ||
15 | CFLAGS += -Wall | 15 | CFLAGS += -Wall |
16 | 16 | ||
17 | ifdef DEBUG | 17 | ifdef DEBUG |
18 | CFLAGS += -g | 18 | CFLAGS += -g |
19 | endif | 19 | endif |
20 | 20 | ||
21 | CFLAGS += -Igit | 21 | CFLAGS += -Igit |
22 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 22 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
23 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 23 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
24 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 24 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
25 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 25 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
26 | 26 | ||
27 | 27 | ||
28 | # | 28 | # |
29 | # If make is run on a nongit platform, we need to get the git sources as a tarball. | 29 | # If make is run on a nongit platform, we need to get the git sources as a tarball. |
30 | # But there is currently no recent enough tarball available on kernel.org, so download | 30 | # But there is currently no recent enough tarball available on kernel.org, so download |
31 | # a zipfile from hjemli.net instead | 31 | # a zipfile from hjemli.net instead |
32 | # | 32 | # |
33 | GITVER = $(shell git version 2>/dev/null || echo nogit) | 33 | GITVER = $(shell git version 2>/dev/null || echo nogit) |
34 | ifeq ($(GITVER),nogit) | 34 | ifeq ($(GITVER),nogit) |
35 | GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2 | 35 | GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2 |
36 | INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip) | 36 | INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip) |
37 | else | 37 | else |
38 | INITGIT = ./submodules.sh -i | 38 | INITGIT = ./submodules.sh -i |
39 | endif | 39 | endif |
40 | 40 | ||
41 | 41 | ||
42 | # | 42 | # |
43 | # basic build rules | 43 | # basic build rules |
44 | # | 44 | # |
45 | all: cgit | 45 | all: cgit |
46 | 46 | ||
47 | cgit: cgit.c cgit.h $(OBJECTS) | 47 | cgit: cgit.c cgit.h $(OBJECTS) |
48 | $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) | 48 | $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) |
49 | 49 | ||
50 | $(OBJECTS): cgit.h git/libgit.a | 50 | $(OBJECTS): cgit.h git/libgit.a |
51 | 51 | ||
52 | git/libgit.a: | 52 | git/libgit.a: |
53 | $(INITGIT) | 53 | $(INITGIT) |
54 | $(MAKE) -C git | 54 | $(MAKE) -C git |
55 | 55 | ||
56 | # | 56 | # |
57 | # phony targets | 57 | # phony targets |
58 | # | 58 | # |
59 | install: all clean-cache | 59 | install: all clean-cache |
60 | mkdir -p $(prefix) | 60 | mkdir -p $(prefix) |
61 | install cgit $(prefix)/$(CGIT_SCRIPT_NAME) | 61 | install cgit $(prefix)/$(CGIT_SCRIPT_NAME) |
62 | install cgit.css $(prefix)/cgit.css | 62 | install cgit.css $(prefix)/cgit.css |
63 | install add.png del.png $(prefix)/ | ||
64 | 63 | ||
65 | clean-cgit: | 64 | clean-cgit: |
66 | rm -f cgit *.o | 65 | rm -f cgit *.o |
67 | 66 | ||
68 | distclean-cgit: clean-cgit | 67 | distclean-cgit: clean-cgit |
69 | git clean -d -x | 68 | git clean -d -x |
70 | 69 | ||
71 | clean-sub: | 70 | clean-sub: |
72 | $(MAKE) -C git clean | 71 | $(MAKE) -C git clean |
73 | 72 | ||
74 | distclean-sub: clean-sub | 73 | distclean-sub: clean-sub |
75 | $(shell cd git && git clean -d -x) | 74 | $(shell cd git && git clean -d -x) |
76 | 75 | ||
77 | clean-cache: | 76 | clean-cache: |
78 | rm -rf $(CACHE_ROOT)/* | 77 | rm -rf $(CACHE_ROOT)/* |
79 | 78 | ||
80 | clean: clean-cgit clean-sub | 79 | clean: clean-cgit clean-sub |
81 | 80 | ||
82 | distclean: distclean-cgit distclean-sub | 81 | distclean: distclean-cgit distclean-sub |
83 | 82 | ||
84 | .PHONY: all install clean clean-cgit clean-sub clean-cache \ | 83 | .PHONY: all install clean clean-cgit clean-sub clean-cache \ |
85 | distclean distclean-cgit distclean-sub | 84 | distclean distclean-cgit distclean-sub |
diff --git a/add.png b/add.png deleted file mode 100644 index c550388..0000000 --- a/add.png +++ b/dev/null | |||
Binary files differ | |||
@@ -1,330 +1,347 @@ | |||
1 | body { | 1 | body { |
2 | font-family: arial; | 2 | font-family: arial; |
3 | font-size: 11pt; | 3 | font-size: 11pt; |
4 | background: white; | 4 | background: white; |
5 | } | 5 | } |
6 | 6 | ||
7 | body, table { | 7 | body, table { |
8 | padding: 0em; | 8 | padding: 0em; |
9 | margin: 0em; | 9 | margin: 0em; |
10 | } | 10 | } |
11 | 11 | ||
12 | table { | 12 | table { |
13 | border-collapse: collapse; | 13 | border-collapse: collapse; |
14 | } | 14 | } |
15 | 15 | ||
16 | h2 { | 16 | h2 { |
17 | font-size: 120%; | 17 | font-size: 120%; |
18 | font-weight: bold; | 18 | font-weight: bold; |
19 | margin-top: 0em; | 19 | margin-top: 0em; |
20 | margin-bottom: 0.25em; | 20 | margin-bottom: 0.25em; |
21 | } | 21 | } |
22 | 22 | ||
23 | h3 { | 23 | h3 { |
24 | margin-top: 0em; | 24 | margin-top: 0em; |
25 | font-size: 100%; | 25 | font-size: 100%; |
26 | font-weight: normal; | 26 | font-weight: normal; |
27 | } | 27 | } |
28 | 28 | ||
29 | h4 { | 29 | h4 { |
30 | margin-top: 1.5em; | 30 | margin-top: 1.5em; |
31 | margin-bottom: 0.1em; | 31 | margin-bottom: 0.1em; |
32 | font-size: 100%; | 32 | font-size: 100%; |
33 | font-weight: bold; | 33 | font-weight: bold; |
34 | } | 34 | } |
35 | 35 | ||
36 | a { | 36 | a { |
37 | color: blue; | 37 | color: blue; |
38 | text-decoration: none; | 38 | text-decoration: none; |
39 | } | 39 | } |
40 | 40 | ||
41 | a:hover { | 41 | a:hover { |
42 | text-decoration: underline; | 42 | text-decoration: underline; |
43 | } | 43 | } |
44 | 44 | ||
45 | table.list { | 45 | table.list { |
46 | border: none; | 46 | border: none; |
47 | border-collapse: collapse; | 47 | border-collapse: collapse; |
48 | } | 48 | } |
49 | 49 | ||
50 | table.list tr { | 50 | table.list tr { |
51 | background: white; | 51 | background: white; |
52 | } | 52 | } |
53 | 53 | ||
54 | table.list tr:hover { | 54 | table.list tr:hover { |
55 | background: #eee; | 55 | background: #eee; |
56 | } | 56 | } |
57 | 57 | ||
58 | table.list tr.nohover:hover { | 58 | table.list tr.nohover:hover { |
59 | background: white; | 59 | background: white; |
60 | } | 60 | } |
61 | 61 | ||
62 | table.list th { | 62 | table.list th { |
63 | font-weight: normal; | 63 | font-weight: normal; |
64 | border-bottom: solid 1px #777; | 64 | border-bottom: solid 1px #777; |
65 | padding: 0.1em 0.5em 0.1em 0.5em; | 65 | padding: 0.1em 0.5em 0.1em 0.5em; |
66 | vertical-align: baseline; | 66 | vertical-align: baseline; |
67 | } | 67 | } |
68 | 68 | ||
69 | table.list td { | 69 | table.list td { |
70 | border: none; | 70 | border: none; |
71 | padding: 0.1em 0.5em 0.1em 0.5em; | 71 | padding: 0.1em 0.5em 0.1em 0.5em; |
72 | } | 72 | } |
73 | 73 | ||
74 | img { | 74 | img { |
75 | border: none; | 75 | border: none; |
76 | } | 76 | } |
77 | 77 | ||
78 | table#layout { | 78 | table#layout { |
79 | width: 100%; | 79 | width: 100%; |
80 | border-collapse: collapse; | 80 | border-collapse: collapse; |
81 | margin: 0px; | 81 | margin: 0px; |
82 | } | 82 | } |
83 | 83 | ||
84 | td#header, td#logo { | 84 | td#header, td#logo { |
85 | color: #666; | 85 | color: #666; |
86 | background-color: #ddd; | 86 | background-color: #ddd; |
87 | border-bottom: solid 1px #000; | 87 | border-bottom: solid 1px #000; |
88 | } | 88 | } |
89 | 89 | ||
90 | td#header { | 90 | td#header { |
91 | font-size: 150%; | 91 | font-size: 150%; |
92 | font-weight: bold; | 92 | font-weight: bold; |
93 | padding: 0.2em 0.5em; | 93 | padding: 0.2em 0.5em; |
94 | vertical-align: text-bottom; | 94 | vertical-align: text-bottom; |
95 | } | 95 | } |
96 | 96 | ||
97 | td#logo { | 97 | td#logo { |
98 | text-align: right; | 98 | text-align: right; |
99 | vertical-align: middle; | 99 | vertical-align: middle; |
100 | padding-right: 0.5em; | 100 | padding-right: 0.5em; |
101 | } | 101 | } |
102 | 102 | ||
103 | td#crumb, td#search { | 103 | td#crumb, td#search { |
104 | color: #ccc; | 104 | color: #ccc; |
105 | border-top: solid 3px #555; | 105 | border-top: solid 3px #555; |
106 | background-color: #666; | 106 | background-color: #666; |
107 | border-bottom: solid 1px #333; | 107 | border-bottom: solid 1px #333; |
108 | padding: 2px 1em; | 108 | padding: 2px 1em; |
109 | } | 109 | } |
110 | 110 | ||
111 | td#crumb { | 111 | td#crumb { |
112 | font-weight: bold; | 112 | font-weight: bold; |
113 | } | 113 | } |
114 | 114 | ||
115 | td#crumb a { | 115 | td#crumb a { |
116 | color: #ccc; | 116 | color: #ccc; |
117 | } | 117 | } |
118 | 118 | ||
119 | td#crumb a:hover { | 119 | td#crumb a:hover { |
120 | color: #eee; | 120 | color: #eee; |
121 | } | 121 | } |
122 | 122 | ||
123 | td#search { | 123 | td#search { |
124 | text-align: right; | 124 | text-align: right; |
125 | vertical-align: center; | 125 | vertical-align: center; |
126 | padding-right: 0.5em; | 126 | padding-right: 0.5em; |
127 | } | 127 | } |
128 | 128 | ||
129 | td#search form { | 129 | td#search form { |
130 | margin: 0px; | 130 | margin: 0px; |
131 | padding: 0px; | 131 | padding: 0px; |
132 | } | 132 | } |
133 | 133 | ||
134 | td#search input { | 134 | td#search input { |
135 | font-size: 9pt; | 135 | font-size: 9pt; |
136 | padding: 0px; | 136 | padding: 0px; |
137 | width: 10em; | 137 | width: 10em; |
138 | border: solid 1px #333; | 138 | border: solid 1px #333; |
139 | color: #333; | 139 | color: #333; |
140 | background-color: #fff; | 140 | background-color: #fff; |
141 | } | 141 | } |
142 | 142 | ||
143 | td#summary { | 143 | td#summary { |
144 | vertical-align: top; | 144 | vertical-align: top; |
145 | padding-bottom: 1em; | 145 | padding-bottom: 1em; |
146 | } | 146 | } |
147 | 147 | ||
148 | td#archivelist { | 148 | td#archivelist { |
149 | padding-bottom: 1em; | 149 | padding-bottom: 1em; |
150 | } | 150 | } |
151 | 151 | ||
152 | td#archivelist table { | 152 | td#archivelist table { |
153 | float: right; | 153 | float: right; |
154 | border-collapse: collapse; | 154 | border-collapse: collapse; |
155 | border: solid 1px #777; | 155 | border: solid 1px #777; |
156 | } | 156 | } |
157 | 157 | ||
158 | td#archivelist table th { | 158 | td#archivelist table th { |
159 | background-color: #ccc; | 159 | background-color: #ccc; |
160 | } | 160 | } |
161 | 161 | ||
162 | td#content { | 162 | td#content { |
163 | padding: 1em 0.5em; | 163 | padding: 1em 0.5em; |
164 | } | 164 | } |
165 | 165 | ||
166 | div#blob { | 166 | div#blob { |
167 | border: solid 1px black; | 167 | border: solid 1px black; |
168 | } | 168 | } |
169 | 169 | ||
170 | div.error { | 170 | div.error { |
171 | color: red; | 171 | color: red; |
172 | font-weight: bold; | 172 | font-weight: bold; |
173 | margin: 1em 2em; | 173 | margin: 1em 2em; |
174 | } | 174 | } |
175 | 175 | ||
176 | td.ls-blob, td.ls-dir, td.ls-mod { | 176 | td.ls-blob, td.ls-dir, td.ls-mod { |
177 | font-family: monospace; | 177 | font-family: monospace; |
178 | } | 178 | } |
179 | 179 | ||
180 | div.ls-dir a { | 180 | div.ls-dir a { |
181 | font-weight: bold; | 181 | font-weight: bold; |
182 | } | 182 | } |
183 | 183 | ||
184 | th.filesize, td.filesize { | 184 | th.filesize, td.filesize { |
185 | text-align: right; | 185 | text-align: right; |
186 | } | 186 | } |
187 | 187 | ||
188 | td.filesize { | 188 | td.filesize { |
189 | font-family: monospace; | 189 | font-family: monospace; |
190 | } | 190 | } |
191 | 191 | ||
192 | td.links { | 192 | td.links { |
193 | font-size: 80%; | 193 | font-size: 80%; |
194 | padding-left: 2em; | 194 | padding-left: 2em; |
195 | } | 195 | } |
196 | 196 | ||
197 | td.filemode { | 197 | td.filemode { |
198 | font-family: monospace; | 198 | font-family: monospace; |
199 | } | 199 | } |
200 | 200 | ||
201 | td.blob { | 201 | td.blob { |
202 | white-space: pre; | 202 | white-space: pre; |
203 | font-family: monospace; | 203 | font-family: monospace; |
204 | background-color: white; | 204 | background-color: white; |
205 | } | 205 | } |
206 | 206 | ||
207 | table.nowrap td { | 207 | table.nowrap td { |
208 | white-space: nowrap; | 208 | white-space: nowrap; |
209 | } | 209 | } |
210 | 210 | ||
211 | table.commit-info { | 211 | table.commit-info { |
212 | border-collapse: collapse; | 212 | border-collapse: collapse; |
213 | margin-top: 1.5em; | 213 | margin-top: 1.5em; |
214 | } | 214 | } |
215 | 215 | ||
216 | table.commit-info th { | 216 | table.commit-info th { |
217 | text-align: left; | 217 | text-align: left; |
218 | font-weight: normal; | 218 | font-weight: normal; |
219 | padding: 0.1em 1em 0.1em 0.1em; | 219 | padding: 0.1em 1em 0.1em 0.1em; |
220 | } | 220 | } |
221 | 221 | ||
222 | table.commit-info td { | 222 | table.commit-info td { |
223 | font-weight: normal; | 223 | font-weight: normal; |
224 | padding: 0.1em 1em 0.1em 0.1em; | 224 | padding: 0.1em 1em 0.1em 0.1em; |
225 | } | 225 | } |
226 | 226 | ||
227 | div.commit-subject { | 227 | div.commit-subject { |
228 | font-weight: bold; | 228 | font-weight: bold; |
229 | font-size: 125%; | 229 | font-size: 125%; |
230 | margin: 1.5em 0em 0.5em 0em; | 230 | margin: 1.5em 0em 0.5em 0em; |
231 | padding: 0em; | 231 | padding: 0em; |
232 | } | 232 | } |
233 | 233 | ||
234 | div.commit-msg { | 234 | div.commit-msg { |
235 | white-space: pre; | 235 | white-space: pre; |
236 | font-family: monospace; | 236 | font-family: monospace; |
237 | } | 237 | } |
238 | 238 | ||
239 | table.diffstat { | 239 | table.diffstat { |
240 | border-collapse: collapse; | 240 | border-collapse: collapse; |
241 | margin-top: 1.5em; | 241 | margin-top: 1.5em; |
242 | width: 100%; | 242 | width: 100%; |
243 | border: solid 1px #aaa; | 243 | border: solid 1px #aaa; |
244 | background-color: #eee; | 244 | background-color: #eee; |
245 | } | 245 | } |
246 | 246 | ||
247 | table.diffstat tr:hover { | 247 | table.diffstat tr:hover { |
248 | background-color: #ccc; | 248 | background-color: #ccc; |
249 | } | 249 | } |
250 | 250 | ||
251 | table.diffstat th { | 251 | table.diffstat th { |
252 | font-weight: normal; | 252 | font-weight: normal; |
253 | text-align: left; | 253 | text-align: left; |
254 | text-decoration: underline; | 254 | text-decoration: underline; |
255 | padding: 0.1em 1em 0.1em 0.1em; | 255 | padding: 0.1em 1em 0.1em 0.1em; |
256 | font-size: 100%; | 256 | font-size: 100%; |
257 | } | 257 | } |
258 | 258 | ||
259 | table.diffstat td { | 259 | table.diffstat td { |
260 | padding: 0.2em 0.2em 0.1em 0.1em; | 260 | padding: 0.2em 0.2em 0.1em 0.1em; |
261 | font-size: 100%; | 261 | font-size: 100%; |
262 | border: none; | 262 | border: none; |
263 | } | 263 | } |
264 | 264 | ||
265 | table.diffstat td span.modechange { | 265 | table.diffstat td span.modechange { |
266 | padding-left: 1em; | 266 | padding-left: 1em; |
267 | color: red; | 267 | color: red; |
268 | } | 268 | } |
269 | 269 | ||
270 | table.diffstat td.add a { | 270 | table.diffstat td.add a { |
271 | color: green; | 271 | color: green; |
272 | } | 272 | } |
273 | 273 | ||
274 | table.diffstat td.del a { | 274 | table.diffstat td.del a { |
275 | color: red; | 275 | color: red; |
276 | } | 276 | } |
277 | 277 | ||
278 | table.diffstat td.upd a { | 278 | table.diffstat td.upd a { |
279 | color: blue; | 279 | color: blue; |
280 | } | 280 | } |
281 | 281 | ||
282 | table.diffstat td.graph { | 282 | table.diffstat td.graph { |
283 | width: 75%; | 283 | width: 75%; |
284 | vertical-align: center; | 284 | vertical-align: center; |
285 | } | 285 | } |
286 | 286 | ||
287 | table.diffstat td.graph img { | 287 | table.diffstat td.graph table { |
288 | border: none; | 288 | border: none; |
289 | height: 8pt; | 289 | } |
290 | |||
291 | table.diffstat td.graph td { | ||
292 | padding: 0px; | ||
293 | border: 0px; | ||
294 | height: 7pt; | ||
295 | } | ||
296 | |||
297 | table.diffstat td.graph td.add { | ||
298 | background-color: #5c5; | ||
299 | } | ||
300 | |||
301 | table.diffstat td.graph td.rem { | ||
302 | background-color: #c55; | ||
303 | } | ||
304 | |||
305 | table.diffstat td.graph td.none { | ||
306 | background-color: none; | ||
290 | } | 307 | } |
291 | 308 | ||
292 | div.diffstat-summary { | 309 | div.diffstat-summary { |
293 | color: #888; | 310 | color: #888; |
294 | padding-top: 0.5em; | 311 | padding-top: 0.5em; |
295 | } | 312 | } |
296 | 313 | ||
297 | table.diff td { | 314 | table.diff td { |
298 | font-family: monospace; | 315 | font-family: monospace; |
299 | white-space: pre; | 316 | white-space: pre; |
300 | } | 317 | } |
301 | 318 | ||
302 | table.diff td div.head { | 319 | table.diff td div.head { |
303 | font-weight: bold; | 320 | font-weight: bold; |
304 | padding-top: 1em; | 321 | padding-top: 1em; |
305 | } | 322 | } |
306 | 323 | ||
307 | table.diff td div.hunk { | 324 | table.diff td div.hunk { |
308 | color: #009; | 325 | color: #009; |
309 | } | 326 | } |
310 | 327 | ||
311 | table.diff td div.add { | 328 | table.diff td div.add { |
312 | color: green; | 329 | color: green; |
313 | } | 330 | } |
314 | 331 | ||
315 | table.diff td div.del { | 332 | table.diff td div.del { |
316 | color: red; | 333 | color: red; |
317 | } | 334 | } |
318 | 335 | ||
319 | .sha1 { | 336 | .sha1 { |
320 | font-family: courier; | 337 | font-family: courier; |
321 | font-size: 90%; | 338 | font-size: 90%; |
322 | } | 339 | } |
323 | 340 | ||
324 | .left { | 341 | .left { |
325 | text-align: left; | 342 | text-align: left; |
326 | } | 343 | } |
327 | 344 | ||
328 | .right { | 345 | .right { |
329 | text-align: right; | 346 | text-align: right; |
330 | } | 347 | } |
diff --git a/del.png b/del.png deleted file mode 100644 index 5c73e82..0000000 --- a/del.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/ui-commit.c b/ui-commit.c index b6a106f..8011dfc 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -1,240 +1,236 @@ | |||
1 | /* ui-commit.c: generate commit view | 1 | /* ui-commit.c: generate commit view |
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 | ||
11 | static int files, slots; | 11 | static int files, slots; |
12 | static int total_adds, total_rems, max_changes; | 12 | static int total_adds, total_rems, max_changes; |
13 | static int lines_added, lines_removed; | 13 | static int lines_added, lines_removed; |
14 | 14 | ||
15 | static struct fileinfo { | 15 | static struct fileinfo { |
16 | char status; | 16 | char status; |
17 | unsigned char old_sha1[20]; | 17 | unsigned char old_sha1[20]; |
18 | unsigned char new_sha1[20]; | 18 | unsigned char new_sha1[20]; |
19 | unsigned short old_mode; | 19 | unsigned short old_mode; |
20 | unsigned short new_mode; | 20 | unsigned short new_mode; |
21 | char *old_path; | 21 | char *old_path; |
22 | char *new_path; | 22 | char *new_path; |
23 | unsigned int added; | 23 | unsigned int added; |
24 | unsigned int removed; | 24 | unsigned int removed; |
25 | } *items; | 25 | } *items; |
26 | 26 | ||
27 | 27 | ||
28 | void print_fileinfo(struct fileinfo *info) | 28 | void print_fileinfo(struct fileinfo *info) |
29 | { | 29 | { |
30 | char *query, *query2; | 30 | char *query, *query2; |
31 | char *class; | 31 | char *class; |
32 | double width; | ||
33 | 32 | ||
34 | switch (info->status) { | 33 | switch (info->status) { |
35 | case DIFF_STATUS_ADDED: | 34 | case DIFF_STATUS_ADDED: |
36 | class = "add"; | 35 | class = "add"; |
37 | break; | 36 | break; |
38 | case DIFF_STATUS_COPIED: | 37 | case DIFF_STATUS_COPIED: |
39 | class = "cpy"; | 38 | class = "cpy"; |
40 | break; | 39 | break; |
41 | case DIFF_STATUS_DELETED: | 40 | case DIFF_STATUS_DELETED: |
42 | class = "del"; | 41 | class = "del"; |
43 | break; | 42 | break; |
44 | case DIFF_STATUS_MODIFIED: | 43 | case DIFF_STATUS_MODIFIED: |
45 | class = "upd"; | 44 | class = "upd"; |
46 | break; | 45 | break; |
47 | case DIFF_STATUS_RENAMED: | 46 | case DIFF_STATUS_RENAMED: |
48 | class = "mov"; | 47 | class = "mov"; |
49 | break; | 48 | break; |
50 | case DIFF_STATUS_TYPE_CHANGED: | 49 | case DIFF_STATUS_TYPE_CHANGED: |
51 | class = "typ"; | 50 | class = "typ"; |
52 | break; | 51 | break; |
53 | case DIFF_STATUS_UNKNOWN: | 52 | case DIFF_STATUS_UNKNOWN: |
54 | class = "unk"; | 53 | class = "unk"; |
55 | break; | 54 | break; |
56 | case DIFF_STATUS_UNMERGED: | 55 | case DIFF_STATUS_UNMERGED: |
57 | class = "stg"; | 56 | class = "stg"; |
58 | break; | 57 | break; |
59 | default: | 58 | default: |
60 | die("bug: unhandled diff status %c", info->status); | 59 | die("bug: unhandled diff status %c", info->status); |
61 | } | 60 | } |
62 | 61 | ||
63 | html("<tr>"); | 62 | html("<tr>"); |
64 | htmlf("<td class='mode'>"); | 63 | htmlf("<td class='mode'>"); |
65 | if (is_null_sha1(info->new_sha1)) { | 64 | if (is_null_sha1(info->new_sha1)) { |
66 | html_filemode(info->old_mode); | 65 | html_filemode(info->old_mode); |
67 | } else { | 66 | } else { |
68 | html_filemode(info->new_mode); | 67 | html_filemode(info->new_mode); |
69 | } | 68 | } |
70 | 69 | ||
71 | if (info->old_mode != info->new_mode && | 70 | if (info->old_mode != info->new_mode && |
72 | !is_null_sha1(info->old_sha1) && | 71 | !is_null_sha1(info->old_sha1) && |
73 | !is_null_sha1(info->new_sha1)) { | 72 | !is_null_sha1(info->new_sha1)) { |
74 | html("<span class='modechange'>["); | 73 | html("<span class='modechange'>["); |
75 | html_filemode(info->old_mode); | 74 | html_filemode(info->old_mode); |
76 | html("]</span>"); | 75 | html("]</span>"); |
77 | } | 76 | } |
78 | htmlf("</td><td class='%s'>", class); | 77 | htmlf("</td><td class='%s'>", class); |
79 | query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), | 78 | query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), |
80 | sha1_to_hex(info->new_sha1), info->new_path); | 79 | sha1_to_hex(info->new_sha1), info->new_path); |
81 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | 80 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), |
82 | NULL, NULL); | 81 | NULL, NULL); |
83 | if (info->status == DIFF_STATUS_COPIED || | 82 | if (info->status == DIFF_STATUS_COPIED || |
84 | info->status == DIFF_STATUS_RENAMED) { | 83 | info->status == DIFF_STATUS_RENAMED) { |
85 | html_txt(info->new_path); | 84 | html_txt(info->new_path); |
86 | htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? | 85 | htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? |
87 | "copied" : "renamed"); | 86 | "copied" : "renamed"); |
88 | query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); | 87 | query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); |
89 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), | 88 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), |
90 | NULL, NULL); | 89 | NULL, NULL); |
91 | html_txt(info->old_path); | 90 | html_txt(info->old_path); |
92 | html("</a>)"); | 91 | html("</a>)"); |
93 | } else { | 92 | } else { |
94 | html_txt(info->new_path); | 93 | html_txt(info->new_path); |
95 | html("</a>"); | 94 | html("</a>"); |
96 | } | 95 | } |
97 | html("</td><td class='right'>"); | 96 | html("</td><td class='right'>"); |
98 | htmlf("%d", info->added + info->removed); | 97 | htmlf("%d", info->added + info->removed); |
99 | |||
100 | html("</td><td class='graph'>"); | 98 | html("</td><td class='graph'>"); |
101 | width = (info->added + info->removed) * 100.0 / max_changes; | 99 | htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
102 | if (width < 0.1) | 100 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
103 | width = 0.1; | 101 | info->added * 100.0 / max_changes); |
104 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | 102 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
105 | NULL, NULL); | 103 | info->removed * 100.0 / max_changes); |
106 | htmlf("<img src='/cgit/add.png' style='width: %.1f%%;'/>", | 104 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
107 | info->added * width / (info->added + info->removed)); | 105 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
108 | htmlf("<img src='/cgit/del.png' style='width: %.1f%%;'/>", | 106 | html("</tr></table></a></td></tr>\n"); |
109 | info->removed * width / (info->added + info->removed)); | ||
110 | html("</a></td></tr>\n"); | ||
111 | } | 107 | } |
112 | 108 | ||
113 | void cgit_count_diff_lines(char *line, int len) | 109 | void cgit_count_diff_lines(char *line, int len) |
114 | { | 110 | { |
115 | if (line && (len > 0)) { | 111 | if (line && (len > 0)) { |
116 | if (line[0] == '+') | 112 | if (line[0] == '+') |
117 | lines_added++; | 113 | lines_added++; |
118 | else if (line[0] == '-') | 114 | else if (line[0] == '-') |
119 | lines_removed++; | 115 | lines_removed++; |
120 | } | 116 | } |
121 | } | 117 | } |
122 | 118 | ||
123 | void inspect_filepair(struct diff_filepair *pair) | 119 | void inspect_filepair(struct diff_filepair *pair) |
124 | { | 120 | { |
125 | files++; | 121 | files++; |
126 | lines_added = 0; | 122 | lines_added = 0; |
127 | lines_removed = 0; | 123 | lines_removed = 0; |
128 | cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); | 124 | cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); |
129 | if (files >= slots) { | 125 | if (files >= slots) { |
130 | if (slots == 0) | 126 | if (slots == 0) |
131 | slots = 4; | 127 | slots = 4; |
132 | else | 128 | else |
133 | slots = slots * 2; | 129 | slots = slots * 2; |
134 | items = xrealloc(items, slots * sizeof(struct fileinfo)); | 130 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
135 | } | 131 | } |
136 | items[files-1].status = pair->status; | 132 | items[files-1].status = pair->status; |
137 | hashcpy(items[files-1].old_sha1, pair->one->sha1); | 133 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
138 | hashcpy(items[files-1].new_sha1, pair->two->sha1); | 134 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
139 | items[files-1].old_mode = pair->one->mode; | 135 | items[files-1].old_mode = pair->one->mode; |
140 | items[files-1].new_mode = pair->two->mode; | 136 | items[files-1].new_mode = pair->two->mode; |
141 | items[files-1].old_path = xstrdup(pair->one->path); | 137 | items[files-1].old_path = xstrdup(pair->one->path); |
142 | items[files-1].new_path = xstrdup(pair->two->path); | 138 | items[files-1].new_path = xstrdup(pair->two->path); |
143 | items[files-1].added = lines_added; | 139 | items[files-1].added = lines_added; |
144 | items[files-1].removed = lines_removed; | 140 | items[files-1].removed = lines_removed; |
145 | if (lines_added + lines_removed > max_changes) | 141 | if (lines_added + lines_removed > max_changes) |
146 | max_changes = lines_added + lines_removed; | 142 | max_changes = lines_added + lines_removed; |
147 | total_adds += lines_added; | 143 | total_adds += lines_added; |
148 | total_rems += lines_removed; | 144 | total_rems += lines_removed; |
149 | } | 145 | } |
150 | 146 | ||
151 | 147 | ||
152 | void cgit_print_commit(const char *hex) | 148 | void cgit_print_commit(const char *hex) |
153 | { | 149 | { |
154 | struct commit *commit, *parent; | 150 | struct commit *commit, *parent; |
155 | struct commitinfo *info; | 151 | struct commitinfo *info; |
156 | struct commit_list *p; | 152 | struct commit_list *p; |
157 | unsigned char sha1[20]; | 153 | unsigned char sha1[20]; |
158 | char *query; | 154 | char *query; |
159 | char *filename; | 155 | char *filename; |
160 | int i; | 156 | int i; |
161 | 157 | ||
162 | if (get_sha1(hex, sha1)) { | 158 | if (get_sha1(hex, sha1)) { |
163 | cgit_print_error(fmt("Bad object id: %s", hex)); | 159 | cgit_print_error(fmt("Bad object id: %s", hex)); |
164 | return; | 160 | return; |
165 | } | 161 | } |
166 | commit = lookup_commit_reference(sha1); | 162 | commit = lookup_commit_reference(sha1); |
167 | if (!commit) { | 163 | if (!commit) { |
168 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 164 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
169 | return; | 165 | return; |
170 | } | 166 | } |
171 | info = cgit_parse_commit(commit); | 167 | info = cgit_parse_commit(commit); |
172 | 168 | ||
173 | html("<table class='commit-info'>\n"); | 169 | html("<table class='commit-info'>\n"); |
174 | html("<tr><th>author</th><td>"); | 170 | html("<tr><th>author</th><td>"); |
175 | html_txt(info->author); | 171 | html_txt(info->author); |
176 | html(" "); | 172 | html(" "); |
177 | html_txt(info->author_email); | 173 | html_txt(info->author_email); |
178 | html("</td><td class='right'>"); | 174 | html("</td><td class='right'>"); |
179 | cgit_print_date(info->author_date); | 175 | cgit_print_date(info->author_date); |
180 | html("</td></tr>\n"); | 176 | html("</td></tr>\n"); |
181 | html("<tr><th>committer</th><td>"); | 177 | html("<tr><th>committer</th><td>"); |
182 | html_txt(info->committer); | 178 | html_txt(info->committer); |
183 | html(" "); | 179 | html(" "); |
184 | html_txt(info->committer_email); | 180 | html_txt(info->committer_email); |
185 | html("</td><td class='right'>"); | 181 | html("</td><td class='right'>"); |
186 | cgit_print_date(info->committer_date); | 182 | cgit_print_date(info->committer_date); |
187 | html("</td></tr>\n"); | 183 | html("</td></tr>\n"); |
188 | html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); | 184 | html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); |
189 | query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1), | 185 | query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1), |
190 | sha1_to_hex(commit->tree->object.sha1)); | 186 | sha1_to_hex(commit->tree->object.sha1)); |
191 | html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); | 187 | html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); |
192 | htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); | 188 | htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); |
193 | for (p = commit->parents; p ; p = p->next) { | 189 | for (p = commit->parents; p ; p = p->next) { |
194 | parent = lookup_commit_reference(p->item->object.sha1); | 190 | parent = lookup_commit_reference(p->item->object.sha1); |
195 | if (!parent) { | 191 | if (!parent) { |
196 | html("<tr><td colspan='3'>"); | 192 | html("<tr><td colspan='3'>"); |
197 | cgit_print_error("Error reading parent commit"); | 193 | cgit_print_error("Error reading parent commit"); |
198 | html("</td></tr>"); | 194 | html("</td></tr>"); |
199 | continue; | 195 | continue; |
200 | } | 196 | } |
201 | html("<tr><th>parent</th>" | 197 | html("<tr><th>parent</th>" |
202 | "<td colspan='2' class='sha1'>" | 198 | "<td colspan='2' class='sha1'>" |
203 | "<a href='"); | 199 | "<a href='"); |
204 | query = fmt("id=%s", sha1_to_hex(p->item->object.sha1)); | 200 | query = fmt("id=%s", sha1_to_hex(p->item->object.sha1)); |
205 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); | 201 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); |
206 | htmlf("'>%s</a> (<a href='", | 202 | htmlf("'>%s</a> (<a href='", |
207 | sha1_to_hex(p->item->object.sha1)); | 203 | sha1_to_hex(p->item->object.sha1)); |
208 | query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), | 204 | query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), |
209 | sha1_to_hex(commit->tree->object.sha1)); | 205 | sha1_to_hex(commit->tree->object.sha1)); |
210 | html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); | 206 | html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); |
211 | html("'>diff</a>)</td></tr>"); | 207 | html("'>diff</a>)</td></tr>"); |
212 | } | 208 | } |
213 | if (cgit_repo->snapshots) { | 209 | if (cgit_repo->snapshots) { |
214 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); | 210 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); |
215 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); | 211 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); |
216 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", | 212 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", |
217 | fmt("id=%s&name=%s", hex, filename))); | 213 | fmt("id=%s&name=%s", hex, filename))); |
218 | htmlf("'>%s</a></td></tr>", filename); | 214 | htmlf("'>%s</a></td></tr>", filename); |
219 | } | 215 | } |
220 | html("</table>\n"); | 216 | html("</table>\n"); |
221 | html("<div class='commit-subject'>"); | 217 | html("<div class='commit-subject'>"); |
222 | html_txt(info->subject); | 218 | html_txt(info->subject); |
223 | html("</div>"); | 219 | html("</div>"); |
224 | html("<div class='commit-msg'>"); | 220 | html("<div class='commit-msg'>"); |
225 | html_txt(info->msg); | 221 | html_txt(info->msg); |
226 | html("</div>"); | 222 | html("</div>"); |
227 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { | 223 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { |
228 | html("<table class='diffstat'>"); | 224 | html("<table class='diffstat'>"); |
229 | max_changes = 0; | 225 | max_changes = 0; |
230 | cgit_diff_commit(commit, inspect_filepair); | 226 | cgit_diff_commit(commit, inspect_filepair); |
231 | for(i = 0; i<files; i++) | 227 | for(i = 0; i<files; i++) |
232 | print_fileinfo(&items[i]); | 228 | print_fileinfo(&items[i]); |
233 | html("</table>"); | 229 | html("</table>"); |
234 | html("<div class='diffstat-summary'>"); | 230 | html("<div class='diffstat-summary'>"); |
235 | htmlf("%d files changed, %d insertions, %d deletions\n", | 231 | htmlf("%d files changed, %d insertions, %d deletions\n", |
236 | files, total_adds, total_rems); | 232 | files, total_adds, total_rems); |
237 | html("</div>"); | 233 | html("</div>"); |
238 | } | 234 | } |
239 | cgit_free_commitinfo(info); | 235 | cgit_free_commitinfo(info); |
240 | } | 236 | } |