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