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