Mercurial > hg-stable
annotate mercurial/hgweb.py @ 598:f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 4/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
Now the patch remove every use of the tag p1/p2/p1rev/p2rev from the
code ( even+the ones not used ), replacing everywhere with the tag
parent ( even where the previous +tag are not use ), so the
information to the templates is still given.
manifest hash: ede1f299e9201fdad2ecf48e63314350acbb047e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyEqxywK+sNU5EO8RAjc5AJ9o8AU6/YRuERblO/0kgWwDN4rqQQCgkVj/
UBtzW5x0yD65mK6rb4f+bQk=
=07yG
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 03 Jul 2005 12:29:37 -0800 |
parents | df8a5a0098d4 |
children | 765182a4c843 |
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> |
575 | 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): | |
533
b8404005d6d5
[PATCH] Generate correctly XML entities for obfuscated user
mpm@selenic.com
parents:
515
diff
changeset
|
46 return ''.join([ '&#%d;' % ord(c) for c in text ]) |
138 | 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): | |
582 | 57 sys.stdout.write('Content-type: %s\n\n' % type) |
131 | 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 | |
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
154 def parents(self, t1, nodes=[], rev=None,**args): |
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
155 if not rev: rev = lambda x: "" |
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
156 for node in nodes: |
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
157 if node != nullid: |
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
158 yield self.t(t1, node = hex(node), rev = rev(node), **args) |
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
159 |
568 | 160 def showtag(self, t1, node=nullid, **args): |
161 for t in self.repo.nodetags(node): | |
162 yield self.t(t1, tag = t, **args) | |
163 | |
138 | 164 def diff(self, node1, node2, files): |
165 def filterfiles(list, files): | |
166 l = [ x for x in list if x in files ] | |
515 | 167 |
138 | 168 for f in files: |
169 if f[-1] != os.sep: f += os.sep | |
170 l += [ x for x in list if x.startswith(f) ] | |
171 return l | |
131 | 172 |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
173 parity = [0] |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
174 def diffblock(diff, f, fn): |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
175 yield self.t("diffblock", |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
176 lines = prettyprintlines(diff), |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
177 parity = parity[0], |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
178 file = f, |
369
09f24af48b82
hgweb: fix deleted file in changeset key error
mpm@selenic.com
parents:
366
diff
changeset
|
179 filenode = hex(fn or nullid)) |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
180 parity[0] = 1 - parity[0] |
515 | 181 |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
182 def prettyprintlines(diff): |
138 | 183 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
|
184 if l.startswith('+'): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
185 yield self.t("difflineplus", line = l) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
186 elif l.startswith('-'): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
187 yield self.t("difflineminus", line = l) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
188 elif l.startswith('@'): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
189 yield self.t("difflineat", line = l) |
138 | 190 else: |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
191 yield self.t("diffline", line = l) |
131 | 192 |
138 | 193 r = self.repo |
194 cl = r.changelog | |
195 mf = r.manifest | |
196 change1 = cl.read(node1) | |
197 change2 = cl.read(node2) | |
198 mmap1 = mf.read(change1[0]) | |
199 mmap2 = mf.read(change2[0]) | |
200 date1 = self.date(change1) | |
201 date2 = self.date(change2) | |
131 | 202 |
539 | 203 c, a, d, u = r.changes(node1, node2) |
138 | 204 c, a, d = map(lambda x: filterfiles(x, files), (c, a, d)) |
131 | 205 |
138 | 206 for f in c: |
207 to = r.file(f).read(mmap1[f]) | |
208 tn = r.file(f).read(mmap2[f]) | |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
209 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
138 | 210 for f in a: |
265
7ca05593bd30
hgweb: fix non-existent source or destination for diff
mpm@selenic.com
parents:
258
diff
changeset
|
211 to = None |
138 | 212 tn = r.file(f).read(mmap2[f]) |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
213 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
138 | 214 for f in d: |
215 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
|
216 tn = None |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
217 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
131 | 218 |
142 | 219 def header(self): |
220 yield self.t("header", repo = self.reponame) | |
221 | |
222 def footer(self): | |
223 yield self.t("footer", repo = self.reponame) | |
224 | |
180 | 225 def changelog(self, pos): |
138 | 226 def changenav(): |
227 def seq(factor = 1): | |
228 yield 1 * factor | |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
229 yield 3 * factor |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
230 #yield 5 * factor |
138 | 231 for f in seq(factor * 10): |
232 yield f | |
131 | 233 |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
234 l = [] |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
235 for f in seq(): |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
236 if f < self.maxchanges / 2: continue |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
237 if f > count: break |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
238 r = "%d" % f |
351 | 239 if pos + f < count: l.append(("+" + r, pos + f)) |
240 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
|
241 |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
242 yield self.t("naventry", rev = 0, label="(0)") |
515 | 243 |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
244 for label, rev in l: |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
245 yield self.t("naventry", label = label, rev = rev) |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
246 |
198
c88ef31fb5c0
hgweb: fix tip so that it doesn't need refreshing
mpm@selenic.com
parents:
197
diff
changeset
|
247 yield self.t("naventry", label="tip") |
131 | 248 |
138 | 249 def changelist(): |
142 | 250 parity = (start - end) & 1 |
138 | 251 cl = self.repo.changelog |
252 l = [] # build a list in forward order for efficiency | |
351 | 253 for i in range(start, end): |
138 | 254 n = cl.node(i) |
255 changes = cl.read(n) | |
256 hn = hex(n) | |
257 t = float(changes[2].split(' ')[0]) | |
131 | 258 |
138 | 259 l.insert(0, self.t( |
260 'changelogentry', | |
142 | 261 parity = parity, |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
262 author = changes[1], |
570
2ee819a950aa
[PATCH 2/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
569
diff
changeset
|
263 parent = self.parents("changelogparent", |
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
264 cl.parents(n), cl.rev), |
568 | 265 changelogtag = self.showtag("changelogtag",n), |
138 | 266 manifest = hex(changes[0]), |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
267 desc = changes[4], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
268 date = t, |
138 | 269 files = self.listfilediffs(changes[3], n), |
270 rev = i, | |
271 node = hn)) | |
142 | 272 parity = 1 - parity |
138 | 273 |
274 yield l | |
131 | 275 |
168 | 276 cl = self.repo.changelog |
277 mf = cl.read(cl.tip())[0] | |
278 count = cl.count() | |
351 | 279 start = max(0, pos - self.maxchanges + 1) |
280 end = min(count, start + self.maxchanges) | |
281 pos = end - 1 | |
138 | 282 |
142 | 283 yield self.t('changelog', |
284 header = self.header(), | |
285 footer = self.footer(), | |
286 repo = self.reponame, | |
287 changenav = changenav, | |
168 | 288 manifest = hex(mf), |
142 | 289 rev = pos, changesets = count, entries = changelist) |
131 | 290 |
538 | 291 def search(self, query): |
292 | |
293 def changelist(): | |
294 cl = self.repo.changelog | |
295 count = 0 | |
296 qw = query.lower().split() | |
297 | |
298 def revgen(): | |
299 for i in range(cl.count() - 1, 0, -100): | |
300 l = [] | |
301 for j in range(max(0, i - 100), i): | |
302 n = cl.node(j) | |
303 changes = cl.read(n) | |
304 l.insert(0, (n, j, changes)) | |
305 for e in l: | |
306 yield e | |
307 | |
308 for n, i, changes in revgen(): | |
309 miss = 0 | |
310 for q in qw: | |
311 if not (q in changes[1].lower() or | |
312 q in changes[4].lower() or | |
313 q in " ".join(changes[3][:20]).lower()): | |
314 miss = 1 | |
315 break | |
316 if miss: continue | |
317 | |
318 count += 1 | |
319 hn = hex(n) | |
320 t = float(changes[2].split(' ')[0]) | |
321 | |
322 yield self.t( | |
323 'searchentry', | |
324 parity = count & 1, | |
325 author = changes[1], | |
570
2ee819a950aa
[PATCH 2/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
569
diff
changeset
|
326 parent = self.parents("changelogparent", |
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
327 cl.parents(n), cl.rev), |
568 | 328 changelogtag = self.showtag("changelogtag",n), |
538 | 329 manifest = hex(changes[0]), |
330 desc = changes[4], | |
331 date = t, | |
332 files = self.listfilediffs(changes[3], n), | |
333 rev = i, | |
334 node = hn) | |
335 | |
336 if count >= self.maxchanges: break | |
337 | |
338 cl = self.repo.changelog | |
339 mf = cl.read(cl.tip())[0] | |
340 | |
341 yield self.t('search', | |
342 header = self.header(), | |
343 footer = self.footer(), | |
344 query = query, | |
345 repo = self.reponame, | |
346 manifest = hex(mf), | |
347 entries = changelist) | |
348 | |
138 | 349 def changeset(self, nodeid): |
350 n = bin(nodeid) | |
351 cl = self.repo.changelog | |
352 changes = cl.read(n) | |
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
353 p1 = cl.parents(n)[0] |
138 | 354 t = float(changes[2].split(' ')[0]) |
515 | 355 |
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
356 files = [] |
138 | 357 mf = self.repo.manifest.read(changes[0]) |
131 | 358 for f in changes[3]: |
138 | 359 files.append(self.t("filenodelink", |
369
09f24af48b82
hgweb: fix deleted file in changeset key error
mpm@selenic.com
parents:
366
diff
changeset
|
360 filenode = hex(mf.get(f, nullid)), file = f)) |
138 | 361 |
362 def diff(): | |
363 yield self.diff(p1, n, changes[3]) | |
131 | 364 |
138 | 365 yield self.t('changeset', |
142 | 366 header = self.header(), |
367 footer = self.footer(), | |
368 repo = self.reponame, | |
138 | 369 diff = diff, |
370 rev = cl.rev(n), | |
371 node = nodeid, | |
570
2ee819a950aa
[PATCH 2/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
569
diff
changeset
|
372 parent = self.parents("changesetparent", |
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
373 cl.parents(n), cl.rev), |
568 | 374 changesettag = self.showtag("changesettag",n), |
138 | 375 manifest = hex(changes[0]), |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
376 author = changes[1], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
377 desc = changes[4], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
378 date = t, |
138 | 379 files = files) |
131 | 380 |
138 | 381 def filelog(self, f, filenode): |
382 cl = self.repo.changelog | |
383 fl = self.repo.file(f) | |
384 count = fl.count() | |
385 | |
386 def entries(): | |
387 l = [] | |
142 | 388 parity = (count - 1) & 1 |
515 | 389 |
138 | 390 for i in range(count): |
391 | |
392 n = fl.node(i) | |
393 lr = fl.linkrev(n) | |
394 cn = cl.node(lr) | |
395 cs = cl.read(cl.node(lr)) | |
396 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
|
397 |
138 | 398 l.insert(0, self.t("filelogentry", |
142 | 399 parity = parity, |
138 | 400 filenode = hex(n), |
401 filerev = i, | |
402 file = f, | |
403 node = hex(cn), | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
404 author = cs[1], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
405 date = t, |
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
406 parent = self.parents("filelogparent", |
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
407 fl.parents(n), fl.rev, file=f), |
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
408 desc = cs[4])) |
142 | 409 parity = 1 - parity |
138 | 410 |
411 yield l | |
412 | |
413 yield self.t("filelog", | |
142 | 414 header = self.header(), |
415 footer = self.footer(), | |
416 repo = self.reponame, | |
138 | 417 file = f, |
418 filenode = filenode, | |
419 entries = entries) | |
131 | 420 |
138 | 421 def filerevision(self, f, node): |
422 fl = self.repo.file(f) | |
423 n = bin(node) | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
424 text = fl.read(n) |
138 | 425 changerev = fl.linkrev(n) |
426 cl = self.repo.changelog | |
427 cn = cl.node(changerev) | |
428 cs = cl.read(cn) | |
429 t = float(cs[2].split(' ')[0]) | |
430 mfn = cs[0] | |
142 | 431 |
432 def lines(): | |
433 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
|
434 yield self.t("fileline", line = t, |
142 | 435 linenumber = "% 6d" % (l + 1), |
436 parity = l & 1) | |
359 | 437 |
138 | 438 yield self.t("filerevision", file = f, |
142 | 439 header = self.header(), |
440 footer = self.footer(), | |
441 repo = self.reponame, | |
138 | 442 filenode = node, |
443 path = up(f), | |
142 | 444 text = lines(), |
138 | 445 rev = changerev, |
446 node = hex(cn), | |
447 manifest = hex(mfn), | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
448 author = cs[1], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
449 date = t, |
570
2ee819a950aa
[PATCH 2/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
569
diff
changeset
|
450 parent = self.parents("filerevparent", |
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
451 fl.parents(n), fl.rev, file=f), |
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
452 permissions = self.repo.manifest.readflags(mfn)[f]) |
138 | 453 |
454 def fileannotate(self, f, node): | |
455 bcache = {} | |
456 ncache = {} | |
457 fl = self.repo.file(f) | |
458 n = bin(node) | |
459 changerev = fl.linkrev(n) | |
460 | |
461 cl = self.repo.changelog | |
462 cn = cl.node(changerev) | |
463 cs = cl.read(cn) | |
464 t = float(cs[2].split(' ')[0]) | |
465 mfn = cs[0] | |
131 | 466 |
138 | 467 def annotate(): |
142 | 468 parity = 1 |
469 last = None | |
138 | 470 for r, l in fl.annotate(n): |
471 try: | |
472 cnode = ncache[r] | |
473 except KeyError: | |
474 cnode = ncache[r] = self.repo.changelog.node(r) | |
515 | 475 |
138 | 476 try: |
477 name = bcache[r] | |
478 except KeyError: | |
479 cl = self.repo.changelog.read(cnode) | |
480 name = cl[1] | |
481 f = name.find('@') | |
482 if f >= 0: | |
483 name = name[:f] | |
534
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
533
diff
changeset
|
484 f = name.find('<') |
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
533
diff
changeset
|
485 if f >= 0: |
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
533
diff
changeset
|
486 name = name[f+1:] |
138 | 487 bcache[r] = name |
131 | 488 |
142 | 489 if last != cnode: |
490 parity = 1 - parity | |
491 last = cnode | |
492 | |
138 | 493 yield self.t("annotateline", |
142 | 494 parity = parity, |
138 | 495 node = hex(cnode), |
496 rev = r, | |
497 author = name, | |
498 file = f, | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
499 line = l) |
138 | 500 |
501 yield self.t("fileannotate", | |
142 | 502 header = self.header(), |
503 footer = self.footer(), | |
504 repo = self.reponame, | |
138 | 505 file = f, |
506 filenode = node, | |
507 annotate = annotate, | |
508 path = up(f), | |
509 rev = changerev, | |
510 node = hex(cn), | |
511 manifest = hex(mfn), | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
512 author = cs[1], |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
513 date = t, |
570
2ee819a950aa
[PATCH 2/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
569
diff
changeset
|
514 parent = self.parents("fileannotateparent", |
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
515 fl.parents(n), fl.rev, file=f), |
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
516 permissions = self.repo.manifest.readflags(mfn)[f]) |
136 | 517 |
138 | 518 def manifest(self, mnode, path): |
519 mf = self.repo.manifest.read(bin(mnode)) | |
520 rev = self.repo.manifest.rev(bin(mnode)) | |
521 node = self.repo.changelog.node(rev) | |
359 | 522 mff=self.repo.manifest.readflags(bin(mnode)) |
138 | 523 |
524 files = {} | |
515 | 525 |
138 | 526 p = path[1:] |
527 l = len(p) | |
131 | 528 |
138 | 529 for f,n in mf.items(): |
530 if f[:l] != p: | |
531 continue | |
532 remain = f[l:] | |
533 if "/" in remain: | |
534 short = remain[:remain.find("/") + 1] # bleah | |
142 | 535 files[short] = (f, None) |
138 | 536 else: |
537 short = os.path.basename(remain) | |
538 files[short] = (f, n) | |
131 | 539 |
138 | 540 def filelist(): |
142 | 541 parity = 0 |
138 | 542 fl = files.keys() |
543 fl.sort() | |
544 for f in fl: | |
545 full, fnode = files[f] | |
142 | 546 if fnode: |
547 yield self.t("manifestfileentry", | |
548 file = full, | |
549 manifest = mnode, | |
550 filenode = hex(fnode), | |
551 parity = parity, | |
515 | 552 basename = f, |
359 | 553 permissions = mff[full]) |
142 | 554 else: |
555 yield self.t("manifestdirentry", | |
556 parity = parity, | |
557 path = os.path.join(path, f), | |
558 manifest = mnode, basename = f[:-1]) | |
559 parity = 1 - parity | |
138 | 560 |
561 yield self.t("manifest", | |
142 | 562 header = self.header(), |
563 footer = self.footer(), | |
564 repo = self.reponame, | |
138 | 565 manifest = mnode, |
566 rev = rev, | |
567 node = hex(node), | |
568 path = path, | |
569 up = up(path), | |
142 | 570 entries = filelist) |
131 | 571 |
168 | 572 def tags(self): |
573 cl = self.repo.changelog | |
574 mf = cl.read(cl.tip())[0] | |
575 | |
343 | 576 i = self.repo.tagslist() |
577 i.reverse() | |
168 | 578 |
579 def entries(): | |
580 parity = 0 | |
581 for k,n in i: | |
582 yield self.t("tagentry", | |
583 parity = parity, | |
584 tag = k, | |
585 node = hex(n)) | |
586 parity = 1 - parity | |
587 | |
588 yield self.t("tags", | |
589 header = self.header(), | |
590 footer = self.footer(), | |
591 repo = self.reponame, | |
592 manifest = hex(mf), | |
593 entries = entries) | |
594 | |
138 | 595 def filediff(self, file, changeset): |
596 n = bin(changeset) | |
597 cl = self.repo.changelog | |
598 p1 = cl.parents(n)[0] | |
599 cs = cl.read(n) | |
600 mf = self.repo.manifest.read(cs[0]) | |
515 | 601 |
138 | 602 def diff(): |
603 yield self.diff(p1, n, file) | |
131 | 604 |
138 | 605 yield self.t("filediff", |
142 | 606 header = self.header(), |
607 footer = self.footer(), | |
608 repo = self.reponame, | |
138 | 609 file = file, |
376
fadc9e126369
hgweb: fix deleted file in filediff key error
Thomas Arendsen Hein <thomas@intevation.de>
parents:
369
diff
changeset
|
610 filenode = hex(mf.get(file, nullid)), |
138 | 611 node = changeset, |
612 rev = self.repo.changelog.rev(n), | |
571
c7364b985ca2
[PATCH 3/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
570
diff
changeset
|
613 parent = self.parents("filediffparent", |
c7364b985ca2
[PATCH 3/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
570
diff
changeset
|
614 cl.parents(n), cl.rev), |
138 | 615 diff = diff) |
515 | 616 |
138 | 617 # add tags to things |
618 # tags -> list of changesets corresponding to tags | |
619 # find tag, changeset, file | |
131 | 620 |
132 | 621 def run(self): |
258 | 622 self.refresh() |
132 | 623 args = cgi.parse() |
624 | |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
625 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
|
626 if args.has_key('style'): |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
627 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
|
628 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
|
629 if os.path.isfile(p): m = p |
515 | 630 |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
631 self.t = templater(m, self.filters) |
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
632 |
138 | 633 if not args.has_key('cmd') or args['cmd'][0] == 'changelog': |
538 | 634 c = self.repo.changelog.count() - 1 |
635 hi = c | |
153
e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents:
142
diff
changeset
|
636 if args.has_key('rev'): |
165 | 637 hi = args['rev'][0] |
166
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
638 try: |
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
639 hi = self.repo.changelog.rev(self.repo.lookup(hi)) |
538 | 640 except KeyError: |
641 write(self.search(hi)) | |
642 return | |
575 | 643 |
138 | 644 write(self.changelog(hi)) |
515 | 645 |
138 | 646 elif args['cmd'][0] == 'changeset': |
647 write(self.changeset(args['node'][0])) | |
648 | |
649 elif args['cmd'][0] == 'manifest': | |
650 write(self.manifest(args['manifest'][0], args['path'][0])) | |
651 | |
168 | 652 elif args['cmd'][0] == 'tags': |
653 write(self.tags()) | |
654 | |
138 | 655 elif args['cmd'][0] == 'filediff': |
656 write(self.filediff(args['file'][0], args['node'][0])) | |
131 | 657 |
132 | 658 elif args['cmd'][0] == 'file': |
138 | 659 write(self.filerevision(args['file'][0], args['filenode'][0])) |
131 | 660 |
138 | 661 elif args['cmd'][0] == 'annotate': |
662 write(self.fileannotate(args['file'][0], args['filenode'][0])) | |
131 | 663 |
138 | 664 elif args['cmd'][0] == 'filelog': |
665 write(self.filelog(args['file'][0], args['filenode'][0])) | |
136 | 666 |
222 | 667 elif args['cmd'][0] == 'heads': |
668 httphdr("text/plain") | |
669 h = self.repo.heads() | |
670 sys.stdout.write(" ".join(map(hex, h)) + "\n") | |
671 | |
132 | 672 elif args['cmd'][0] == 'branches': |
673 httphdr("text/plain") | |
674 nodes = [] | |
675 if args.has_key('nodes'): | |
138 | 676 nodes = map(bin, args['nodes'][0].split(" ")) |
677 for b in self.repo.branches(nodes): | |
678 sys.stdout.write(" ".join(map(hex, b)) + "\n") | |
131 | 679 |
132 | 680 elif args['cmd'][0] == 'between': |
681 httphdr("text/plain") | |
682 nodes = [] | |
683 if args.has_key('pairs'): | |
138 | 684 pairs = [ map(bin, p.split("-")) |
132 | 685 for p in args['pairs'][0].split(" ") ] |
138 | 686 for b in self.repo.between(pairs): |
687 sys.stdout.write(" ".join(map(hex, b)) + "\n") | |
132 | 688 |
689 elif args['cmd'][0] == 'changegroup': | |
690 httphdr("application/hg-changegroup") | |
691 nodes = [] | |
197 | 692 if self.viewonly: |
693 return | |
694 | |
132 | 695 if args.has_key('roots'): |
138 | 696 nodes = map(bin, args['roots'][0].split(" ")) |
131 | 697 |
132 | 698 z = zlib.compressobj() |
138 | 699 for chunk in self.repo.changegroup(nodes): |
132 | 700 sys.stdout.write(z.compress(chunk)) |
701 | |
702 sys.stdout.write(z.flush()) | |
131 | 703 |
132 | 704 else: |
138 | 705 write(self.t("error")) |
131 | 706 |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
707 def server(path, name, templates, address, port): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
708 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
709 import BaseHTTPServer |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
710 import sys, os |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
711 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
712 class hgwebhandler(BaseHTTPServer.BaseHTTPRequestHandler): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
713 def do_POST(self): |
271 | 714 try: |
715 self.do_hgweb() | |
716 except socket.error, inst: | |
717 if inst.args[0] != 32: raise | |
158
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 def do_GET(self): |
271 | 720 self.do_POST() |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
721 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
722 def do_hgweb(self): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
723 query = "" |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
724 p = self.path.find("?") |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
725 if p: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
726 query = self.path[p + 1:] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
727 query = query.replace('+', ' ') |
515 | 728 |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
729 env = {} |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
730 env['GATEWAY_INTERFACE'] = 'CGI/1.1' |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
731 env['REQUEST_METHOD'] = self.command |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
732 if query: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
733 env['QUERY_STRING'] = query |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
734 host = self.address_string() |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
735 if host != self.client_address[0]: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
736 env['REMOTE_HOST'] = host |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
737 env['REMOTE_ADDR'] = self.client_address[0] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
738 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
739 if self.headers.typeheader is None: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
740 env['CONTENT_TYPE'] = self.headers.type |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
741 else: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
742 env['CONTENT_TYPE'] = self.headers.typeheader |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
743 length = self.headers.getheader('content-length') |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
744 if length: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
745 env['CONTENT_LENGTH'] = length |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
746 accept = [] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
747 for line in self.headers.getallmatchingheaders('accept'): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
748 if line[:1] in "\t\n\r ": |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
749 accept.append(line.strip()) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
750 else: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
751 accept = accept + line[7:].split(',') |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
752 env['HTTP_ACCEPT'] = ','.join(accept) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
753 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
754 os.environ.update(env) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
755 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
756 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
|
757 try: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
758 sys.stdin = self.rfile |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
759 sys.stdout = self.wfile |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
760 sys.argv = ["hgweb.py"] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
761 if '=' not in query: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
762 sys.argv.append(query) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
763 self.send_response(200, "Script output follows") |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
764 hg.run() |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
765 finally: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
766 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
|
767 |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
768 hg = hgweb(path, name, templates) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
769 httpd = BaseHTTPServer.HTTPServer((address, port), hgwebhandler) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
770 httpd.serve_forever() |