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