Mercurial > hg-stable
annotate mercurial/hgweb.py @ 515:03f27b1381f9
Whitespace cleanups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Whitespace cleanups
manifest hash: ac954bc3a4f034c12638a259ecd65841f5b63c5c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwuubywK+sNU5EO8RAluIAJ98XQpNdZUpSmYKgDmrMRlbL76ZzQCfes0t
rknNUN/PhtyA4bzL646dOz4=
=UyCE
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 29 Jun 2005 10:42:35 -0800 |
parents | 5f65a108a559 |
children | b8404005d6d5 eda4c32c167a |
rev | line source |
---|---|
238
3b92f8fe47ae
hgweb.py: kill #! line, clean up copyright notice
mpm@selenic.com
parents:
222
diff
changeset
|
1 # hgweb.py - web interface to a mercurial repository |
131 | 2 # |
238
3b92f8fe47ae
hgweb.py: kill #! line, clean up copyright notice
mpm@selenic.com
parents:
222
diff
changeset
|
3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> |
3b92f8fe47ae
hgweb.py: kill #! line, clean up copyright notice
mpm@selenic.com
parents:
222
diff
changeset
|
4 # Copyright 2005 Matt Mackall <mpm@selenic.com> |
131 | 5 # |
6 # This software may be used and distributed according to the terms | |
7 # of the GNU General Public License, incorporated herein by reference. | |
8 | |
9 import os, cgi, time, re, difflib, sys, zlib | |
138 | 10 from mercurial.hg import * |
215 | 11 from mercurial.ui import * |
138 | 12 |
157
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
13 def templatepath(): |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
14 for f in "templates", "../templates": |
157
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
15 p = os.path.join(os.path.dirname(__file__), f) |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
16 if os.path.isdir(p): return p |
157
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
17 |
138 | 18 def age(t): |
19 def plural(t, c): | |
20 if c == 1: return t | |
21 return t + "s" | |
22 def fmt(t, c): | |
23 return "%d %s" % (c, plural(t, c)) | |
24 | |
25 now = time.time() | |
26 delta = max(1, int(now - t)) | |
27 | |
28 scales = [["second", 1], | |
29 ["minute", 60], | |
30 ["hour", 3600], | |
31 ["day", 3600 * 24], | |
32 ["week", 3600 * 24 * 7], | |
33 ["month", 3600 * 24 * 30], | |
34 ["year", 3600 * 24 * 365]] | |
35 | |
36 scales.reverse() | |
37 | |
38 for t, s in scales: | |
39 n = delta / s | |
195 | 40 if n >= 2 or s == 1: return fmt(t, n) |
131 | 41 |
42 def nl2br(text): | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
43 return text.replace('\n', '<br/>\n') |
131 | 44 |
45 def obfuscate(text): | |
138 | 46 return ''.join([ '&#%d' % ord(c) for c in text ]) |
47 | |
48 def up(p): | |
49 if p[0] != "/": p = "/" + p | |
50 if p[-1] == "/": p = p[:-1] | |
51 up = os.path.dirname(p) | |
52 if up == "/": | |
53 return "/" | |
54 return up + "/" | |
131 | 55 |
56 def httphdr(type): | |
57 print 'Content-type: %s\n' % type | |
58 | |
135 | 59 def write(*things): |
60 for thing in things: | |
61 if hasattr(thing, "__iter__"): | |
62 for part in thing: | |
63 write(part) | |
64 else: | |
65 sys.stdout.write(str(thing)) | |
66 | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
67 def template(tmpl, filters = {}, **map): |
138 | 68 while tmpl: |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
69 m = re.search(r"#([a-zA-Z0-9]+)((\|[a-zA-Z0-9]+)*)#", tmpl) |
138 | 70 if m: |
71 yield tmpl[:m.start(0)] | |
72 v = map.get(m.group(1), "") | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
73 v = callable(v) and v() or v |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
74 |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
75 fl = m.group(2) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
76 if fl: |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
77 for f in fl.split("|")[1:]: |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
78 v = filters[f](v) |
515 | 79 |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
80 yield v |
138 | 81 tmpl = tmpl[m.end(0):] |
82 else: | |
83 yield tmpl | |
84 return | |
85 | |
86 class templater: | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
87 def __init__(self, mapfile, filters = {}): |
138 | 88 self.cache = {} |
89 self.map = {} | |
90 self.base = os.path.dirname(mapfile) | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
91 self.filters = filters |
515 | 92 |
138 | 93 for l in file(mapfile): |
94 m = re.match(r'(\S+)\s*=\s*"(.*)"$', l) | |
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
95 if m: |
138 | 96 self.cache[m.group(1)] = m.group(2) |
97 else: | |
98 m = re.match(r'(\S+)\s*=\s*(\S+)', l) | |
99 if m: | |
100 self.map[m.group(1)] = os.path.join(self.base, m.group(2)) | |
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
101 else: |
138 | 102 raise "unknown map entry '%s'" % l |
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
103 |
138 | 104 def __call__(self, t, **map): |
105 try: | |
106 tmpl = self.cache[t] | |
107 except KeyError: | |
108 tmpl = self.cache[t] = file(self.map[t]).read() | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
109 return template(tmpl, self.filters, **map) |
515 | 110 |
138 | 111 class hgweb: |
269
24e9e140485f
hgweb: shrink the default changelog list to 10
mpm@selenic.com
parents:
265
diff
changeset
|
112 maxchanges = 10 |
138 | 113 maxfiles = 10 |
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
114 |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
115 def __init__(self, path, name, templates = ""): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
116 self.templates = templates or templatepath() |
138 | 117 self.reponame = name |
258 | 118 self.path = path |
119 self.mtime = -1 | |
197 | 120 self.viewonly = 0 |
131 | 121 |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
122 self.filters = { |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
123 "escape": cgi.escape, |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
124 "age": age, |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
125 "date": (lambda x: time.asctime(time.gmtime(x))), |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
126 "addbreaks": nl2br, |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
127 "obfuscate": obfuscate, |
375 | 128 "short": (lambda x: x[:12]), |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
129 "firstline": (lambda x: x.splitlines(1)[0]), |
359 | 130 "permissions": (lambda x: x and "-rwxr-xr-x" or "-rw-r--r--") |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
131 } |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
132 |
258 | 133 def refresh(self): |
134 s = os.stat(os.path.join(self.path, ".hg", "00changelog.i")) | |
135 if s.st_mtime != self.mtime: | |
322 | 136 self.mtime = s.st_mtime |
258 | 137 self.repo = repository(ui(), self.path) |
138 | |
138 | 139 def date(self, cs): |
140 return time.asctime(time.gmtime(float(cs[2].split(' ')[0]))) | |
141 | |
142 def listfiles(self, files, mf): | |
143 for f in files[:self.maxfiles]: | |
144 yield self.t("filenodelink", node = hex(mf[f]), file = f) | |
145 if len(files) > self.maxfiles: | |
146 yield self.t("fileellipses") | |
147 | |
148 def listfilediffs(self, files, changeset): | |
149 for f in files[:self.maxfiles]: | |
150 yield self.t("filedifflink", node = hex(changeset), file = f) | |
151 if len(files) > self.maxfiles: | |
152 yield self.t("fileellipses") | |
153 | |
156 | 154 def parent(self, t1, node=nullid, rev=-1, **args): |
142 | 155 if node != hex(nullid): |
156 | 156 yield self.t(t1, node = node, rev = rev, **args) |
142 | 157 |
138 | 158 def diff(self, node1, node2, files): |
159 def filterfiles(list, files): | |
160 l = [ x for x in list if x in files ] | |
515 | 161 |
138 | 162 for f in files: |
163 if f[-1] != os.sep: f += os.sep | |
164 l += [ x for x in list if x.startswith(f) ] | |
165 return l | |
131 | 166 |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
167 parity = [0] |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
168 def diffblock(diff, f, fn): |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
169 yield self.t("diffblock", |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
170 lines = prettyprintlines(diff), |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
171 parity = parity[0], |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
172 file = f, |
369
09f24af48b82
hgweb: fix deleted file in changeset key error
mpm@selenic.com
parents:
366
diff
changeset
|
173 filenode = hex(fn or nullid)) |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
174 parity[0] = 1 - parity[0] |
515 | 175 |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
176 def prettyprintlines(diff): |
138 | 177 for l in diff.splitlines(1): |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
178 if l.startswith('+'): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
179 yield self.t("difflineplus", line = l) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
180 elif l.startswith('-'): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
181 yield self.t("difflineminus", line = l) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
182 elif l.startswith('@'): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
183 yield self.t("difflineat", line = l) |
138 | 184 else: |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
185 yield self.t("diffline", line = l) |
131 | 186 |
138 | 187 r = self.repo |
188 cl = r.changelog | |
189 mf = r.manifest | |
190 change1 = cl.read(node1) | |
191 change2 = cl.read(node2) | |
192 mmap1 = mf.read(change1[0]) | |
193 mmap2 = mf.read(change2[0]) | |
194 date1 = self.date(change1) | |
195 date2 = self.date(change2) | |
131 | 196 |
138 | 197 c, a, d = r.diffrevs(node1, node2) |
198 c, a, d = map(lambda x: filterfiles(x, files), (c, a, d)) | |
131 | 199 |
138 | 200 for f in c: |
201 to = r.file(f).read(mmap1[f]) | |
202 tn = r.file(f).read(mmap2[f]) | |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
203 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
138 | 204 for f in a: |
265
7ca05593bd30
hgweb: fix non-existent source or destination for diff
mpm@selenic.com
parents:
258
diff
changeset
|
205 to = None |
138 | 206 tn = r.file(f).read(mmap2[f]) |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
207 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
138 | 208 for f in d: |
209 to = r.file(f).read(mmap1[f]) | |
265
7ca05593bd30
hgweb: fix non-existent source or destination for diff
mpm@selenic.com
parents:
258
diff
changeset
|
210 tn = None |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
211 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
131 | 212 |
142 | 213 def header(self): |
214 yield self.t("header", repo = self.reponame) | |
215 | |
216 def footer(self): | |
217 yield self.t("footer", repo = self.reponame) | |
218 | |
180 | 219 def changelog(self, pos): |
138 | 220 def changenav(): |
221 def seq(factor = 1): | |
222 yield 1 * factor | |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
223 yield 3 * factor |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
224 #yield 5 * factor |
138 | 225 for f in seq(factor * 10): |
226 yield f | |
131 | 227 |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
228 l = [] |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
229 for f in seq(): |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
230 if f < self.maxchanges / 2: continue |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
231 if f > count: break |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
232 r = "%d" % f |
351 | 233 if pos + f < count: l.append(("+" + r, pos + f)) |
234 if pos - f >= 0: l.insert(0, ("-" + r, pos - f)) | |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
235 |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
236 yield self.t("naventry", rev = 0, label="(0)") |
515 | 237 |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
238 for label, rev in l: |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
239 yield self.t("naventry", label = label, rev = rev) |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
240 |
198
c88ef31fb5c0
hgweb: fix tip so that it doesn't need refreshing
mpm@selenic.com
parents:
197
diff
changeset
|
241 yield self.t("naventry", label="tip") |
131 | 242 |
138 | 243 def changelist(): |
142 | 244 parity = (start - end) & 1 |
138 | 245 cl = self.repo.changelog |
246 l = [] # build a list in forward order for efficiency | |
351 | 247 for i in range(start, end): |
138 | 248 n = cl.node(i) |
249 changes = cl.read(n) | |
250 hn = hex(n) | |
251 p1, p2 = cl.parents(n) | |
252 t = float(changes[2].split(' ')[0]) | |
131 | 253 |
138 | 254 l.insert(0, self.t( |
255 'changelogentry', | |
142 | 256 parity = parity, |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
257 author = changes[1], |
142 | 258 parent1 = self.parent("changelogparent", |
259 hex(p1), cl.rev(p1)), | |
260 parent2 = self.parent("changelogparent", | |
261 hex(p2), cl.rev(p2)), | |
138 | 262 p1 = hex(p1), p2 = hex(p2), |
263 p1rev = cl.rev(p1), p2rev = cl.rev(p2), | |
264 manifest = hex(changes[0]), | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
265 desc = changes[4], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
266 date = t, |
138 | 267 files = self.listfilediffs(changes[3], n), |
268 rev = i, | |
269 node = hn)) | |
142 | 270 parity = 1 - parity |
138 | 271 |
272 yield l | |
131 | 273 |
168 | 274 cl = self.repo.changelog |
275 mf = cl.read(cl.tip())[0] | |
276 count = cl.count() | |
351 | 277 start = max(0, pos - self.maxchanges + 1) |
278 end = min(count, start + self.maxchanges) | |
279 pos = end - 1 | |
138 | 280 |
142 | 281 yield self.t('changelog', |
282 header = self.header(), | |
283 footer = self.footer(), | |
284 repo = self.reponame, | |
285 changenav = changenav, | |
168 | 286 manifest = hex(mf), |
142 | 287 rev = pos, changesets = count, entries = changelist) |
131 | 288 |
138 | 289 def changeset(self, nodeid): |
290 n = bin(nodeid) | |
291 cl = self.repo.changelog | |
292 changes = cl.read(n) | |
293 p1, p2 = cl.parents(n) | |
294 p1rev, p2rev = cl.rev(p1), cl.rev(p2) | |
295 t = float(changes[2].split(' ')[0]) | |
515 | 296 |
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
297 files = [] |
138 | 298 mf = self.repo.manifest.read(changes[0]) |
131 | 299 for f in changes[3]: |
138 | 300 files.append(self.t("filenodelink", |
369
09f24af48b82
hgweb: fix deleted file in changeset key error
mpm@selenic.com
parents:
366
diff
changeset
|
301 filenode = hex(mf.get(f, nullid)), file = f)) |
138 | 302 |
303 def diff(): | |
304 yield self.diff(p1, n, changes[3]) | |
131 | 305 |
138 | 306 yield self.t('changeset', |
142 | 307 header = self.header(), |
308 footer = self.footer(), | |
309 repo = self.reponame, | |
138 | 310 diff = diff, |
311 rev = cl.rev(n), | |
312 node = nodeid, | |
142 | 313 parent1 = self.parent("changesetparent", |
314 hex(p1), cl.rev(p1)), | |
315 parent2 = self.parent("changesetparent", | |
316 hex(p2), cl.rev(p2)), | |
138 | 317 p1 = hex(p1), p2 = hex(p2), |
318 p1rev = cl.rev(p1), p2rev = cl.rev(p2), | |
319 manifest = hex(changes[0]), | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
320 author = changes[1], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
321 desc = changes[4], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
322 date = t, |
138 | 323 files = files) |
131 | 324 |
138 | 325 def filelog(self, f, filenode): |
326 cl = self.repo.changelog | |
327 fl = self.repo.file(f) | |
328 count = fl.count() | |
329 | |
330 def entries(): | |
331 l = [] | |
142 | 332 parity = (count - 1) & 1 |
515 | 333 |
138 | 334 for i in range(count): |
335 | |
336 n = fl.node(i) | |
337 lr = fl.linkrev(n) | |
338 cn = cl.node(lr) | |
339 cs = cl.read(cl.node(lr)) | |
340 p1, p2 = fl.parents(n) | |
341 t = float(cs[2].split(' ')[0]) | |
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
342 |
138 | 343 l.insert(0, self.t("filelogentry", |
142 | 344 parity = parity, |
138 | 345 filenode = hex(n), |
346 filerev = i, | |
347 file = f, | |
348 node = hex(cn), | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
349 author = cs[1], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
350 date = t, |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
351 desc = cs[4], |
138 | 352 p1 = hex(p1), p2 = hex(p2), |
353 p1rev = fl.rev(p1), p2rev = fl.rev(p2))) | |
142 | 354 parity = 1 - parity |
138 | 355 |
356 yield l | |
357 | |
358 yield self.t("filelog", | |
142 | 359 header = self.header(), |
360 footer = self.footer(), | |
361 repo = self.reponame, | |
138 | 362 file = f, |
363 filenode = filenode, | |
364 entries = entries) | |
131 | 365 |
138 | 366 def filerevision(self, f, node): |
367 fl = self.repo.file(f) | |
368 n = bin(node) | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
369 text = fl.read(n) |
138 | 370 changerev = fl.linkrev(n) |
371 cl = self.repo.changelog | |
372 cn = cl.node(changerev) | |
373 cs = cl.read(cn) | |
374 p1, p2 = fl.parents(n) | |
375 t = float(cs[2].split(' ')[0]) | |
376 mfn = cs[0] | |
142 | 377 |
378 def lines(): | |
379 for l, t in enumerate(text.splitlines(1)): | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
380 yield self.t("fileline", line = t, |
142 | 381 linenumber = "% 6d" % (l + 1), |
382 parity = l & 1) | |
359 | 383 |
138 | 384 yield self.t("filerevision", file = f, |
142 | 385 header = self.header(), |
386 footer = self.footer(), | |
387 repo = self.reponame, | |
138 | 388 filenode = node, |
389 path = up(f), | |
142 | 390 text = lines(), |
138 | 391 rev = changerev, |
392 node = hex(cn), | |
393 manifest = hex(mfn), | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
394 author = cs[1], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
395 date = t, |
142 | 396 parent1 = self.parent("filerevparent", |
156 | 397 hex(p1), fl.rev(p1), file=f), |
142 | 398 parent2 = self.parent("filerevparent", |
156 | 399 hex(p2), fl.rev(p2), file=f), |
138 | 400 p1 = hex(p1), p2 = hex(p2), |
359 | 401 permissions = self.repo.manifest.readflags(mfn)[f], |
138 | 402 p1rev = fl.rev(p1), p2rev = fl.rev(p2)) |
403 | |
404 def fileannotate(self, f, node): | |
405 bcache = {} | |
406 ncache = {} | |
407 fl = self.repo.file(f) | |
408 n = bin(node) | |
409 changerev = fl.linkrev(n) | |
410 | |
411 cl = self.repo.changelog | |
412 cn = cl.node(changerev) | |
413 cs = cl.read(cn) | |
414 p1, p2 = fl.parents(n) | |
415 t = float(cs[2].split(' ')[0]) | |
416 mfn = cs[0] | |
131 | 417 |
138 | 418 def annotate(): |
142 | 419 parity = 1 |
420 last = None | |
138 | 421 for r, l in fl.annotate(n): |
422 try: | |
423 cnode = ncache[r] | |
424 except KeyError: | |
425 cnode = ncache[r] = self.repo.changelog.node(r) | |
515 | 426 |
138 | 427 try: |
428 name = bcache[r] | |
429 except KeyError: | |
430 cl = self.repo.changelog.read(cnode) | |
431 name = cl[1] | |
432 f = name.find('@') | |
433 if f >= 0: | |
434 name = name[:f] | |
435 bcache[r] = name | |
131 | 436 |
142 | 437 if last != cnode: |
438 parity = 1 - parity | |
439 last = cnode | |
440 | |
138 | 441 yield self.t("annotateline", |
142 | 442 parity = parity, |
138 | 443 node = hex(cnode), |
444 rev = r, | |
445 author = name, | |
446 file = f, | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
447 line = l) |
138 | 448 |
449 yield self.t("fileannotate", | |
142 | 450 header = self.header(), |
451 footer = self.footer(), | |
452 repo = self.reponame, | |
138 | 453 file = f, |
454 filenode = node, | |
455 annotate = annotate, | |
456 path = up(f), | |
457 rev = changerev, | |
458 node = hex(cn), | |
459 manifest = hex(mfn), | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
460 author = cs[1], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
461 date = t, |
156 | 462 parent1 = self.parent("fileannotateparent", |
463 hex(p1), fl.rev(p1), file=f), | |
464 parent2 = self.parent("fileannotateparent", | |
465 hex(p2), fl.rev(p2), file=f), | |
138 | 466 p1 = hex(p1), p2 = hex(p2), |
359 | 467 permissions = self.repo.manifest.readflags(mfn)[f], |
138 | 468 p1rev = fl.rev(p1), p2rev = fl.rev(p2)) |
136 | 469 |
138 | 470 def manifest(self, mnode, path): |
471 mf = self.repo.manifest.read(bin(mnode)) | |
472 rev = self.repo.manifest.rev(bin(mnode)) | |
473 node = self.repo.changelog.node(rev) | |
359 | 474 mff=self.repo.manifest.readflags(bin(mnode)) |
138 | 475 |
476 files = {} | |
515 | 477 |
138 | 478 p = path[1:] |
479 l = len(p) | |
131 | 480 |
138 | 481 for f,n in mf.items(): |
482 if f[:l] != p: | |
483 continue | |
484 remain = f[l:] | |
485 if "/" in remain: | |
486 short = remain[:remain.find("/") + 1] # bleah | |
142 | 487 files[short] = (f, None) |
138 | 488 else: |
489 short = os.path.basename(remain) | |
490 files[short] = (f, n) | |
131 | 491 |
138 | 492 def filelist(): |
142 | 493 parity = 0 |
138 | 494 fl = files.keys() |
495 fl.sort() | |
496 for f in fl: | |
497 full, fnode = files[f] | |
142 | 498 if fnode: |
499 yield self.t("manifestfileentry", | |
500 file = full, | |
501 manifest = mnode, | |
502 filenode = hex(fnode), | |
503 parity = parity, | |
515 | 504 basename = f, |
359 | 505 permissions = mff[full]) |
142 | 506 else: |
507 yield self.t("manifestdirentry", | |
508 parity = parity, | |
509 path = os.path.join(path, f), | |
510 manifest = mnode, basename = f[:-1]) | |
511 parity = 1 - parity | |
138 | 512 |
513 yield self.t("manifest", | |
142 | 514 header = self.header(), |
515 footer = self.footer(), | |
516 repo = self.reponame, | |
138 | 517 manifest = mnode, |
518 rev = rev, | |
519 node = hex(node), | |
520 path = path, | |
521 up = up(path), | |
142 | 522 entries = filelist) |
131 | 523 |
168 | 524 def tags(self): |
525 cl = self.repo.changelog | |
526 mf = cl.read(cl.tip())[0] | |
527 | |
343 | 528 i = self.repo.tagslist() |
529 i.reverse() | |
168 | 530 |
531 def entries(): | |
532 parity = 0 | |
533 for k,n in i: | |
534 yield self.t("tagentry", | |
535 parity = parity, | |
536 tag = k, | |
537 node = hex(n)) | |
538 parity = 1 - parity | |
539 | |
540 yield self.t("tags", | |
541 header = self.header(), | |
542 footer = self.footer(), | |
543 repo = self.reponame, | |
544 manifest = hex(mf), | |
545 entries = entries) | |
546 | |
138 | 547 def filediff(self, file, changeset): |
548 n = bin(changeset) | |
549 cl = self.repo.changelog | |
550 p1 = cl.parents(n)[0] | |
551 cs = cl.read(n) | |
552 mf = self.repo.manifest.read(cs[0]) | |
515 | 553 |
138 | 554 def diff(): |
555 yield self.diff(p1, n, file) | |
131 | 556 |
138 | 557 yield self.t("filediff", |
142 | 558 header = self.header(), |
559 footer = self.footer(), | |
560 repo = self.reponame, | |
138 | 561 file = file, |
376
fadc9e126369
hgweb: fix deleted file in filediff key error
Thomas Arendsen Hein <thomas@intevation.de>
parents:
369
diff
changeset
|
562 filenode = hex(mf.get(file, nullid)), |
138 | 563 node = changeset, |
564 rev = self.repo.changelog.rev(n), | |
565 p1 = hex(p1), | |
566 p1rev = self.repo.changelog.rev(p1), | |
567 diff = diff) | |
515 | 568 |
138 | 569 # add tags to things |
570 # tags -> list of changesets corresponding to tags | |
571 # find tag, changeset, file | |
131 | 572 |
132 | 573 def run(self): |
258 | 574 self.refresh() |
132 | 575 args = cgi.parse() |
576 | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
577 m = os.path.join(self.templates, "map") |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
578 if args.has_key('style'): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
579 b = os.path.basename("map-" + args['style'][0]) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
580 p = os.path.join(self.templates, b) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
581 if os.path.isfile(p): m = p |
515 | 582 |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
583 self.t = templater(m, self.filters) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
584 |
138 | 585 if not args.has_key('cmd') or args['cmd'][0] == 'changelog': |
351 | 586 hi = self.repo.changelog.count() - 1 |
153
e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents:
142
diff
changeset
|
587 if args.has_key('rev'): |
165 | 588 hi = args['rev'][0] |
166
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
589 try: |
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
590 hi = self.repo.changelog.rev(self.repo.lookup(hi)) |
351 | 591 except KeyError: pass |
131 | 592 |
138 | 593 write(self.changelog(hi)) |
515 | 594 |
138 | 595 elif args['cmd'][0] == 'changeset': |
596 write(self.changeset(args['node'][0])) | |
597 | |
598 elif args['cmd'][0] == 'manifest': | |
599 write(self.manifest(args['manifest'][0], args['path'][0])) | |
600 | |
168 | 601 elif args['cmd'][0] == 'tags': |
602 write(self.tags()) | |
603 | |
138 | 604 elif args['cmd'][0] == 'filediff': |
605 write(self.filediff(args['file'][0], args['node'][0])) | |
131 | 606 |
132 | 607 elif args['cmd'][0] == 'file': |
138 | 608 write(self.filerevision(args['file'][0], args['filenode'][0])) |
131 | 609 |
138 | 610 elif args['cmd'][0] == 'annotate': |
611 write(self.fileannotate(args['file'][0], args['filenode'][0])) | |
131 | 612 |
138 | 613 elif args['cmd'][0] == 'filelog': |
614 write(self.filelog(args['file'][0], args['filenode'][0])) | |
136 | 615 |
222 | 616 elif args['cmd'][0] == 'heads': |
617 httphdr("text/plain") | |
618 h = self.repo.heads() | |
619 sys.stdout.write(" ".join(map(hex, h)) + "\n") | |
620 | |
132 | 621 elif args['cmd'][0] == 'branches': |
622 httphdr("text/plain") | |
623 nodes = [] | |
624 if args.has_key('nodes'): | |
138 | 625 nodes = map(bin, args['nodes'][0].split(" ")) |
626 for b in self.repo.branches(nodes): | |
627 sys.stdout.write(" ".join(map(hex, b)) + "\n") | |
131 | 628 |
132 | 629 elif args['cmd'][0] == 'between': |
630 httphdr("text/plain") | |
631 nodes = [] | |
632 if args.has_key('pairs'): | |
138 | 633 pairs = [ map(bin, p.split("-")) |
132 | 634 for p in args['pairs'][0].split(" ") ] |
138 | 635 for b in self.repo.between(pairs): |
636 sys.stdout.write(" ".join(map(hex, b)) + "\n") | |
132 | 637 |
638 elif args['cmd'][0] == 'changegroup': | |
639 httphdr("application/hg-changegroup") | |
640 nodes = [] | |
197 | 641 if self.viewonly: |
642 return | |
643 | |
132 | 644 if args.has_key('roots'): |
138 | 645 nodes = map(bin, args['roots'][0].split(" ")) |
131 | 646 |
132 | 647 z = zlib.compressobj() |
138 | 648 for chunk in self.repo.changegroup(nodes): |
132 | 649 sys.stdout.write(z.compress(chunk)) |
650 | |
651 sys.stdout.write(z.flush()) | |
131 | 652 |
132 | 653 else: |
138 | 654 write(self.t("error")) |
131 | 655 |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
656 def server(path, name, templates, address, port): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
657 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
658 import BaseHTTPServer |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
659 import sys, os |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
660 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
661 class hgwebhandler(BaseHTTPServer.BaseHTTPRequestHandler): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
662 def do_POST(self): |
271 | 663 try: |
664 self.do_hgweb() | |
665 except socket.error, inst: | |
666 if inst.args[0] != 32: raise | |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
667 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
668 def do_GET(self): |
271 | 669 self.do_POST() |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
670 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
671 def do_hgweb(self): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
672 query = "" |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
673 p = self.path.find("?") |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
674 if p: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
675 query = self.path[p + 1:] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
676 query = query.replace('+', ' ') |
515 | 677 |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
678 env = {} |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
679 env['GATEWAY_INTERFACE'] = 'CGI/1.1' |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
680 env['REQUEST_METHOD'] = self.command |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
681 if query: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
682 env['QUERY_STRING'] = query |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
683 host = self.address_string() |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
684 if host != self.client_address[0]: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
685 env['REMOTE_HOST'] = host |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
686 env['REMOTE_ADDR'] = self.client_address[0] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
687 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
688 if self.headers.typeheader is None: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
689 env['CONTENT_TYPE'] = self.headers.type |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
690 else: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
691 env['CONTENT_TYPE'] = self.headers.typeheader |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
692 length = self.headers.getheader('content-length') |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
693 if length: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
694 env['CONTENT_LENGTH'] = length |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
695 accept = [] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
696 for line in self.headers.getallmatchingheaders('accept'): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
697 if line[:1] in "\t\n\r ": |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
698 accept.append(line.strip()) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
699 else: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
700 accept = accept + line[7:].split(',') |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
701 env['HTTP_ACCEPT'] = ','.join(accept) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
702 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
703 os.environ.update(env) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
704 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
705 save = sys.argv, sys.stdin, sys.stdout, sys.stderr |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
706 try: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
707 sys.stdin = self.rfile |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
708 sys.stdout = self.wfile |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
709 sys.argv = ["hgweb.py"] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
710 if '=' not in query: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
711 sys.argv.append(query) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
712 self.send_response(200, "Script output follows") |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
713 hg.run() |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
714 finally: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
715 sys.argv, sys.stdin, sys.stdout, sys.stderr = save |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
716 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
717 hg = hgweb(path, name, templates) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
718 httpd = BaseHTTPServer.HTTPServer((address, port), hgwebhandler) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
719 httpd.serve_forever() |