author | TK Soh <teekaysoh@yahoo.com> |
Sat, 27 Aug 2005 01:49:41 -0700 | |
changeset 1085 | 6f94688b81b6 |
parent 1078 | 33f40d0c6124 |
child 1087 | 3a1a46dcd397 |
permissions | -rw-r--r-- |
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 |
||
825
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
9 |
import os, cgi, time, re, difflib, socket, 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) |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
16 |
if os.path.isdir(p): |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
17 |
return p |
157
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
18 |
|
138 | 19 |
def age(t): |
20 |
def plural(t, c): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
21 |
if c == 1: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
22 |
return t |
138 | 23 |
return t + "s" |
24 |
def fmt(t, c): |
|
25 |
return "%d %s" % (c, plural(t, c)) |
|
26 |
||
27 |
now = time.time() |
|
28 |
delta = max(1, int(now - t)) |
|
29 |
||
30 |
scales = [["second", 1], |
|
31 |
["minute", 60], |
|
32 |
["hour", 3600], |
|
33 |
["day", 3600 * 24], |
|
34 |
["week", 3600 * 24 * 7], |
|
35 |
["month", 3600 * 24 * 30], |
|
36 |
["year", 3600 * 24 * 365]] |
|
37 |
||
38 |
scales.reverse() |
|
39 |
||
40 |
for t, s in scales: |
|
41 |
n = delta / s |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
42 |
if n >= 2 or s == 1: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
43 |
return fmt(t, n) |
131 | 44 |
|
45 |
def nl2br(text): |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
46 |
return text.replace('\n', '<br/>\n') |
131 | 47 |
|
48 |
def obfuscate(text): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
49 |
return ''.join(['&#%d;' % ord(c) for c in text]) |
138 | 50 |
|
51 |
def up(p): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
52 |
if p[0] != "/": |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
53 |
p = "/" + p |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
54 |
if p[-1] == "/": |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
55 |
p = p[:-1] |
138 | 56 |
up = os.path.dirname(p) |
57 |
if up == "/": |
|
58 |
return "/" |
|
59 |
return up + "/" |
|
131 | 60 |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
61 |
def httphdr(type, file="", size=0): |
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
62 |
sys.stdout.write('Content-type: %s\n' % type) |
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
63 |
if file: |
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
64 |
sys.stdout.write('Content-disposition: attachment; filename=%s\n' |
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
65 |
% file) |
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
66 |
if size > 0: |
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
67 |
sys.stdout.write('Content-length: %d\n' % size) |
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
68 |
sys.stdout.write('\n') |
131 | 69 |
|
135 | 70 |
def write(*things): |
71 |
for thing in things: |
|
72 |
if hasattr(thing, "__iter__"): |
|
73 |
for part in thing: |
|
74 |
write(part) |
|
75 |
else: |
|
76 |
sys.stdout.write(str(thing)) |
|
77 |
||
138 | 78 |
class templater: |
1062 | 79 |
def __init__(self, mapfile, filters={}, defaults={}): |
138 | 80 |
self.cache = {} |
81 |
self.map = {} |
|
82 |
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
|
83 |
self.filters = filters |
601 | 84 |
self.defaults = defaults |
515 | 85 |
|
138 | 86 |
for l in file(mapfile): |
87 |
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
|
88 |
if m: |
138 | 89 |
self.cache[m.group(1)] = m.group(2) |
90 |
else: |
|
91 |
m = re.match(r'(\S+)\s*=\s*(\S+)', l) |
|
92 |
if m: |
|
93 |
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
|
94 |
else: |
1073
7b35a980b982
[PATCH] raise exceptions with Exception subclasses
Bart Trojanowski <bart@jukie.net>
parents:
1063
diff
changeset
|
95 |
raise LookupError("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
|
96 |
|
138 | 97 |
def __call__(self, t, **map): |
601 | 98 |
m = self.defaults.copy() |
99 |
m.update(map) |
|
138 | 100 |
try: |
101 |
tmpl = self.cache[t] |
|
102 |
except KeyError: |
|
103 |
tmpl = self.cache[t] = file(self.map[t]).read() |
|
974
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
104 |
return self.template(tmpl, self.filters, **m) |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
105 |
|
1062 | 106 |
def template(self, tmpl, filters={}, **map): |
974
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
107 |
while tmpl: |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
108 |
m = re.search(r"#([a-zA-Z0-9]+)((%[a-zA-Z0-9]+)*)((\|[a-zA-Z0-9]+)*)#", tmpl) |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
109 |
if m: |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
110 |
yield tmpl[:m.start(0)] |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
111 |
v = map.get(m.group(1), "") |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
112 |
v = callable(v) and v(**map) or v |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
113 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
114 |
format = m.group(2) |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
115 |
fl = m.group(4) |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
116 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
117 |
if format: |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
118 |
q = v.__iter__ |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
119 |
for i in q(): |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
120 |
lm = map.copy() |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
121 |
lm.update(i) |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
122 |
yield self(format[1:], **lm) |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
123 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
124 |
v = "" |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
125 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
126 |
elif fl: |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
127 |
for f in fl.split("|")[1:]: |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
128 |
v = filters[f](v) |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
129 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
130 |
yield v |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
131 |
tmpl = tmpl[m.end(0):] |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
132 |
else: |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
133 |
yield tmpl |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
134 |
return |
515 | 135 |
|
599 | 136 |
def rfc822date(x): |
601 | 137 |
return time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime(x)) |
599 | 138 |
|
941 | 139 |
common_filters = { |
140 |
"escape": cgi.escape, |
|
141 |
"age": age, |
|
142 |
"date": (lambda x: time.asctime(time.gmtime(x))), |
|
143 |
"addbreaks": nl2br, |
|
144 |
"obfuscate": obfuscate, |
|
145 |
"short": (lambda x: x[:12]), |
|
146 |
"firstline": (lambda x: x.splitlines(1)[0]), |
|
147 |
"permissions": (lambda x: x and "-rwxr-xr-x" or "-rw-r--r--"), |
|
148 |
"rfc822date": rfc822date, |
|
149 |
} |
|
150 |
||
138 | 151 |
class hgweb: |
987 | 152 |
def __init__(self, repo, name=None): |
153 |
if type(repo) == type(""): |
|
154 |
self.repo = repository(ui(), repo) |
|
155 |
else: |
|
156 |
self.repo = repo |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
157 |
|
258 | 158 |
self.mtime = -1 |
987 | 159 |
self.reponame = name or self.repo.ui.config("web", "name", |
160 |
self.repo.root) |
|
1078 | 161 |
self.archives = 'zip', 'gz', 'bz2' |
131 | 162 |
|
258 | 163 |
def refresh(self): |
987 | 164 |
s = os.stat(os.path.join(self.repo.root, ".hg", "00changelog.i")) |
258 | 165 |
if s.st_mtime != self.mtime: |
322 | 166 |
self.mtime = s.st_mtime |
987 | 167 |
self.repo = repository(self.repo.ui, self.repo.root) |
964
3f37720e7dc7
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com
parents:
957
diff
changeset
|
168 |
self.maxchanges = self.repo.ui.config("web", "maxchanges", 10) |
3f37720e7dc7
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com
parents:
957
diff
changeset
|
169 |
self.maxfiles = self.repo.ui.config("web", "maxchanges", 10) |
3f37720e7dc7
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com
parents:
957
diff
changeset
|
170 |
self.allowpull = self.repo.ui.configbool("web", "allowpull", True) |
258 | 171 |
|
138 | 172 |
def date(self, cs): |
173 |
return time.asctime(time.gmtime(float(cs[2].split(' ')[0]))) |
|
174 |
||
175 |
def listfiles(self, files, mf): |
|
176 |
for f in files[:self.maxfiles]: |
|
1062 | 177 |
yield self.t("filenodelink", node=hex(mf[f]), file=f) |
138 | 178 |
if len(files) > self.maxfiles: |
179 |
yield self.t("fileellipses") |
|
180 |
||
181 |
def listfilediffs(self, files, changeset): |
|
182 |
for f in files[:self.maxfiles]: |
|
1062 | 183 |
yield self.t("filedifflink", node=hex(changeset), file=f) |
138 | 184 |
if len(files) > self.maxfiles: |
185 |
yield self.t("fileellipses") |
|
186 |
||
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
187 |
def parents(self, t1, nodes=[], rev=None,**args): |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
188 |
if not rev: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
189 |
rev = lambda x: "" |
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
190 |
for node in nodes: |
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
191 |
if node != nullid: |
1062 | 192 |
yield self.t(t1, node=hex(node), rev=rev(node), **args) |
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
193 |
|
568 | 194 |
def showtag(self, t1, node=nullid, **args): |
195 |
for t in self.repo.nodetags(node): |
|
1062 | 196 |
yield self.t(t1, tag=t, **args) |
568 | 197 |
|
138 | 198 |
def diff(self, node1, node2, files): |
199 |
def filterfiles(list, files): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
200 |
l = [x for x in list if x in files] |
515 | 201 |
|
138 | 202 |
for f in files: |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
203 |
if f[-1] != os.sep: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
204 |
f += os.sep |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
205 |
l += [x for x in list if x.startswith(f)] |
138 | 206 |
return l |
131 | 207 |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
208 |
parity = [0] |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
209 |
def diffblock(diff, f, fn): |
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
210 |
yield self.t("diffblock", |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
211 |
lines=prettyprintlines(diff), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
212 |
parity=parity[0], |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
213 |
file=f, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
214 |
filenode=hex(fn or nullid)) |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
215 |
parity[0] = 1 - parity[0] |
515 | 216 |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
217 |
def prettyprintlines(diff): |
138 | 218 |
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
|
219 |
if l.startswith('+'): |
1062 | 220 |
yield self.t("difflineplus", line=l) |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
221 |
elif l.startswith('-'): |
1062 | 222 |
yield self.t("difflineminus", line=l) |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
223 |
elif l.startswith('@'): |
1062 | 224 |
yield self.t("difflineat", line=l) |
138 | 225 |
else: |
1062 | 226 |
yield self.t("diffline", line=l) |
131 | 227 |
|
138 | 228 |
r = self.repo |
229 |
cl = r.changelog |
|
230 |
mf = r.manifest |
|
231 |
change1 = cl.read(node1) |
|
232 |
change2 = cl.read(node2) |
|
233 |
mmap1 = mf.read(change1[0]) |
|
234 |
mmap2 = mf.read(change2[0]) |
|
235 |
date1 = self.date(change1) |
|
236 |
date2 = self.date(change2) |
|
131 | 237 |
|
539 | 238 |
c, a, d, u = r.changes(node1, node2) |
645
a55048b2ae3a
this patch permits hgweb to show the deleted files in the changeset diff
kreijack@inwind.REMOVEME.it
parents:
635
diff
changeset
|
239 |
if files: |
a55048b2ae3a
this patch permits hgweb to show the deleted files in the changeset diff
kreijack@inwind.REMOVEME.it
parents:
635
diff
changeset
|
240 |
c, a, d = map(lambda x: filterfiles(x, files), (c, a, d)) |
131 | 241 |
|
138 | 242 |
for f in c: |
243 |
to = r.file(f).read(mmap1[f]) |
|
244 |
tn = r.file(f).read(mmap2[f]) |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
245 |
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
138 | 246 |
for f in a: |
265
7ca05593bd30
hgweb: fix non-existent source or destination for diff
mpm@selenic.com
parents:
258
diff
changeset
|
247 |
to = None |
138 | 248 |
tn = r.file(f).read(mmap2[f]) |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
249 |
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
138 | 250 |
for f in d: |
251 |
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
|
252 |
tn = None |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
253 |
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) |
131 | 254 |
|
180 | 255 |
def changelog(self, pos): |
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
256 |
def changenav(**map): |
1062 | 257 |
def seq(factor=1): |
138 | 258 |
yield 1 * factor |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
259 |
yield 3 * factor |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
260 |
#yield 5 * factor |
138 | 261 |
for f in seq(factor * 10): |
262 |
yield f |
|
131 | 263 |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
264 |
l = [] |
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
265 |
for f in seq(): |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
266 |
if f < self.maxchanges / 2: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
267 |
continue |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
268 |
if f > count: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
269 |
break |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
270 |
r = "%d" % f |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
271 |
if pos + f < count: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
272 |
l.append(("+" + r, pos + f)) |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
273 |
if pos - f >= 0: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
274 |
l.insert(0, ("-" + r, pos - f)) |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
275 |
|
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
974
diff
changeset
|
276 |
yield {"rev": 0, "label": "(0)"} |
515 | 277 |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
278 |
for label, rev in l: |
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
974
diff
changeset
|
279 |
yield {"label": label, "rev": rev} |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
280 |
|
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
974
diff
changeset
|
281 |
yield {"label": "tip", "rev": ""} |
131 | 282 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
283 |
def changelist(**map): |
142 | 284 |
parity = (start - end) & 1 |
138 | 285 |
cl = self.repo.changelog |
286 |
l = [] # build a list in forward order for efficiency |
|
351 | 287 |
for i in range(start, end): |
138 | 288 |
n = cl.node(i) |
289 |
changes = cl.read(n) |
|
290 |
hn = hex(n) |
|
291 |
t = float(changes[2].split(' ')[0]) |
|
131 | 292 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
293 |
l.insert(0, {"parity": parity, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
294 |
"author": changes[1], |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
295 |
"parent": self.parents("changelogparent", |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
296 |
cl.parents(n), cl.rev), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
297 |
"changelogtag": self.showtag("changelogtag",n), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
298 |
"manifest": hex(changes[0]), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
299 |
"desc": changes[4], |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
300 |
"date": t, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
301 |
"files": self.listfilediffs(changes[3], n), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
302 |
"rev": i, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
303 |
"node": hn}) |
142 | 304 |
parity = 1 - parity |
138 | 305 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
306 |
for e in l: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
307 |
yield e |
131 | 308 |
|
168 | 309 |
cl = self.repo.changelog |
310 |
mf = cl.read(cl.tip())[0] |
|
311 |
count = cl.count() |
|
351 | 312 |
start = max(0, pos - self.maxchanges + 1) |
313 |
end = min(count, start + self.maxchanges) |
|
314 |
pos = end - 1 |
|
138 | 315 |
|
142 | 316 |
yield self.t('changelog', |
1062 | 317 |
changenav=changenav, |
318 |
manifest=hex(mf), |
|
319 |
rev=pos, changesets=count, entries=changelist) |
|
131 | 320 |
|
538 | 321 |
def search(self, query): |
322 |
||
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
323 |
def changelist(**map): |
538 | 324 |
cl = self.repo.changelog |
325 |
count = 0 |
|
326 |
qw = query.lower().split() |
|
327 |
||
328 |
def revgen(): |
|
329 |
for i in range(cl.count() - 1, 0, -100): |
|
330 |
l = [] |
|
331 |
for j in range(max(0, i - 100), i): |
|
332 |
n = cl.node(j) |
|
333 |
changes = cl.read(n) |
|
1023 | 334 |
l.append((n, j, changes)) |
335 |
l.reverse() |
|
538 | 336 |
for e in l: |
337 |
yield e |
|
338 |
||
339 |
for n, i, changes in revgen(): |
|
340 |
miss = 0 |
|
341 |
for q in qw: |
|
342 |
if not (q in changes[1].lower() or |
|
343 |
q in changes[4].lower() or |
|
344 |
q in " ".join(changes[3][:20]).lower()): |
|
345 |
miss = 1 |
|
346 |
break |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
347 |
if miss: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
348 |
continue |
538 | 349 |
|
350 |
count += 1 |
|
351 |
hn = hex(n) |
|
352 |
t = float(changes[2].split(' ')[0]) |
|
353 |
||
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
354 |
yield self.t('searchentry', |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
355 |
parity=count & 1, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
356 |
author=changes[1], |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
357 |
parent=self.parents("changelogparent", |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
358 |
cl.parents(n), cl.rev), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
359 |
changelogtag=self.showtag("changelogtag",n), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
360 |
manifest=hex(changes[0]), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
361 |
desc=changes[4], |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
362 |
date=t, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
363 |
files=self.listfilediffs(changes[3], n), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
364 |
rev=i, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
365 |
node=hn) |
538 | 366 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
367 |
if count >= self.maxchanges: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
368 |
break |
538 | 369 |
|
370 |
cl = self.repo.changelog |
|
371 |
mf = cl.read(cl.tip())[0] |
|
372 |
||
373 |
yield self.t('search', |
|
1062 | 374 |
query=query, |
375 |
manifest=hex(mf), |
|
376 |
entries=changelist) |
|
538 | 377 |
|
138 | 378 |
def changeset(self, nodeid): |
379 |
n = bin(nodeid) |
|
380 |
cl = self.repo.changelog |
|
381 |
changes = cl.read(n) |
|
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
382 |
p1 = cl.parents(n)[0] |
138 | 383 |
t = float(changes[2].split(' ')[0]) |
515 | 384 |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
385 |
files = [] |
138 | 386 |
mf = self.repo.manifest.read(changes[0]) |
131 | 387 |
for f in changes[3]: |
138 | 388 |
files.append(self.t("filenodelink", |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
389 |
filenode=hex(mf.get(f, nullid)), file=f)) |
138 | 390 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
391 |
def diff(**map): |
645
a55048b2ae3a
this patch permits hgweb to show the deleted files in the changeset diff
kreijack@inwind.REMOVEME.it
parents:
635
diff
changeset
|
392 |
yield self.diff(p1, n, None) |
131 | 393 |
|
1078 | 394 |
def archivelist(): |
395 |
for i in self.archives: |
|
396 |
if self.repo.ui.configbool("web", "allow" + i, False): |
|
397 |
yield {"type" : i, "node" : nodeid} |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
398 |
|
138 | 399 |
yield self.t('changeset', |
1062 | 400 |
diff=diff, |
401 |
rev=cl.rev(n), |
|
402 |
node=nodeid, |
|
403 |
parent=self.parents("changesetparent", |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
404 |
cl.parents(n), cl.rev), |
1062 | 405 |
changesettag=self.showtag("changesettag",n), |
406 |
manifest=hex(changes[0]), |
|
407 |
author=changes[1], |
|
408 |
desc=changes[4], |
|
409 |
date=t, |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
410 |
files=files, |
1078 | 411 |
archives=archivelist()) |
131 | 412 |
|
138 | 413 |
def filelog(self, f, filenode): |
414 |
cl = self.repo.changelog |
|
415 |
fl = self.repo.file(f) |
|
416 |
count = fl.count() |
|
417 |
||
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
418 |
def entries(**map): |
138 | 419 |
l = [] |
142 | 420 |
parity = (count - 1) & 1 |
515 | 421 |
|
138 | 422 |
for i in range(count): |
423 |
n = fl.node(i) |
|
424 |
lr = fl.linkrev(n) |
|
425 |
cn = cl.node(lr) |
|
426 |
cs = cl.read(cl.node(lr)) |
|
427 |
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
|
428 |
|
978
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
429 |
l.insert(0, {"parity": parity, |
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
430 |
"filenode": hex(n), |
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
431 |
"filerev": i, |
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
432 |
"file": f, |
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
433 |
"node": hex(cn), |
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
434 |
"author": cs[1], |
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
435 |
"date": t, |
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
436 |
"parent": self.parents("filelogparent", |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
437 |
fl.parents(n), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
438 |
fl.rev, file=f), |
978
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
439 |
"desc": cs[4]}) |
142 | 440 |
parity = 1 - parity |
138 | 441 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
442 |
for e in l: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
443 |
yield e |
138 | 444 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
445 |
yield self.t("filelog", file=f, filenode=filenode, entries=entries) |
131 | 446 |
|
138 | 447 |
def filerevision(self, f, node): |
448 |
fl = self.repo.file(f) |
|
449 |
n = bin(node) |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
450 |
text = fl.read(n) |
138 | 451 |
changerev = fl.linkrev(n) |
452 |
cl = self.repo.changelog |
|
453 |
cn = cl.node(changerev) |
|
454 |
cs = cl.read(cn) |
|
455 |
t = float(cs[2].split(' ')[0]) |
|
456 |
mfn = cs[0] |
|
142 | 457 |
|
458 |
def lines(): |
|
459 |
for l, t in enumerate(text.splitlines(1)): |
|
976
5d5ab159d197
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
975
diff
changeset
|
460 |
yield {"line": t, |
5d5ab159d197
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
975
diff
changeset
|
461 |
"linenumber": "% 6d" % (l + 1), |
5d5ab159d197
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
975
diff
changeset
|
462 |
"parity": l & 1} |
359 | 463 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
464 |
yield self.t("filerevision", |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
465 |
file=f, |
1062 | 466 |
filenode=node, |
467 |
path=up(f), |
|
468 |
text=lines(), |
|
469 |
rev=changerev, |
|
470 |
node=hex(cn), |
|
471 |
manifest=hex(mfn), |
|
472 |
author=cs[1], |
|
473 |
date=t, |
|
474 |
parent=self.parents("filerevparent", |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
475 |
fl.parents(n), fl.rev, file=f), |
1062 | 476 |
permissions=self.repo.manifest.readflags(mfn)[f]) |
138 | 477 |
|
478 |
def fileannotate(self, f, node): |
|
479 |
bcache = {} |
|
480 |
ncache = {} |
|
481 |
fl = self.repo.file(f) |
|
482 |
n = bin(node) |
|
483 |
changerev = fl.linkrev(n) |
|
484 |
||
485 |
cl = self.repo.changelog |
|
486 |
cn = cl.node(changerev) |
|
487 |
cs = cl.read(cn) |
|
488 |
t = float(cs[2].split(' ')[0]) |
|
489 |
mfn = cs[0] |
|
131 | 490 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
491 |
def annotate(**map): |
142 | 492 |
parity = 1 |
493 |
last = None |
|
138 | 494 |
for r, l in fl.annotate(n): |
495 |
try: |
|
496 |
cnode = ncache[r] |
|
497 |
except KeyError: |
|
498 |
cnode = ncache[r] = self.repo.changelog.node(r) |
|
515 | 499 |
|
138 | 500 |
try: |
501 |
name = bcache[r] |
|
502 |
except KeyError: |
|
503 |
cl = self.repo.changelog.read(cnode) |
|
504 |
name = cl[1] |
|
505 |
f = name.find('@') |
|
506 |
if f >= 0: |
|
507 |
name = name[:f] |
|
534
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
533
diff
changeset
|
508 |
f = name.find('<') |
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
533
diff
changeset
|
509 |
if f >= 0: |
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
533
diff
changeset
|
510 |
name = name[f+1:] |
138 | 511 |
bcache[r] = name |
131 | 512 |
|
142 | 513 |
if last != cnode: |
514 |
parity = 1 - parity |
|
515 |
last = cnode |
|
516 |
||
977
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
517 |
yield {"parity": parity, |
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
518 |
"node": hex(cnode), |
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
519 |
"rev": r, |
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
520 |
"author": name, |
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
521 |
"file": f, |
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
522 |
"line": l} |
138 | 523 |
|
524 |
yield self.t("fileannotate", |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
525 |
file=f, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
526 |
filenode=node, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
527 |
annotate=annotate, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
528 |
path=up(f), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
529 |
rev=changerev, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
530 |
node=hex(cn), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
531 |
manifest=hex(mfn), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
532 |
author=cs[1], |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
533 |
date=t, |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
534 |
parent=self.parents("fileannotateparent", |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
535 |
fl.parents(n), fl.rev, file=f), |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
536 |
permissions=self.repo.manifest.readflags(mfn)[f]) |
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 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
560 |
def filelist(**map): |
142 | 561 |
parity = 0 |
138 | 562 |
fl = files.keys() |
563 |
fl.sort() |
|
564 |
for f in fl: |
|
565 |
full, fnode = files[f] |
|
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
566 |
if not fnode: |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
567 |
continue |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
568 |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
569 |
yield {"file": full, |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
570 |
"manifest": mnode, |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
571 |
"filenode": hex(fnode), |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
572 |
"parity": parity, |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
573 |
"basename": f, |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
574 |
"permissions": mff[full]} |
142 | 575 |
parity = 1 - parity |
138 | 576 |
|
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
577 |
def dirlist(**map): |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
578 |
parity = 0 |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
579 |
fl = files.keys() |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
580 |
fl.sort() |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
581 |
for f in fl: |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
582 |
full, fnode = files[f] |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
583 |
if fnode: |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
584 |
continue |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
585 |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
586 |
yield {"parity": parity, |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
587 |
"path": os.path.join(path, f), |
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
588 |
"manifest": mnode, |
980 | 589 |
"basename": f[:-1]} |
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
590 |
parity = 1 - parity |
982
8d2e24bae760
hgweb: convert index entries to list expansion style
mpm@selenic.com
parents:
981
diff
changeset
|
591 |
|
138 | 592 |
yield self.t("manifest", |
1062 | 593 |
manifest=mnode, |
594 |
rev=rev, |
|
595 |
node=hex(node), |
|
596 |
path=path, |
|
597 |
up=up(path), |
|
598 |
fentries=filelist, |
|
599 |
dentries=dirlist) |
|
131 | 600 |
|
168 | 601 |
def tags(self): |
602 |
cl = self.repo.changelog |
|
603 |
mf = cl.read(cl.tip())[0] |
|
604 |
||
343 | 605 |
i = self.repo.tagslist() |
606 |
i.reverse() |
|
168 | 607 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
608 |
def entries(**map): |
168 | 609 |
parity = 0 |
610 |
for k,n in i: |
|
974
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
611 |
yield {"parity": parity, |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
612 |
"tag": k, |
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
613 |
"node": hex(n)} |
168 | 614 |
parity = 1 - parity |
615 |
||
616 |
yield self.t("tags", |
|
1062 | 617 |
manifest=hex(mf), |
618 |
entries=entries) |
|
168 | 619 |
|
138 | 620 |
def filediff(self, file, changeset): |
621 |
n = bin(changeset) |
|
622 |
cl = self.repo.changelog |
|
623 |
p1 = cl.parents(n)[0] |
|
624 |
cs = cl.read(n) |
|
625 |
mf = self.repo.manifest.read(cs[0]) |
|
515 | 626 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
627 |
def diff(**map): |
138 | 628 |
yield self.diff(p1, n, file) |
131 | 629 |
|
138 | 630 |
yield self.t("filediff", |
1062 | 631 |
file=file, |
632 |
filenode=hex(mf.get(file, nullid)), |
|
633 |
node=changeset, |
|
634 |
rev=self.repo.changelog.rev(n), |
|
635 |
parent=self.parents("filediffparent", |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
636 |
cl.parents(n), cl.rev), |
1062 | 637 |
diff=diff) |
515 | 638 |
|
1078 | 639 |
def archive(self, cnode, type): |
640 |
cs = self.repo.changelog.read(cnode) |
|
641 |
mnode = cs[0] |
|
642 |
mf = self.repo.manifest.read(mnode) |
|
643 |
rev = self.repo.manifest.rev(mnode) |
|
644 |
reponame = re.sub(r"\W+", "-", self.reponame) |
|
645 |
name = "%s-%s/" % (reponame, short(cnode)) |
|
646 |
||
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
647 |
if type == 'zip': |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
648 |
import zipfile |
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
649 |
|
1078 | 650 |
try: |
651 |
tmp = tempfile.mkstemp()[1] |
|
652 |
zf = zipfile.ZipFile(tmp, "w", zipfile.ZIP_DEFLATED) |
|
653 |
||
654 |
for f in mf.keys(): |
|
655 |
zf.writestr(name + f, self.repo.file(f).read(mf[f])) |
|
656 |
zf.close() |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
657 |
|
1078 | 658 |
f = open(tmp, 'r') |
659 |
httphdr('application/zip', name[:-1] + '.zip', |
|
660 |
os.path.getsize(tmp)) |
|
661 |
sys.stdout.write(f.read()) |
|
662 |
f.close() |
|
663 |
finally: |
|
664 |
os.unlink(tmp) |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
665 |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
666 |
else: |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
667 |
import StringIO |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
668 |
import time |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
669 |
import tarfile |
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
670 |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
671 |
tf = tarfile.TarFile.open(mode='w|' + type, fileobj=sys.stdout) |
1078 | 672 |
mff = self.repo.manifest.readflags(mnode) |
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
673 |
mtime = int(time.time()) |
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
674 |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
675 |
httphdr('application/octet-stream', name[:-1] + '.tar.' + type) |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
676 |
for fname in mf.keys(): |
1078 | 677 |
rcont = self.repo.file(fname).read(mf[fname]) |
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
678 |
finfo = tarfile.TarInfo(name + fname) |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
679 |
finfo.mtime = mtime |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
680 |
finfo.size = len(rcont) |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
681 |
finfo.mode = mff[fname] and 0755 or 0644 |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
682 |
tf.addfile(finfo, StringIO.StringIO(rcont)) |
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
683 |
tf.close() |
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
684 |
|
138 | 685 |
# add tags to things |
686 |
# tags -> list of changesets corresponding to tags |
|
687 |
# find tag, changeset, file |
|
131 | 688 |
|
132 | 689 |
def run(self): |
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
690 |
def header(**map): |
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
691 |
yield self.t("header", **map) |
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
692 |
|
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
693 |
def footer(**map): |
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
694 |
yield self.t("footer", **map) |
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
695 |
|
258 | 696 |
self.refresh() |
132 | 697 |
args = cgi.parse() |
698 |
||
987 | 699 |
t = self.repo.ui.config("web", "templates", templatepath()) |
938 | 700 |
m = os.path.join(t, "map") |
986 | 701 |
style = self.repo.ui.config("web", "style", "") |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
702 |
if args.has_key('style'): |
986 | 703 |
style = args['style'][0] |
704 |
if style: |
|
705 |
b = os.path.basename("map-" + style) |
|
983 | 706 |
p = os.path.join(t, b) |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
707 |
if os.path.isfile(p): |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
708 |
m = p |
515 | 709 |
|
601 | 710 |
port = os.environ["SERVER_PORT"] |
711 |
port = port != "80" and (":" + port) or "" |
|
620
7369ec5d93f2
Attempt to handle RSS URIs properly
Matt Mackall <mpm@selenic.com>
parents:
605
diff
changeset
|
712 |
uri = os.environ["REQUEST_URI"] |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
713 |
if "?" in uri: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
714 |
uri = uri.split("?")[0] |
620
7369ec5d93f2
Attempt to handle RSS URIs properly
Matt Mackall <mpm@selenic.com>
parents:
605
diff
changeset
|
715 |
url = "http://%s%s%s" % (os.environ["SERVER_NAME"], port, uri) |
601 | 716 |
|
941 | 717 |
self.t = templater(m, common_filters, |
1062 | 718 |
{"url": url, |
719 |
"repo": self.reponame, |
|
720 |
"header": header, |
|
721 |
"footer": footer, |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
722 |
}) |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
723 |
|
858
c333dfa8fa1a
[PATCH] Move default page name into map file
Jeff Sipek <jeffpc@optonline.net>
parents:
857
diff
changeset
|
724 |
if not args.has_key('cmd'): |
c333dfa8fa1a
[PATCH] Move default page name into map file
Jeff Sipek <jeffpc@optonline.net>
parents:
857
diff
changeset
|
725 |
args['cmd'] = [self.t.cache['default'],] |
937 | 726 |
|
858
c333dfa8fa1a
[PATCH] Move default page name into map file
Jeff Sipek <jeffpc@optonline.net>
parents:
857
diff
changeset
|
727 |
if args['cmd'][0] == 'changelog': |
538 | 728 |
c = self.repo.changelog.count() - 1 |
729 |
hi = c |
|
153
e8a360cd5a9f
changed pos to rev for changelog cmd, changed & to ;
jake@edge2.net
parents:
142
diff
changeset
|
730 |
if args.has_key('rev'): |
165 | 731 |
hi = args['rev'][0] |
166
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
732 |
try: |
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
733 |
hi = self.repo.changelog.rev(self.repo.lookup(hi)) |
688 | 734 |
except RepoError: |
538 | 735 |
write(self.search(hi)) |
736 |
return |
|
575 | 737 |
|
138 | 738 |
write(self.changelog(hi)) |
515 | 739 |
|
138 | 740 |
elif args['cmd'][0] == 'changeset': |
741 |
write(self.changeset(args['node'][0])) |
|
742 |
||
743 |
elif args['cmd'][0] == 'manifest': |
|
744 |
write(self.manifest(args['manifest'][0], args['path'][0])) |
|
745 |
||
168 | 746 |
elif args['cmd'][0] == 'tags': |
747 |
write(self.tags()) |
|
748 |
||
138 | 749 |
elif args['cmd'][0] == 'filediff': |
750 |
write(self.filediff(args['file'][0], args['node'][0])) |
|
131 | 751 |
|
132 | 752 |
elif args['cmd'][0] == 'file': |
138 | 753 |
write(self.filerevision(args['file'][0], args['filenode'][0])) |
131 | 754 |
|
138 | 755 |
elif args['cmd'][0] == 'annotate': |
756 |
write(self.fileannotate(args['file'][0], args['filenode'][0])) |
|
131 | 757 |
|
138 | 758 |
elif args['cmd'][0] == 'filelog': |
759 |
write(self.filelog(args['file'][0], args['filenode'][0])) |
|
136 | 760 |
|
222 | 761 |
elif args['cmd'][0] == 'heads': |
751
0b245edec124
When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg)
Muli Ben-Yehuda <mulix@mulix.org>
parents:
688
diff
changeset
|
762 |
httphdr("application/mercurial-0.1") |
222 | 763 |
h = self.repo.heads() |
764 |
sys.stdout.write(" ".join(map(hex, h)) + "\n") |
|
765 |
||
132 | 766 |
elif args['cmd'][0] == 'branches': |
751
0b245edec124
When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg)
Muli Ben-Yehuda <mulix@mulix.org>
parents:
688
diff
changeset
|
767 |
httphdr("application/mercurial-0.1") |
132 | 768 |
nodes = [] |
769 |
if args.has_key('nodes'): |
|
138 | 770 |
nodes = map(bin, args['nodes'][0].split(" ")) |
771 |
for b in self.repo.branches(nodes): |
|
772 |
sys.stdout.write(" ".join(map(hex, b)) + "\n") |
|
131 | 773 |
|
132 | 774 |
elif args['cmd'][0] == 'between': |
753 | 775 |
httphdr("application/mercurial-0.1") |
132 | 776 |
nodes = [] |
777 |
if args.has_key('pairs'): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
778 |
pairs = [map(bin, p.split("-")) |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
779 |
for p in args['pairs'][0].split(" ")] |
138 | 780 |
for b in self.repo.between(pairs): |
781 |
sys.stdout.write(" ".join(map(hex, b)) + "\n") |
|
132 | 782 |
|
783 |
elif args['cmd'][0] == 'changegroup': |
|
751
0b245edec124
When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg)
Muli Ben-Yehuda <mulix@mulix.org>
parents:
688
diff
changeset
|
784 |
httphdr("application/mercurial-0.1") |
132 | 785 |
nodes = [] |
964
3f37720e7dc7
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com
parents:
957
diff
changeset
|
786 |
if not self.allowpull: |
197 | 787 |
return |
788 |
||
132 | 789 |
if args.has_key('roots'): |
138 | 790 |
nodes = map(bin, args['roots'][0].split(" ")) |
131 | 791 |
|
132 | 792 |
z = zlib.compressobj() |
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
620
diff
changeset
|
793 |
f = self.repo.changegroup(nodes) |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
620
diff
changeset
|
794 |
while 1: |
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
620
diff
changeset
|
795 |
chunk = f.read(4096) |
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
796 |
if not chunk: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
797 |
break |
132 | 798 |
sys.stdout.write(z.compress(chunk)) |
799 |
||
800 |
sys.stdout.write(z.flush()) |
|
131 | 801 |
|
1078 | 802 |
elif args['cmd'][0] == 'archive': |
803 |
changeset = bin(args['node'][0]) |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
804 |
type = args['type'][0] |
1078 | 805 |
if (type in self.archives and |
806 |
self.repo.ui.configbool("web", "allow" + type, False)): |
|
807 |
self.archive(changeset, type) |
|
808 |
return |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
809 |
|
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
810 |
write(self.t("error")) |
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
811 |
|
132 | 812 |
else: |
138 | 813 |
write(self.t("error")) |
131 | 814 |
|
987 | 815 |
def create_server(repo): |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
816 |
|
938 | 817 |
def openlog(opt, default): |
818 |
if opt and opt != '-': |
|
819 |
return open(opt, 'w') |
|
820 |
return default |
|
821 |
||
987 | 822 |
address = repo.ui.config("web", "address", "") |
823 |
port = int(repo.ui.config("web", "port", 8000)) |
|
824 |
use_ipv6 = repo.ui.configbool("web", "ipv6") |
|
825 |
accesslog = openlog(repo.ui.config("web", "accesslog", "-"), sys.stdout) |
|
826 |
errorlog = openlog(repo.ui.config("web", "errorlog", "-"), sys.stderr) |
|
938 | 827 |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
828 |
import BaseHTTPServer |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
829 |
|
825
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
830 |
class IPv6HTTPServer(BaseHTTPServer.HTTPServer): |
881
16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
Bryan O'Sullivan <bos@serpentine.com>
parents:
858
diff
changeset
|
831 |
address_family = getattr(socket, 'AF_INET6', None) |
16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
Bryan O'Sullivan <bos@serpentine.com>
parents:
858
diff
changeset
|
832 |
|
16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
Bryan O'Sullivan <bos@serpentine.com>
parents:
858
diff
changeset
|
833 |
def __init__(self, *args, **kwargs): |
16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
Bryan O'Sullivan <bos@serpentine.com>
parents:
858
diff
changeset
|
834 |
if self.address_family is None: |
16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
Bryan O'Sullivan <bos@serpentine.com>
parents:
858
diff
changeset
|
835 |
raise RepoError('IPv6 not available on this system') |
16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
Bryan O'Sullivan <bos@serpentine.com>
parents:
858
diff
changeset
|
836 |
BaseHTTPServer.HTTPServer.__init__(self, *args, **kwargs) |
825
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
837 |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
838 |
class hgwebhandler(BaseHTTPServer.BaseHTTPRequestHandler): |
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
839 |
def log_error(self, format, *args): |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
840 |
errorlog.write("%s - - [%s] %s\n" % (self.address_string(), |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
841 |
self.log_date_time_string(), |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
842 |
format % args)) |
937 | 843 |
|
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
844 |
def log_message(self, format, *args): |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
845 |
accesslog.write("%s - - [%s] %s\n" % (self.address_string(), |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
846 |
self.log_date_time_string(), |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
847 |
format % args)) |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
848 |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
849 |
def do_POST(self): |
271 | 850 |
try: |
851 |
self.do_hgweb() |
|
852 |
except socket.error, inst: |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
853 |
if inst.args[0] != 32: |
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
854 |
raise |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
855 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
856 |
def do_GET(self): |
271 | 857 |
self.do_POST() |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
858 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
859 |
def do_hgweb(self): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
860 |
query = "" |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
861 |
p = self.path.find("?") |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
862 |
if p: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
863 |
query = self.path[p + 1:] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
864 |
query = query.replace('+', ' ') |
515 | 865 |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
866 |
env = {} |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
867 |
env['GATEWAY_INTERFACE'] = 'CGI/1.1' |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
868 |
env['REQUEST_METHOD'] = self.command |
599 | 869 |
env['SERVER_NAME'] = self.server.server_name |
870 |
env['SERVER_PORT'] = str(self.server.server_port) |
|
871 |
env['REQUEST_URI'] = "/" |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
872 |
if query: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
873 |
env['QUERY_STRING'] = query |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
874 |
host = self.address_string() |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
875 |
if host != self.client_address[0]: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
876 |
env['REMOTE_HOST'] = host |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
877 |
env['REMOTE_ADDR'] = self.client_address[0] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
878 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
879 |
if self.headers.typeheader is None: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
880 |
env['CONTENT_TYPE'] = self.headers.type |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
881 |
else: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
882 |
env['CONTENT_TYPE'] = self.headers.typeheader |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
883 |
length = self.headers.getheader('content-length') |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
884 |
if length: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
885 |
env['CONTENT_LENGTH'] = length |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
886 |
accept = [] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
887 |
for line in self.headers.getallmatchingheaders('accept'): |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
888 |
if line[:1] in "\t\n\r ": |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
889 |
accept.append(line.strip()) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
890 |
else: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
891 |
accept = accept + line[7:].split(',') |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
892 |
env['HTTP_ACCEPT'] = ','.join(accept) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
893 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
894 |
os.environ.update(env) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
895 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
896 |
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
|
897 |
try: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
898 |
sys.stdin = self.rfile |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
899 |
sys.stdout = self.wfile |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
900 |
sys.argv = ["hgweb.py"] |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
901 |
if '=' not in query: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
902 |
sys.argv.append(query) |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
903 |
self.send_response(200, "Script output follows") |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
904 |
hg.run() |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
905 |
finally: |
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
906 |
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
|
907 |
|
987 | 908 |
hg = hgweb(repo) |
825
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
909 |
if use_ipv6: |
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
910 |
return IPv6HTTPServer((address, port), hgwebhandler) |
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
911 |
else: |
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
912 |
return BaseHTTPServer.HTTPServer((address, port), hgwebhandler) |
603
bc5d058e65e9
[PATCH] Get "hg serve" to print the URL being served
mpm@selenic.com
parents:
601
diff
changeset
|
913 |
|
1062 | 914 |
def server(path, name, templates, address, port, use_ipv6=False, |
915 |
accesslog=sys.stdout, errorlog=sys.stderr): |
|
825
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
916 |
httpd = create_server(path, name, templates, address, port, use_ipv6, |
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
917 |
accesslog, errorlog) |
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
918 |
httpd.serve_forever() |
941 | 919 |
|
920 |
# This is a stopgap |
|
921 |
class hgwebdir: |
|
922 |
def __init__(self, config): |
|
923 |
self.cp = ConfigParser.SafeConfigParser() |
|
924 |
self.cp.read(config) |
|
925 |
||
926 |
def run(self): |
|
927 |
try: |
|
928 |
virtual = os.environ["PATH_INFO"] |
|
929 |
except: |
|
930 |
virtual = "" |
|
931 |
||
1022 | 932 |
if virtual[1:]: |
941 | 933 |
real = self.cp.get("paths", virtual[1:]) |
956 | 934 |
h = hgweb(real) |
941 | 935 |
h.run() |
936 |
return |
|
937 |
||
938 |
def header(**map): |
|
939 |
yield tmpl("header", **map) |
|
940 |
||
941 |
def footer(**map): |
|
942 |
yield tmpl("footer", **map) |
|
943 |
||
944 |
templates = templatepath() |
|
945 |
m = os.path.join(templates, "map") |
|
946 |
tmpl = templater(m, common_filters, |
|
947 |
{"header": header, "footer": footer}) |
|
948 |
||
949 |
def entries(**map): |
|
950 |
parity = 0 |
|
957 | 951 |
l = self.cp.items("paths") |
952 |
l.sort() |
|
953 |
for v,r in l: |
|
941 | 954 |
cp2 = ConfigParser.SafeConfigParser() |
955 |
cp2.read(os.path.join(r, ".hg", "hgrc")) |
|
956 |
||
957 |
def get(sec, val, default): |
|
958 |
try: |
|
959 |
return cp2.get(sec, val) |
|
960 |
except: |
|
961 |
return default |
|
962 |
||
1022 | 963 |
url = os.environ["REQUEST_URI"] + "/" + v |
964 |
url = url.replace("//", "/") |
|
965 |
||
1062 | 966 |
yield dict(author=get("web", "author", "unknown"), |
967 |
name=get("web", "name", v), |
|
968 |
url=url, |
|
969 |
parity=parity, |
|
970 |
shortdesc=get("web", "description", "unknown"), |
|
971 |
lastupdate=os.stat(os.path.join(r, ".hg", |
|
941 | 972 |
"00changelog.d")).st_mtime) |
973 |
||
974 |
parity = 1 - parity |
|
975 |
||
1062 | 976 |
write(tmpl("index", entries=entries)) |