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