Mercurial > hg > pyhgsh
annotate mercurial/hgweb.py @ 1792:a161c61ba8ed
Cleanup of tabs and coding when sending content type.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 22 Feb 2006 08:32:51 +0100 |
| parents | 8a1f2eae2832 |
| children | 83c6d8355909 |
| 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 | |
|
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1649
diff
changeset
|
9 import os, cgi, sys, urllib |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
10 import mimetypes |
| 1213 | 11 from demandload import demandload |
| 1217 | 12 demandload(globals(), "mdiff time re socket zlib errno ui hg ConfigParser") |
|
1320
5f277e73778f
Fix up representation of dates in hgweb.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1308
diff
changeset
|
13 demandload(globals(), "zipfile tempfile StringIO tarfile BaseHTTPServer util") |
|
1411
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
14 demandload(globals(), "mimetypes") |
| 1213 | 15 from node import * |
|
1400
cf9a1233738a
i18n first part: make '_' available for files who need it
Benoit Boissinot <benoit.boissinot@ens-lyon.org
parents:
1369
diff
changeset
|
16 from i18n import gettext as _ |
| 138 | 17 |
|
157
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
18 def templatepath(): |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
19 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
|
20 p = os.path.join(os.path.dirname(__file__), f) |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
21 if os.path.isdir(p): |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
22 return p |
|
157
2653740d8118
Install the templates where they can be found by hgweb.py
mpm@selenic.com
parents:
156
diff
changeset
|
23 |
|
1320
5f277e73778f
Fix up representation of dates in hgweb.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1308
diff
changeset
|
24 def age(x): |
| 138 | 25 def plural(t, c): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
26 if c == 1: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
27 return t |
| 138 | 28 return t + "s" |
| 29 def fmt(t, c): | |
| 30 return "%d %s" % (c, plural(t, c)) | |
| 31 | |
| 32 now = time.time() | |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
33 then = x[0] |
|
1320
5f277e73778f
Fix up representation of dates in hgweb.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1308
diff
changeset
|
34 delta = max(1, int(now - then)) |
| 138 | 35 |
| 36 scales = [["second", 1], | |
| 37 ["minute", 60], | |
| 38 ["hour", 3600], | |
| 39 ["day", 3600 * 24], | |
| 40 ["week", 3600 * 24 * 7], | |
| 41 ["month", 3600 * 24 * 30], | |
| 42 ["year", 3600 * 24 * 365]] | |
| 43 | |
| 44 scales.reverse() | |
| 45 | |
| 46 for t, s in scales: | |
| 47 n = delta / s | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
48 if n >= 2 or s == 1: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
49 return fmt(t, n) |
| 131 | 50 |
| 51 def nl2br(text): | |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
52 return text.replace('\n', '<br/>\n') |
| 131 | 53 |
| 54 def obfuscate(text): | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
55 return ''.join(['&#%d;' % ord(c) for c in text]) |
| 138 | 56 |
| 57 def up(p): | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
58 if p[0] != "/": |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
59 p = "/" + p |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
60 if p[-1] == "/": |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
61 p = p[:-1] |
| 138 | 62 up = os.path.dirname(p) |
| 63 if up == "/": | |
| 64 return "/" | |
| 65 return up + "/" | |
| 131 | 66 |
|
1418
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
67 def get_mtime(repo_path): |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
68 hg_path = os.path.join(repo_path, ".hg") |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
69 cl_path = os.path.join(hg_path, "00changelog.i") |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
70 if os.path.exists(os.path.join(cl_path)): |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
71 return os.stat(cl_path).st_mtime |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
72 else: |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
73 return os.stat(hg_path).st_mtime |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
74 |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1554
diff
changeset
|
75 class hgrequest(object): |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
76 def __init__(self, inp=None, out=None, env=None): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
77 self.inp = inp or sys.stdin |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
78 self.out = out or sys.stdout |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
79 self.env = env or os.environ |
|
1407
db571bcaa35d
allow empty values for url so we can have /?tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1406
diff
changeset
|
80 self.form = cgi.parse(self.inp, self.env, keep_blank_values=1) |
| 131 | 81 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
82 def write(self, *things): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
83 for thing in things: |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
84 if hasattr(thing, "__iter__"): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
85 for part in thing: |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
86 self.write(part) |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
87 else: |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
88 try: |
|
1160
0da98529a476
Fix TypeError
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1159
diff
changeset
|
89 self.out.write(str(thing)) |
|
1174
9d9f4973c76a
Added missing 'import errno', and use errno for EPIPE, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1172
diff
changeset
|
90 except socket.error, inst: |
|
9d9f4973c76a
Added missing 'import errno', and use errno for EPIPE, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1172
diff
changeset
|
91 if inst[0] != errno.ECONNRESET: |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
92 raise |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
93 |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
94 def header(self, headers=[('Content-type','text/html')]): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
95 for header in headers: |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
96 self.out.write("%s: %s\r\n" % header) |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
97 self.out.write("\r\n") |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
98 |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
99 def httphdr(self, type, file="", size=0): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
100 |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
101 headers = [('Content-type', type)] |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
102 if file: |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
103 headers.append(('Content-disposition', 'attachment; filename=%s' % file)) |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
104 if size > 0: |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
105 headers.append(('Content-length', str(size))) |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
106 self.header(headers) |
| 135 | 107 |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1554
diff
changeset
|
108 class templater(object): |
| 1062 | 109 def __init__(self, mapfile, filters={}, defaults={}): |
| 138 | 110 self.cache = {} |
| 111 self.map = {} | |
| 112 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
|
113 self.filters = filters |
| 601 | 114 self.defaults = defaults |
| 515 | 115 |
| 138 | 116 for l in file(mapfile): |
| 117 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
|
118 if m: |
| 138 | 119 self.cache[m.group(1)] = m.group(2) |
| 120 else: | |
| 121 m = re.match(r'(\S+)\s*=\s*(\S+)', l) | |
| 122 if m: | |
| 123 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
|
124 else: |
|
1402
9d2c2e6b32b5
i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1400
diff
changeset
|
125 raise LookupError(_("unknown map entry '%s'") % l) |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
126 |
| 138 | 127 def __call__(self, t, **map): |
| 601 | 128 m = self.defaults.copy() |
| 129 m.update(map) | |
| 138 | 130 try: |
| 131 tmpl = self.cache[t] | |
| 132 except KeyError: | |
| 133 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
|
134 return self.template(tmpl, self.filters, **m) |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
135 |
| 1062 | 136 def template(self, tmpl, filters={}, **map): |
|
974
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
137 while tmpl: |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
138 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
|
139 if m: |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
140 yield tmpl[:m.start(0)] |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
141 v = map.get(m.group(1), "") |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
142 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
|
143 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
144 format = m.group(2) |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
145 fl = m.group(4) |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
146 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
147 if format: |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
148 q = v.__iter__ |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
149 for i in q(): |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
150 lm = map.copy() |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
151 lm.update(i) |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
152 yield self(format[1:], **lm) |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
153 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
154 v = "" |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
155 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
156 elif fl: |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
157 for f in fl.split("|")[1:]: |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
158 v = filters[f](v) |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
159 |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
160 yield v |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
161 tmpl = tmpl[m.end(0):] |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
162 else: |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
163 yield tmpl |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
164 return |
| 515 | 165 |
| 941 | 166 common_filters = { |
|
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1649
diff
changeset
|
167 "escape": lambda x: cgi.escape(x, True), |
|
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1649
diff
changeset
|
168 "urlescape": urllib.quote, |
|
1445
56281e086f38
hgweb: add strip and rstrip filters to handle summary
TK Soh <teekaysoh@yahoo.com>
parents:
1418
diff
changeset
|
169 "strip": lambda x: x.strip(), |
| 941 | 170 "age": age, |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
171 "date": lambda x: util.datestr(x), |
| 941 | 172 "addbreaks": nl2br, |
| 173 "obfuscate": obfuscate, | |
| 174 "short": (lambda x: x[:12]), | |
| 175 "firstline": (lambda x: x.splitlines(1)[0]), | |
| 176 "permissions": (lambda x: x and "-rwxr-xr-x" or "-rw-r--r--"), | |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
177 "rfc822date": lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S"), |
| 941 | 178 } |
| 179 | |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1554
diff
changeset
|
180 class hgweb(object): |
| 987 | 181 def __init__(self, repo, name=None): |
| 182 if type(repo) == type(""): | |
| 1213 | 183 self.repo = hg.repository(ui.ui(), repo) |
| 987 | 184 else: |
| 185 self.repo = repo | |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
186 |
| 258 | 187 self.mtime = -1 |
|
1172
3f30a5e7e15b
Use path relative to document root as reponame if published via a web server.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1170
diff
changeset
|
188 self.reponame = name |
| 1078 | 189 self.archives = 'zip', 'gz', 'bz2' |
| 131 | 190 |
| 258 | 191 def refresh(self): |
|
1418
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
192 mtime = get_mtime(self.repo.root) |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
193 if mtime != self.mtime: |
|
68f81ba07b2a
Make hgweb work when the repository is empty (no 00changelog.i)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1416
diff
changeset
|
194 self.mtime = mtime |
| 1213 | 195 self.repo = hg.repository(self.repo.ui, self.repo.root) |
|
1275
a1a84dd489ff
Fix cut and paste error in hgweb.py
Florian La Roche <laroche@redhat.com>
parents:
1260
diff
changeset
|
196 self.maxchanges = int(self.repo.ui.config("web", "maxchanges", 10)) |
|
a1a84dd489ff
Fix cut and paste error in hgweb.py
Florian La Roche <laroche@redhat.com>
parents:
1260
diff
changeset
|
197 self.maxfiles = int(self.repo.ui.config("web", "maxfiles", 10)) |
|
964
3f37720e7dc7
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com
parents:
957
diff
changeset
|
198 self.allowpull = self.repo.ui.configbool("web", "allowpull", True) |
| 258 | 199 |
|
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
200 def archivelist(self, nodeid): |
|
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
201 for i in self.archives: |
|
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
202 if self.repo.ui.configbool("web", "allow" + i, False): |
|
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
203 yield {"type" : i, "node" : nodeid} |
|
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
204 |
| 138 | 205 def listfiles(self, files, mf): |
| 206 for f in files[:self.maxfiles]: | |
| 1062 | 207 yield self.t("filenodelink", node=hex(mf[f]), file=f) |
| 138 | 208 if len(files) > self.maxfiles: |
| 209 yield self.t("fileellipses") | |
| 210 | |
| 211 def listfilediffs(self, files, changeset): | |
| 212 for f in files[:self.maxfiles]: | |
| 1062 | 213 yield self.t("filedifflink", node=hex(changeset), file=f) |
| 138 | 214 if len(files) > self.maxfiles: |
| 215 yield self.t("fileellipses") | |
| 216 | |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
217 def siblings(self, siblings=[], rev=None, hiderev=None, **args): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
218 if not rev: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
219 rev = lambda x: "" |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
220 siblings = [s for s in siblings if s != nullid] |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
221 if len(siblings) == 1 and rev(siblings[0]) == hiderev: |
|
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1411
diff
changeset
|
222 return |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
223 for s in siblings: |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
224 yield dict(node=hex(s), rev=rev(s), **args) |
|
569
3e347929f5f9
[PATCH 1/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
568
diff
changeset
|
225 |
|
1653
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
226 def renamelink(self, fl, node): |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
227 r = fl.renamed(node) |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
228 if r: |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
229 return [dict(file=r[0], node=hex(r[1]))] |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
230 return [] |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
231 |
| 568 | 232 def showtag(self, t1, node=nullid, **args): |
| 233 for t in self.repo.nodetags(node): | |
| 1062 | 234 yield self.t(t1, tag=t, **args) |
| 568 | 235 |
| 138 | 236 def diff(self, node1, node2, files): |
|
1626
f2b1df3dbcbb
make the order of the arguments for filterfiles consistent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1619
diff
changeset
|
237 def filterfiles(filters, files): |
|
1627
11cd38286fdb
fix for hgweb.filterfiles
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1626
diff
changeset
|
238 l = [x for x in files if x in filters] |
| 515 | 239 |
|
1626
f2b1df3dbcbb
make the order of the arguments for filterfiles consistent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1619
diff
changeset
|
240 for t in filters: |
|
1627
11cd38286fdb
fix for hgweb.filterfiles
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1626
diff
changeset
|
241 if t and t[-1] != os.sep: |
|
1626
f2b1df3dbcbb
make the order of the arguments for filterfiles consistent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1619
diff
changeset
|
242 t += os.sep |
|
f2b1df3dbcbb
make the order of the arguments for filterfiles consistent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1619
diff
changeset
|
243 l += [x for x in files if x.startswith(t)] |
| 138 | 244 return l |
| 131 | 245 |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
246 parity = [0] |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
247 def diffblock(diff, f, fn): |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
248 yield self.t("diffblock", |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
249 lines=prettyprintlines(diff), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
250 parity=parity[0], |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
251 file=f, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
252 filenode=hex(fn or nullid)) |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
253 parity[0] = 1 - parity[0] |
| 515 | 254 |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
255 def prettyprintlines(diff): |
| 138 | 256 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
|
257 if l.startswith('+'): |
| 1062 | 258 yield self.t("difflineplus", line=l) |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
259 elif l.startswith('-'): |
| 1062 | 260 yield self.t("difflineminus", line=l) |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
261 elif l.startswith('@'): |
| 1062 | 262 yield self.t("difflineat", line=l) |
| 138 | 263 else: |
| 1062 | 264 yield self.t("diffline", line=l) |
| 131 | 265 |
| 138 | 266 r = self.repo |
| 267 cl = r.changelog | |
| 268 mf = r.manifest | |
| 269 change1 = cl.read(node1) | |
| 270 change2 = cl.read(node2) | |
| 271 mmap1 = mf.read(change1[0]) | |
| 272 mmap2 = mf.read(change2[0]) | |
|
1333
901c645c1943
hgweb: fix date bug in hgweb diff generation
mpm@selenic.com
parents:
1324
diff
changeset
|
273 date1 = util.datestr(change1[2]) |
|
901c645c1943
hgweb: fix date bug in hgweb diff generation
mpm@selenic.com
parents:
1324
diff
changeset
|
274 date2 = util.datestr(change2[2]) |
| 131 | 275 |
|
1619
1ba0d7041ac4
Distinguish removed and deleted files. Tests are not fixed yet.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1618
diff
changeset
|
276 modified, added, removed, deleted, unknown = 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
|
277 if files: |
|
1626
f2b1df3dbcbb
make the order of the arguments for filterfiles consistent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1619
diff
changeset
|
278 modified, added, removed = map(lambda x: filterfiles(files, x), |
|
1618
ff339dd21976
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
279 (modified, added, removed)) |
| 131 | 280 |
| 1637 | 281 diffopts = self.repo.ui.diffopts() |
| 282 showfunc = diffopts['showfunc'] | |
| 283 ignorews = diffopts['ignorews'] | |
|
1618
ff339dd21976
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
284 for f in modified: |
| 138 | 285 to = r.file(f).read(mmap1[f]) |
| 286 tn = r.file(f).read(mmap2[f]) | |
| 1637 | 287 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, |
| 288 showfunc=showfunc, ignorews=ignorews), f, tn) | |
|
1618
ff339dd21976
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
289 for f in added: |
|
265
7ca05593bd30
hgweb: fix non-existent source or destination for diff
mpm@selenic.com
parents:
258
diff
changeset
|
290 to = None |
| 138 | 291 tn = r.file(f).read(mmap2[f]) |
| 1637 | 292 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, |
| 293 showfunc=showfunc, ignorews=ignorews), f, tn) | |
|
1618
ff339dd21976
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1606
diff
changeset
|
294 for f in removed: |
| 138 | 295 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
|
296 tn = None |
| 1637 | 297 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, |
| 298 showfunc=showfunc, ignorews=ignorews), f, tn) | |
| 131 | 299 |
| 180 | 300 def changelog(self, pos): |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
301 def changenav(**map): |
|
1703
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
302 def seq(factor, maxchanges=None): |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
303 if maxchanges: |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
304 yield maxchanges |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
305 if maxchanges >= 20 and maxchanges <= 40: |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
306 yield 50 |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
307 else: |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
308 yield 1 * factor |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
309 yield 3 * factor |
| 138 | 310 for f in seq(factor * 10): |
| 311 yield f | |
| 131 | 312 |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
313 l = [] |
|
1703
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
314 last = 0 |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
315 for f in seq(1, self.maxchanges): |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
316 if f < self.maxchanges or f <= last: |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
317 continue |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
318 if f > count: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
319 break |
|
1703
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
320 last = f |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
321 r = "%d" % f |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
322 if pos + f < count: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
323 l.append(("+" + r, pos + f)) |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
324 if pos - f >= 0: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
325 l.insert(0, ("-" + r, pos - f)) |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
326 |
|
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
974
diff
changeset
|
327 yield {"rev": 0, "label": "(0)"} |
| 515 | 328 |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
329 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
|
330 yield {"label": label, "rev": rev} |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
331 |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
332 yield {"label": "tip", "rev": "tip"} |
| 131 | 333 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
334 def changelist(**map): |
| 142 | 335 parity = (start - end) & 1 |
| 138 | 336 cl = self.repo.changelog |
| 337 l = [] # build a list in forward order for efficiency | |
| 351 | 338 for i in range(start, end): |
| 138 | 339 n = cl.node(i) |
| 340 changes = cl.read(n) | |
| 341 hn = hex(n) | |
| 131 | 342 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
343 l.insert(0, {"parity": parity, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
344 "author": changes[1], |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
345 "parent": self.siblings(cl.parents(n), cl.rev, |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
346 cl.rev(n) - 1), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
347 "child": self.siblings(cl.children(n), cl.rev, |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
348 cl.rev(n) + 1), |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
349 "changelogtag": self.showtag("changelogtag",n), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
350 "manifest": hex(changes[0]), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
351 "desc": changes[4], |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
352 "date": changes[2], |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
353 "files": self.listfilediffs(changes[3], n), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
354 "rev": i, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
355 "node": hn}) |
| 142 | 356 parity = 1 - parity |
| 138 | 357 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
358 for e in l: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
359 yield e |
| 131 | 360 |
| 168 | 361 cl = self.repo.changelog |
| 362 mf = cl.read(cl.tip())[0] | |
| 363 count = cl.count() | |
| 351 | 364 start = max(0, pos - self.maxchanges + 1) |
| 365 end = min(count, start + self.maxchanges) | |
| 366 pos = end - 1 | |
| 138 | 367 |
| 142 | 368 yield self.t('changelog', |
| 1062 | 369 changenav=changenav, |
| 370 manifest=hex(mf), | |
| 371 rev=pos, changesets=count, entries=changelist) | |
| 131 | 372 |
| 538 | 373 def search(self, query): |
| 374 | |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
375 def changelist(**map): |
| 538 | 376 cl = self.repo.changelog |
| 377 count = 0 | |
| 378 qw = query.lower().split() | |
| 379 | |
| 380 def revgen(): | |
| 381 for i in range(cl.count() - 1, 0, -100): | |
| 382 l = [] | |
| 383 for j in range(max(0, i - 100), i): | |
| 384 n = cl.node(j) | |
| 385 changes = cl.read(n) | |
| 1023 | 386 l.append((n, j, changes)) |
| 387 l.reverse() | |
| 538 | 388 for e in l: |
| 389 yield e | |
| 390 | |
| 391 for n, i, changes in revgen(): | |
| 392 miss = 0 | |
| 393 for q in qw: | |
| 394 if not (q in changes[1].lower() or | |
| 395 q in changes[4].lower() or | |
| 396 q in " ".join(changes[3][:20]).lower()): | |
| 397 miss = 1 | |
| 398 break | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
399 if miss: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
400 continue |
| 538 | 401 |
| 402 count += 1 | |
| 403 hn = hex(n) | |
| 404 | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
405 yield self.t('searchentry', |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
406 parity=count & 1, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
407 author=changes[1], |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
408 parent=self.siblings(cl.parents(n), cl.rev), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
409 child=self.siblings(cl.children(n), cl.rev), |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
410 changelogtag=self.showtag("changelogtag",n), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
411 manifest=hex(changes[0]), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
412 desc=changes[4], |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
413 date=changes[2], |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
414 files=self.listfilediffs(changes[3], n), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
415 rev=i, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
416 node=hn) |
| 538 | 417 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
418 if count >= self.maxchanges: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
419 break |
| 538 | 420 |
| 421 cl = self.repo.changelog | |
| 422 mf = cl.read(cl.tip())[0] | |
| 423 | |
| 424 yield self.t('search', | |
| 1062 | 425 query=query, |
| 426 manifest=hex(mf), | |
| 427 entries=changelist) | |
| 538 | 428 |
| 138 | 429 def changeset(self, nodeid): |
| 430 cl = self.repo.changelog | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
431 n = self.repo.lookup(nodeid) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
432 nodeid = hex(n) |
| 138 | 433 changes = cl.read(n) |
|
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
434 p1 = cl.parents(n)[0] |
| 515 | 435 |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
436 files = [] |
| 138 | 437 mf = self.repo.manifest.read(changes[0]) |
| 131 | 438 for f in changes[3]: |
| 138 | 439 files.append(self.t("filenodelink", |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
440 filenode=hex(mf.get(f, nullid)), file=f)) |
| 138 | 441 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
442 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
|
443 yield self.diff(p1, n, None) |
| 131 | 444 |
| 138 | 445 yield self.t('changeset', |
| 1062 | 446 diff=diff, |
| 447 rev=cl.rev(n), | |
| 448 node=nodeid, | |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
449 parent=self.siblings(cl.parents(n), cl.rev), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
450 child=self.siblings(cl.children(n), cl.rev), |
| 1062 | 451 changesettag=self.showtag("changesettag",n), |
| 452 manifest=hex(changes[0]), | |
| 453 author=changes[1], | |
| 454 desc=changes[4], | |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
455 date=changes[2], |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
456 files=files, |
|
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
457 archives=self.archivelist(nodeid)) |
| 131 | 458 |
| 138 | 459 def filelog(self, f, filenode): |
| 460 cl = self.repo.changelog | |
| 461 fl = self.repo.file(f) | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
462 filenode = hex(fl.lookup(filenode)) |
| 138 | 463 count = fl.count() |
| 464 | |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
465 def entries(**map): |
| 138 | 466 l = [] |
| 142 | 467 parity = (count - 1) & 1 |
| 515 | 468 |
| 138 | 469 for i in range(count): |
| 470 n = fl.node(i) | |
| 471 lr = fl.linkrev(n) | |
| 472 cn = cl.node(lr) | |
| 473 cs = cl.read(cl.node(lr)) | |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
474 |
|
978
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
475 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
|
476 "filenode": hex(n), |
|
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
477 "filerev": i, |
|
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
478 "file": f, |
|
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
479 "node": hex(cn), |
|
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
480 "author": cs[1], |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
481 "date": cs[2], |
|
1653
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
482 "rename": self.renamelink(fl, n), |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
483 "parent": self.siblings(fl.parents(n), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
484 fl.rev, file=f), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
485 "child": self.siblings(fl.children(n), |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
486 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
|
487 "desc": cs[4]}) |
| 142 | 488 parity = 1 - parity |
| 138 | 489 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
490 for e in l: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
491 yield e |
| 138 | 492 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
493 yield self.t("filelog", file=f, filenode=filenode, entries=entries) |
| 131 | 494 |
| 138 | 495 def filerevision(self, f, node): |
| 496 fl = self.repo.file(f) | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
497 n = fl.lookup(node) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
498 node = hex(n) |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
499 text = fl.read(n) |
| 138 | 500 changerev = fl.linkrev(n) |
| 501 cl = self.repo.changelog | |
| 502 cn = cl.node(changerev) | |
| 503 cs = cl.read(cn) | |
| 504 mfn = cs[0] | |
| 142 | 505 |
|
1411
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
506 mt = mimetypes.guess_type(f)[0] |
|
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
507 rawtext = text |
|
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
508 if util.binary(text): |
|
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
509 text = "(binary:%s)" % mt |
|
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
510 |
| 142 | 511 def lines(): |
| 512 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
|
513 yield {"line": t, |
|
5d5ab159d197
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
975
diff
changeset
|
514 "linenumber": "% 6d" % (l + 1), |
|
5d5ab159d197
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
975
diff
changeset
|
515 "parity": l & 1} |
| 359 | 516 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
517 yield self.t("filerevision", |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
518 file=f, |
| 1062 | 519 filenode=node, |
| 520 path=up(f), | |
| 521 text=lines(), | |
|
1411
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
522 raw=rawtext, |
|
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
523 mimetype=mt, |
| 1062 | 524 rev=changerev, |
| 525 node=hex(cn), | |
| 526 manifest=hex(mfn), | |
| 527 author=cs[1], | |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
528 date=cs[2], |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
529 parent=self.siblings(fl.parents(n), fl.rev, file=f), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
530 child=self.siblings(fl.children(n), fl.rev, file=f), |
|
1653
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
531 rename=self.renamelink(fl, n), |
| 1062 | 532 permissions=self.repo.manifest.readflags(mfn)[f]) |
| 138 | 533 |
| 534 def fileannotate(self, f, node): | |
| 535 bcache = {} | |
| 536 ncache = {} | |
| 537 fl = self.repo.file(f) | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
538 n = fl.lookup(node) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
539 node = hex(n) |
| 138 | 540 changerev = fl.linkrev(n) |
| 541 | |
| 542 cl = self.repo.changelog | |
| 543 cn = cl.node(changerev) | |
| 544 cs = cl.read(cn) | |
| 545 mfn = cs[0] | |
| 131 | 546 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
547 def annotate(**map): |
| 142 | 548 parity = 1 |
| 549 last = None | |
| 138 | 550 for r, l in fl.annotate(n): |
| 551 try: | |
| 552 cnode = ncache[r] | |
| 553 except KeyError: | |
| 554 cnode = ncache[r] = self.repo.changelog.node(r) | |
| 515 | 555 |
| 138 | 556 try: |
| 557 name = bcache[r] | |
| 558 except KeyError: | |
| 559 cl = self.repo.changelog.read(cnode) | |
|
1129
ee4f60abad93
Move generating short username to display in hg/hgweb annotate to ui module.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1123
diff
changeset
|
560 bcache[r] = name = self.repo.ui.shortuser(cl[1]) |
| 131 | 561 |
| 142 | 562 if last != cnode: |
| 563 parity = 1 - parity | |
| 564 last = cnode | |
| 565 | |
|
977
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
566 yield {"parity": parity, |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
567 "node": hex(cnode), |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
568 "rev": r, |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
569 "author": name, |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
570 "file": f, |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
571 "line": l} |
| 138 | 572 |
| 573 yield self.t("fileannotate", | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
574 file=f, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
575 filenode=node, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
576 annotate=annotate, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
577 path=up(f), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
578 rev=changerev, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
579 node=hex(cn), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
580 manifest=hex(mfn), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
581 author=cs[1], |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
582 date=cs[2], |
|
1653
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
583 rename=self.renamelink(fl, n), |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
584 parent=self.siblings(fl.parents(n), fl.rev, file=f), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
585 child=self.siblings(fl.children(n), fl.rev, file=f), |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
586 permissions=self.repo.manifest.readflags(mfn)[f]) |
| 136 | 587 |
| 138 | 588 def manifest(self, mnode, path): |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
589 man = self.repo.manifest |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
590 mn = man.lookup(mnode) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
591 mnode = hex(mn) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
592 mf = man.read(mn) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
593 rev = man.rev(mn) |
| 138 | 594 node = self.repo.changelog.node(rev) |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
595 mff = man.readflags(mn) |
| 138 | 596 |
| 597 files = {} | |
| 515 | 598 |
| 138 | 599 p = path[1:] |
|
1649
beb7da710c8a
hgweb: fix breakage on manifest subdirs from path cleaning
Matt Mackall <mpm@selenic.com>
parents:
1646
diff
changeset
|
600 if p and p[-1] != "/": |
|
beb7da710c8a
hgweb: fix breakage on manifest subdirs from path cleaning
Matt Mackall <mpm@selenic.com>
parents:
1646
diff
changeset
|
601 p += "/" |
| 138 | 602 l = len(p) |
| 131 | 603 |
| 138 | 604 for f,n in mf.items(): |
| 605 if f[:l] != p: | |
| 606 continue | |
| 607 remain = f[l:] | |
| 608 if "/" in remain: | |
| 609 short = remain[:remain.find("/") + 1] # bleah | |
| 142 | 610 files[short] = (f, None) |
| 138 | 611 else: |
| 612 short = os.path.basename(remain) | |
| 613 files[short] = (f, n) | |
| 131 | 614 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
615 def filelist(**map): |
| 142 | 616 parity = 0 |
| 138 | 617 fl = files.keys() |
| 618 fl.sort() | |
| 619 for f in fl: | |
| 620 full, fnode = files[f] | |
|
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
621 if not fnode: |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
622 continue |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
623 |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
624 yield {"file": full, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
625 "manifest": mnode, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
626 "filenode": hex(fnode), |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
627 "parity": parity, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
628 "basename": f, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
629 "permissions": mff[full]} |
| 142 | 630 parity = 1 - parity |
| 138 | 631 |
|
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
632 def dirlist(**map): |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
633 parity = 0 |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
634 fl = files.keys() |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
635 fl.sort() |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
636 for f in fl: |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
637 full, fnode = files[f] |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
638 if fnode: |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
639 continue |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
640 |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
641 yield {"parity": parity, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
642 "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
|
643 "manifest": mnode, |
| 980 | 644 "basename": f[:-1]} |
|
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
645 parity = 1 - parity |
|
982
8d2e24bae760
hgweb: convert index entries to list expansion style
mpm@selenic.com
parents:
981
diff
changeset
|
646 |
| 138 | 647 yield self.t("manifest", |
| 1062 | 648 manifest=mnode, |
| 649 rev=rev, | |
| 650 node=hex(node), | |
| 651 path=path, | |
| 652 up=up(path), | |
| 653 fentries=filelist, | |
|
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
654 dentries=dirlist, |
|
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
655 archives=self.archivelist(hex(node))) |
| 131 | 656 |
| 168 | 657 def tags(self): |
| 658 cl = self.repo.changelog | |
| 659 mf = cl.read(cl.tip())[0] | |
| 660 | |
| 343 | 661 i = self.repo.tagslist() |
| 662 i.reverse() | |
| 168 | 663 |
|
1767
adbc392dfd9e
implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl
Peter van Dijk <peter@dataloss.nl>
parents:
1653
diff
changeset
|
664 def entries(notip=False, **map): |
| 168 | 665 parity = 0 |
| 666 for k,n in i: | |
|
1767
adbc392dfd9e
implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl
Peter van Dijk <peter@dataloss.nl>
parents:
1653
diff
changeset
|
667 if notip and k == "tip": continue |
|
974
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
668 yield {"parity": parity, |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
669 "tag": k, |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
670 "tagmanifest": hex(cl.read(n)[0]), |
|
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
671 "date": cl.read(n)[2], |
|
974
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
672 "node": hex(n)} |
| 168 | 673 parity = 1 - parity |
| 674 | |
| 675 yield self.t("tags", | |
| 1062 | 676 manifest=hex(mf), |
|
1767
adbc392dfd9e
implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl
Peter van Dijk <peter@dataloss.nl>
parents:
1653
diff
changeset
|
677 entries=lambda **x: entries(False, **x), |
|
adbc392dfd9e
implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl
Peter van Dijk <peter@dataloss.nl>
parents:
1653
diff
changeset
|
678 entriesnotip=lambda **x: entries(True, **x)) |
| 168 | 679 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
680 def summary(self): |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
681 cl = self.repo.changelog |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
682 mf = cl.read(cl.tip())[0] |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
683 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
684 i = self.repo.tagslist() |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
685 i.reverse() |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
686 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
687 def tagentries(**map): |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
688 parity = 0 |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
689 count = 0 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
690 for k,n in i: |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
691 if k == "tip": # skip tip |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
692 continue; |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
693 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
694 count += 1 |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
695 if count > 10: # limit to 10 tags |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
696 break; |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
697 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
698 c = cl.read(n) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
699 m = c[0] |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
700 t = c[2] |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
701 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
702 yield self.t("tagentry", |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
703 parity = parity, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
704 tag = k, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
705 node = hex(n), |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
706 date = t, |
|
1575
0a1cca912fda
[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1574
diff
changeset
|
707 tagmanifest = hex(m)) |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
708 parity = 1 - parity |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
709 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
710 def changelist(**map): |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
711 parity = 0 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
712 cl = self.repo.changelog |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
713 l = [] # build a list in forward order for efficiency |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
714 for i in range(start, end): |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
715 n = cl.node(i) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
716 changes = cl.read(n) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
717 hn = hex(n) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
718 t = changes[2] |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
719 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
720 l.insert(0, self.t( |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
721 'shortlogentry', |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
722 parity = parity, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
723 author = changes[1], |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
724 manifest = hex(changes[0]), |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
725 desc = changes[4], |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
726 date = t, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
727 rev = i, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
728 node = hn)) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
729 parity = 1 - parity |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
730 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
731 yield l |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
732 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
733 cl = self.repo.changelog |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
734 mf = cl.read(cl.tip())[0] |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
735 count = cl.count() |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
736 start = max(0, count - self.maxchanges) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
737 end = min(count, start + self.maxchanges) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
738 pos = end - 1 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
739 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
740 yield self.t("summary", |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
741 desc = self.repo.ui.config("web", "description", "unknown"), |
|
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
742 owner = (self.repo.ui.config("ui", "username") or # preferred |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
743 self.repo.ui.config("web", "contact") or # deprecated |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
744 self.repo.ui.config("web", "author", "unknown")), # also |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
745 lastchange = (0, 0), # FIXME |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
746 manifest = hex(mf), |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
747 tags = tagentries, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
748 shortlog = changelist) |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
749 |
| 138 | 750 def filediff(self, file, changeset): |
| 751 cl = self.repo.changelog | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
752 n = self.repo.lookup(changeset) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
753 changeset = hex(n) |
| 138 | 754 p1 = cl.parents(n)[0] |
| 755 cs = cl.read(n) | |
| 756 mf = self.repo.manifest.read(cs[0]) | |
| 515 | 757 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
758 def diff(**map): |
| 138 | 759 yield self.diff(p1, n, file) |
| 131 | 760 |
| 138 | 761 yield self.t("filediff", |
| 1062 | 762 file=file, |
| 763 filenode=hex(mf.get(file, nullid)), | |
| 764 node=changeset, | |
| 765 rev=self.repo.changelog.rev(n), | |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
766 parent=self.siblings(cl.parents(n), cl.rev), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
767 child=self.siblings(cl.children(n), cl.rev), |
| 1062 | 768 diff=diff) |
| 515 | 769 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
770 def archive(self, req, cnode, type): |
| 1078 | 771 cs = self.repo.changelog.read(cnode) |
| 772 mnode = cs[0] | |
| 773 mf = self.repo.manifest.read(mnode) | |
| 774 rev = self.repo.manifest.rev(mnode) | |
| 775 reponame = re.sub(r"\W+", "-", self.reponame) | |
| 776 name = "%s-%s/" % (reponame, short(cnode)) | |
| 777 | |
|
1112
87cbfaf79124
hgweb: add mdiff / fix sorting of archives
mpm@selenic.com
parents:
1099
diff
changeset
|
778 files = mf.keys() |
|
87cbfaf79124
hgweb: add mdiff / fix sorting of archives
mpm@selenic.com
parents:
1099
diff
changeset
|
779 files.sort() |
|
87cbfaf79124
hgweb: add mdiff / fix sorting of archives
mpm@selenic.com
parents:
1099
diff
changeset
|
780 |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
781 if type == 'zip': |
|
1165
04be5eb73bb3
Fixed import needed to serve zip files which broke because of other changes.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1163
diff
changeset
|
782 tmp = tempfile.mkstemp()[1] |
| 1078 | 783 try: |
| 784 zf = zipfile.ZipFile(tmp, "w", zipfile.ZIP_DEFLATED) | |
| 785 | |
|
1112
87cbfaf79124
hgweb: add mdiff / fix sorting of archives
mpm@selenic.com
parents:
1099
diff
changeset
|
786 for f in files: |
| 1078 | 787 zf.writestr(name + f, self.repo.file(f).read(mf[f])) |
| 788 zf.close() | |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
789 |
| 1078 | 790 f = open(tmp, 'r') |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
791 req.httphdr('application/zip', name[:-1] + '.zip', |
| 1078 | 792 os.path.getsize(tmp)) |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
793 req.write(f.read()) |
| 1078 | 794 f.close() |
| 795 finally: | |
| 796 os.unlink(tmp) | |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
797 |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
798 else: |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
799 tf = tarfile.TarFile.open(mode='w|' + type, fileobj=req.out) |
| 1078 | 800 mff = self.repo.manifest.readflags(mnode) |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
801 mtime = int(time.time()) |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
802 |
|
1185
2ae9c319e6fe
Output Content-encoding for tar.gz and tar.bz2 snapshots
Edouard Gomez <ed.gomez@free.fr>
parents:
1182
diff
changeset
|
803 if type == "gz": |
|
2ae9c319e6fe
Output Content-encoding for tar.gz and tar.bz2 snapshots
Edouard Gomez <ed.gomez@free.fr>
parents:
1182
diff
changeset
|
804 encoding = "gzip" |
|
2ae9c319e6fe
Output Content-encoding for tar.gz and tar.bz2 snapshots
Edouard Gomez <ed.gomez@free.fr>
parents:
1182
diff
changeset
|
805 else: |
|
2ae9c319e6fe
Output Content-encoding for tar.gz and tar.bz2 snapshots
Edouard Gomez <ed.gomez@free.fr>
parents:
1182
diff
changeset
|
806 encoding = "x-bzip2" |
|
1308
2073e5a71008
Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1275
diff
changeset
|
807 req.header([('Content-type', 'application/x-tar'), |
|
1185
2ae9c319e6fe
Output Content-encoding for tar.gz and tar.bz2 snapshots
Edouard Gomez <ed.gomez@free.fr>
parents:
1182
diff
changeset
|
808 ('Content-disposition', 'attachment; filename=%s%s%s' % |
|
2ae9c319e6fe
Output Content-encoding for tar.gz and tar.bz2 snapshots
Edouard Gomez <ed.gomez@free.fr>
parents:
1182
diff
changeset
|
809 (name[:-1], '.tar.', type)), |
|
2ae9c319e6fe
Output Content-encoding for tar.gz and tar.bz2 snapshots
Edouard Gomez <ed.gomez@free.fr>
parents:
1182
diff
changeset
|
810 ('Content-encoding', encoding)]) |
|
1112
87cbfaf79124
hgweb: add mdiff / fix sorting of archives
mpm@selenic.com
parents:
1099
diff
changeset
|
811 for fname in files: |
| 1078 | 812 rcont = self.repo.file(fname).read(mf[fname]) |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
813 finfo = tarfile.TarInfo(name + fname) |
|
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
814 finfo.mtime = mtime |
|
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
815 finfo.size = len(rcont) |
|
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
816 finfo.mode = mff[fname] and 0755 or 0644 |
|
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
817 tf.addfile(finfo, StringIO.StringIO(rcont)) |
|
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
818 tf.close() |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
819 |
| 138 | 820 # add tags to things |
| 821 # tags -> list of changesets corresponding to tags | |
| 822 # find tag, changeset, file | |
| 131 | 823 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
824 def run(self, req=hgrequest()): |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
825 def clean(path): |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
826 p = os.path.normpath(path) |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
827 if p[:2] == "..": |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
828 raise "suspicious path" |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
829 return p |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
830 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
831 def header(**map): |
|
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
832 yield self.t("header", **map) |
|
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
833 |
|
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
834 def footer(**map): |
|
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
835 yield self.t("footer", **map) |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
836 |
|
1406
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
837 def expand_form(form): |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
838 shortcuts = { |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
839 'cl': [('cmd', ['changelog']), ('rev', None)], |
|
1406
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
840 'cs': [('cmd', ['changeset']), ('node', None)], |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
841 'f': [('cmd', ['file']), ('filenode', None)], |
|
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
842 'fl': [('cmd', ['filelog']), ('filenode', None)], |
|
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
843 'fd': [('cmd', ['filediff']), ('node', None)], |
|
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
844 'fa': [('cmd', ['annotate']), ('filenode', None)], |
|
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
845 'mf': [('cmd', ['manifest']), ('manifest', None)], |
|
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
846 'ca': [('cmd', ['archive']), ('node', None)], |
|
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
847 'tags': [('cmd', ['tags'])], |
|
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
848 'tip': [('cmd', ['changeset']), ('node', ['tip'])], |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
849 'static': [('cmd', ['static']), ('file', None)] |
|
1406
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
850 } |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
851 |
|
1406
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
852 for k in shortcuts.iterkeys(): |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
853 if form.has_key(k): |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
854 for name, value in shortcuts[k]: |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
855 if value is None: |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
856 value = form[k] |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
857 form[name] = value |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
858 del form[k] |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
859 |
| 258 | 860 self.refresh() |
| 132 | 861 |
|
1406
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
862 expand_form(req.form) |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
863 |
| 987 | 864 t = self.repo.ui.config("web", "templates", templatepath()) |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
865 static = self.repo.ui.config("web", "static", os.path.join(t,"static")) |
| 938 | 866 m = os.path.join(t, "map") |
| 986 | 867 style = self.repo.ui.config("web", "style", "") |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
868 if req.form.has_key('style'): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
869 style = req.form['style'][0] |
| 986 | 870 if style: |
| 871 b = os.path.basename("map-" + style) | |
| 983 | 872 p = os.path.join(t, b) |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
873 if os.path.isfile(p): |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
874 m = p |
| 515 | 875 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
876 port = req.env["SERVER_PORT"] |
| 601 | 877 port = port != "80" and (":" + port) or "" |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
878 uri = req.env["REQUEST_URI"] |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
879 if "?" in uri: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
880 uri = uri.split("?")[0] |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
881 url = "http://%s%s%s" % (req.env["SERVER_NAME"], port, uri) |
|
1172
3f30a5e7e15b
Use path relative to document root as reponame if published via a web server.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1170
diff
changeset
|
882 if not self.reponame: |
|
3f30a5e7e15b
Use path relative to document root as reponame if published via a web server.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1170
diff
changeset
|
883 self.reponame = (self.repo.ui.config("web", "name") |
|
3f30a5e7e15b
Use path relative to document root as reponame if published via a web server.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1170
diff
changeset
|
884 or uri.strip('/') or self.repo.root) |
| 601 | 885 |
| 941 | 886 self.t = templater(m, common_filters, |
| 1062 | 887 {"url": url, |
| 888 "repo": self.reponame, | |
| 889 "header": header, | |
| 890 "footer": footer, | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
891 }) |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
892 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
893 if not req.form.has_key('cmd'): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
894 req.form['cmd'] = [self.t.cache['default'],] |
| 937 | 895 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
896 if req.form['cmd'][0] == 'changelog': |
| 538 | 897 c = self.repo.changelog.count() - 1 |
| 898 hi = c | |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
899 if req.form.has_key('rev'): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
900 hi = req.form['rev'][0] |
|
166
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
901 try: |
|
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
902 hi = self.repo.changelog.rev(self.repo.lookup(hi)) |
| 1219 | 903 except hg.RepoError: |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
904 req.write(self.search(hi)) |
| 538 | 905 return |
| 575 | 906 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
907 req.write(self.changelog(hi)) |
| 515 | 908 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
909 elif req.form['cmd'][0] == 'changeset': |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
910 req.write(self.changeset(req.form['node'][0])) |
| 138 | 911 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
912 elif req.form['cmd'][0] == 'manifest': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
913 req.write(self.manifest(req.form['manifest'][0], |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
914 clean(req.form['path'][0]))) |
| 138 | 915 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
916 elif req.form['cmd'][0] == 'tags': |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
917 req.write(self.tags()) |
| 168 | 918 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
919 elif req.form['cmd'][0] == 'summary': |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
920 req.write(self.summary()) |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
921 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
922 elif req.form['cmd'][0] == 'filediff': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
923 req.write(self.filediff(clean(req.form['file'][0]), |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
924 req.form['node'][0])) |
| 131 | 925 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
926 elif req.form['cmd'][0] == 'file': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
927 req.write(self.filerevision(clean(req.form['file'][0]), |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
928 req.form['filenode'][0])) |
| 131 | 929 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
930 elif req.form['cmd'][0] == 'annotate': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
931 req.write(self.fileannotate(clean(req.form['file'][0]), |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
932 req.form['filenode'][0])) |
| 131 | 933 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
934 elif req.form['cmd'][0] == 'filelog': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
935 req.write(self.filelog(clean(req.form['file'][0]), |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
936 req.form['filenode'][0])) |
| 136 | 937 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
938 elif req.form['cmd'][0] == 'heads': |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
939 req.httphdr("application/mercurial-0.1") |
| 222 | 940 h = self.repo.heads() |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
941 req.write(" ".join(map(hex, h)) + "\n") |
| 222 | 942 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
943 elif req.form['cmd'][0] == 'branches': |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
944 req.httphdr("application/mercurial-0.1") |
| 132 | 945 nodes = [] |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
946 if req.form.has_key('nodes'): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
947 nodes = map(bin, req.form['nodes'][0].split(" ")) |
| 138 | 948 for b in self.repo.branches(nodes): |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
949 req.write(" ".join(map(hex, b)) + "\n") |
| 131 | 950 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
951 elif req.form['cmd'][0] == 'between': |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
952 req.httphdr("application/mercurial-0.1") |
| 132 | 953 nodes = [] |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
954 if req.form.has_key('pairs'): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
955 pairs = [map(bin, p.split("-")) |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
956 for p in req.form['pairs'][0].split(" ")] |
| 138 | 957 for b in self.repo.between(pairs): |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
958 req.write(" ".join(map(hex, b)) + "\n") |
| 132 | 959 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
960 elif req.form['cmd'][0] == 'changegroup': |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
961 req.httphdr("application/mercurial-0.1") |
| 132 | 962 nodes = [] |
|
964
3f37720e7dc7
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com
parents:
957
diff
changeset
|
963 if not self.allowpull: |
| 197 | 964 return |
| 965 | |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
966 if req.form.has_key('roots'): |
|
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
967 nodes = map(bin, req.form['roots'][0].split(" ")) |
| 131 | 968 |
| 132 | 969 z = zlib.compressobj() |
|
1736
50de0887bbcd
add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1703
diff
changeset
|
970 f = self.repo.changegroup(nodes, 'serve') |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
620
diff
changeset
|
971 while 1: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
620
diff
changeset
|
972 chunk = f.read(4096) |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
973 if not chunk: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
974 break |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
975 req.write(z.compress(chunk)) |
| 132 | 976 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
977 req.write(z.flush()) |
| 131 | 978 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
979 elif req.form['cmd'][0] == 'archive': |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
980 changeset = self.repo.lookup(req.form['node'][0]) |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
981 type = req.form['type'][0] |
| 1078 | 982 if (type in self.archives and |
| 983 self.repo.ui.configbool("web", "allow" + type, False)): | |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
984 self.archive(req, changeset, type) |
| 1078 | 985 return |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
986 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
987 req.write(self.t("error")) |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
988 |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
989 elif req.form['cmd'][0] == 'static': |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
990 fname = req.form['file'][0] |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
991 |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
992 fname = os.path.realpath(os.path.join(static, fname)) |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
993 |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
994 try: |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
995 # the static dir should be a substring in the real |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
996 # file path, if it is not, we have something strange |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
997 # going on => security breach attempt? |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
998 # |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
999 # This will either: |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1000 # 1) find the `static' path at index 0 = success |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1001 # 2) find the `static' path at other index = error |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1002 # 3) not find the `static' path = ValueError generated |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1003 if fname.index(static) != 0: |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1004 # generate ValueError manually |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1005 raise ValueError() |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1006 |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1007 os.stat(fname) |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1008 |
|
1792
a161c61ba8ed
Cleanup of tabs and coding when sending content type.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1780
diff
changeset
|
1009 ct = mimetypes.guess_type(fname)[0] or "text/plain" |
|
a161c61ba8ed
Cleanup of tabs and coding when sending content type.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1780
diff
changeset
|
1010 req.write("Content-type: %s\n\n" % ct, file(fname).read()) |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1011 except ValueError: |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1012 # security breach attempt |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1013 req.write(self.t("error")) |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1014 except OSError, e: |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1015 if e.errno == errno.ENOENT: |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1016 req.write(self.t("error")) |
|
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
1017 |
| 132 | 1018 else: |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
1019 req.write(self.t("error")) |
| 131 | 1020 |
| 987 | 1021 def create_server(repo): |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1022 |
| 938 | 1023 def openlog(opt, default): |
| 1024 if opt and opt != '-': | |
| 1025 return open(opt, 'w') | |
| 1026 return default | |
| 1027 | |
| 987 | 1028 address = repo.ui.config("web", "address", "") |
| 1029 port = int(repo.ui.config("web", "port", 8000)) | |
| 1030 use_ipv6 = repo.ui.configbool("web", "ipv6") | |
| 1031 accesslog = openlog(repo.ui.config("web", "accesslog", "-"), sys.stdout) | |
| 1032 errorlog = openlog(repo.ui.config("web", "errorlog", "-"), sys.stderr) | |
| 938 | 1033 |
|
825
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
1034 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
|
1035 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
|
1036 |
|
16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
Bryan O'Sullivan <bos@serpentine.com>
parents:
858
diff
changeset
|
1037 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
|
1038 if self.address_family is None: |
|
1402
9d2c2e6b32b5
i18n part2: use '_' for all strings who are part of the user interface
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1400
diff
changeset
|
1039 raise hg.RepoError(_('IPv6 not available on this system')) |
|
881
16ce690c411d
Fix problem with "hg serve" on systems not providing IPv6.
Bryan O'Sullivan <bos@serpentine.com>
parents:
858
diff
changeset
|
1040 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
|
1041 |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1042 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
|
1043 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
|
1044 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
|
1045 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
|
1046 format % args)) |
| 937 | 1047 |
|
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
1048 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
|
1049 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
|
1050 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
|
1051 format % args)) |
|
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
603
diff
changeset
|
1052 |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1053 def do_POST(self): |
| 271 | 1054 try: |
| 1055 self.do_hgweb() | |
| 1056 except socket.error, inst: | |
|
1174
9d9f4973c76a
Added missing 'import errno', and use errno for EPIPE, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1172
diff
changeset
|
1057 if inst[0] != errno.EPIPE: |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
1058 raise |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1059 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1060 def do_GET(self): |
| 271 | 1061 self.do_POST() |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1062 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1063 def do_hgweb(self): |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1064 query = "" |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1065 p = self.path.find("?") |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1066 if p: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1067 query = self.path[p + 1:] |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1068 query = query.replace('+', ' ') |
| 515 | 1069 |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1070 env = {} |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1071 env['GATEWAY_INTERFACE'] = 'CGI/1.1' |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1072 env['REQUEST_METHOD'] = self.command |
| 599 | 1073 env['SERVER_NAME'] = self.server.server_name |
| 1074 env['SERVER_PORT'] = str(self.server.server_port) | |
| 1075 env['REQUEST_URI'] = "/" | |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1076 if query: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1077 env['QUERY_STRING'] = query |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1078 host = self.address_string() |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1079 if host != self.client_address[0]: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1080 env['REMOTE_HOST'] = host |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1081 env['REMOTE_ADDR'] = self.client_address[0] |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1082 |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1083 if self.headers.typeheader is None: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1084 env['CONTENT_TYPE'] = self.headers.type |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1085 else: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1086 env['CONTENT_TYPE'] = self.headers.typeheader |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1087 length = self.headers.getheader('content-length') |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1088 if length: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1089 env['CONTENT_LENGTH'] = length |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1090 accept = [] |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1091 for line in self.headers.getallmatchingheaders('accept'): |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1092 if line[:1] in "\t\n\r ": |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1093 accept.append(line.strip()) |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1094 else: |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1095 accept = accept + line[7:].split(',') |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1096 env['HTTP_ACCEPT'] = ','.join(accept) |
|
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1097 |
|
1180
fe3eb1628c40
Saving sys.argv and sys.stderr is not needed anymore
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1163
diff
changeset
|
1098 req = hgrequest(self.rfile, self.wfile, env) |
|
fe3eb1628c40
Saving sys.argv and sys.stderr is not needed anymore
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1163
diff
changeset
|
1099 self.send_response(200, "Script output follows") |
|
fe3eb1628c40
Saving sys.argv and sys.stderr is not needed anymore
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1163
diff
changeset
|
1100 hg.run(req) |
|
158
be7103467d2e
Add 'hg serve' command for stand-alone server
mpm@selenic.com
parents:
157
diff
changeset
|
1101 |
| 987 | 1102 hg = hgweb(repo) |
|
825
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
1103 if use_ipv6: |
|
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
1104 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
|
1105 else: |
|
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
753
diff
changeset
|
1106 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
|
1107 |
| 941 | 1108 # This is a stopgap |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1554
diff
changeset
|
1109 class hgwebdir(object): |
| 941 | 1110 def __init__(self, config): |
|
1181
4f5001f5b4c3
Make sure the repository names don't have slashes at the at or else in some
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1180
diff
changeset
|
1111 def cleannames(items): |
|
4f5001f5b4c3
Make sure the repository names don't have slashes at the at or else in some
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1180
diff
changeset
|
1112 return [(name.strip('/'), path) for name, path in items] |
|
4f5001f5b4c3
Make sure the repository names don't have slashes at the at or else in some
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1180
diff
changeset
|
1113 |
|
1143
4fffb3d84b7c
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1142
diff
changeset
|
1114 if type(config) == type([]): |
|
1181
4f5001f5b4c3
Make sure the repository names don't have slashes at the at or else in some
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1180
diff
changeset
|
1115 self.repos = cleannames(config) |
|
1143
4fffb3d84b7c
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1142
diff
changeset
|
1116 elif type(config) == type({}): |
|
1181
4f5001f5b4c3
Make sure the repository names don't have slashes at the at or else in some
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1180
diff
changeset
|
1117 self.repos = cleannames(config.items()) |
|
1143
4fffb3d84b7c
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1142
diff
changeset
|
1118 self.repos.sort() |
|
4fffb3d84b7c
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1142
diff
changeset
|
1119 else: |
|
4fffb3d84b7c
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1142
diff
changeset
|
1120 cp = ConfigParser.SafeConfigParser() |
|
4fffb3d84b7c
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1142
diff
changeset
|
1121 cp.read(config) |
|
1181
4f5001f5b4c3
Make sure the repository names don't have slashes at the at or else in some
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1180
diff
changeset
|
1122 self.repos = cleannames(cp.items("paths")) |
|
1143
4fffb3d84b7c
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1142
diff
changeset
|
1123 self.repos.sort() |
| 941 | 1124 |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
1125 def run(self, req=hgrequest()): |
| 941 | 1126 def header(**map): |
| 1127 yield tmpl("header", **map) | |
| 1128 | |
| 1129 def footer(**map): | |
| 1130 yield tmpl("footer", **map) | |
| 1131 | |
|
1142
74d184a40a2e
Cleaned up hgweb.hgwebdir.run()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1141
diff
changeset
|
1132 m = os.path.join(templatepath(), "map") |
| 941 | 1133 tmpl = templater(m, common_filters, |
| 1134 {"header": header, "footer": footer}) | |
| 1135 | |
| 1136 def entries(**map): | |
| 1137 parity = 0 | |
|
1141
033c968d7c66
Use ConfigParser only in hgwebdir.__init__()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1140
diff
changeset
|
1138 for name, path in self.repos: |
| 1213 | 1139 u = ui.ui() |
|
1170
85555540a4e2
Make .hg/hgrc optional for repositories published by hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1165
diff
changeset
|
1140 try: |
|
1473
7d66ce9895fa
make readconfig take a filename instead of a file pointer as argument
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1445
diff
changeset
|
1141 u.readconfig(os.path.join(path, '.hg', 'hgrc')) |
|
1170
85555540a4e2
Make .hg/hgrc optional for repositories published by hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1165
diff
changeset
|
1142 except IOError: |
|
85555540a4e2
Make .hg/hgrc optional for repositories published by hgwebdir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1165
diff
changeset
|
1143 pass |
|
1140
04d52b446e5e
Don't create repo objects in hgwebdir, ui object is enough.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1139
diff
changeset
|
1144 get = u.config |
| 941 | 1145 |
|
1181
4f5001f5b4c3
Make sure the repository names don't have slashes at the at or else in some
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1180
diff
changeset
|
1146 url = ('/'.join([req.env["REQUEST_URI"].split('?')[0], name]) |
|
1142
74d184a40a2e
Cleaned up hgweb.hgwebdir.run()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1141
diff
changeset
|
1147 .replace("//", "/")) |
| 1022 | 1148 |
| 1348 | 1149 # update time with local timezone |
|
1524
0d47bb884330
hgweb: fix traceback by skipping invalid repo paths
TK Soh <teekaysoh@yahoo.com>
parents:
1511
diff
changeset
|
1150 try: |
|
0d47bb884330
hgweb: fix traceback by skipping invalid repo paths
TK Soh <teekaysoh@yahoo.com>
parents:
1511
diff
changeset
|
1151 d = (get_mtime(path), util.makedate()[1]) |
|
0d47bb884330
hgweb: fix traceback by skipping invalid repo paths
TK Soh <teekaysoh@yahoo.com>
parents:
1511
diff
changeset
|
1152 except OSError: |
|
0d47bb884330
hgweb: fix traceback by skipping invalid repo paths
TK Soh <teekaysoh@yahoo.com>
parents:
1511
diff
changeset
|
1153 continue |
| 1348 | 1154 |
|
1260
4603eef60237
hgweb: use ui:username rather than web:contact
mpm@selenic.com
parents:
1219
diff
changeset
|
1155 yield dict(contact=(get("ui", "username") or # preferred |
|
4603eef60237
hgweb: use ui:username rather than web:contact
mpm@selenic.com
parents:
1219
diff
changeset
|
1156 get("web", "contact") or # deprecated |
|
4603eef60237
hgweb: use ui:username rather than web:contact
mpm@selenic.com
parents:
1219
diff
changeset
|
1157 get("web", "author", "unknown")), # also |
|
1130
1ad52c7679e1
Longer variable names in hgwebdir: l->repos, v->name, r->path
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1129
diff
changeset
|
1158 name=get("web", "name", name), |
| 1062 | 1159 url=url, |
| 1160 parity=parity, | |
| 1161 shortdesc=get("web", "description", "unknown"), | |
| 1348 | 1162 lastupdate=d) |
| 941 | 1163 |
| 1164 parity = 1 - parity | |
| 1165 | |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
1166 virtual = req.env.get("PATH_INFO", "").strip('/') |
|
1142
74d184a40a2e
Cleaned up hgweb.hgwebdir.run()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1141
diff
changeset
|
1167 if virtual: |
|
1141
033c968d7c66
Use ConfigParser only in hgwebdir.__init__()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1140
diff
changeset
|
1168 real = dict(self.repos).get(virtual) |
|
033c968d7c66
Use ConfigParser only in hgwebdir.__init__()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1140
diff
changeset
|
1169 if real: |
|
1554
68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1545
diff
changeset
|
1170 try: |
|
68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1545
diff
changeset
|
1171 hgweb(real).run(req) |
|
68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1545
diff
changeset
|
1172 except IOError, inst: |
|
68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1545
diff
changeset
|
1173 req.write(tmpl("error", error=inst.strerror)) |
|
68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1545
diff
changeset
|
1174 except hg.RepoError, inst: |
|
68ec7b9e09a4
Catch IOErrors and RepoErrors when serving repositories via hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1545
diff
changeset
|
1175 req.write(tmpl("error", error=str(inst))) |
|
1123
457c23af92bd
Use a template for the error message.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
1122
diff
changeset
|
1176 else: |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
1177 req.write(tmpl("notfound", repo=virtual)) |
|
1142
74d184a40a2e
Cleaned up hgweb.hgwebdir.run()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1141
diff
changeset
|
1178 else: |
|
1159
b6f5a947e62e
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object.
Vincent Wagelaar <vincent@ricardis.tudelft.nl>
parents:
1143
diff
changeset
|
1179 req.write(tmpl("index", entries=entries)) |