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