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