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