Mercurial > hg > pyhgsh
annotate mercurial/hgweb/hgweb_mod.py @ 2359:a392eaa81f29
Allow comma to separate types in allow_archive, too. Use longer variable name.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 01 Jun 2006 17:51:40 +0200 |
| parents | 8819fc1dcf4b |
| children | d3adb454c5a9 |
| 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 | |
|
2356
2db831b33e8f
Final stage of the hgweb split up.
Eric Hopper <hopper@omnifarious.org>
parents:
2355
diff
changeset
|
9 import os |
|
2db831b33e8f
Final stage of the hgweb split up.
Eric Hopper <hopper@omnifarious.org>
parents:
2355
diff
changeset
|
10 import os.path |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
11 import mimetypes |
|
2311
b832b6eb65ab
Moving hgweb.py into it's own module in preparation for breaking it up.
Eric Hopper <hopper@omnifarious.org>
parents:
2275
diff
changeset
|
12 from mercurial.demandload import demandload |
|
2356
2db831b33e8f
Final stage of the hgweb split up.
Eric Hopper <hopper@omnifarious.org>
parents:
2355
diff
changeset
|
13 demandload(globals(), "re zlib ConfigParser") |
|
2311
b832b6eb65ab
Moving hgweb.py into it's own module in preparation for breaking it up.
Eric Hopper <hopper@omnifarious.org>
parents:
2275
diff
changeset
|
14 demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,templater") |
|
2355
eb08fb4d41e1
Splitting up hgweb so it's easier to change.
Eric Hopper <hopper@omnifarious.org>
parents:
2328
diff
changeset
|
15 demandload(globals(), "mercurial.hgweb.request:hgrequest") |
|
2356
2db831b33e8f
Final stage of the hgweb split up.
Eric Hopper <hopper@omnifarious.org>
parents:
2355
diff
changeset
|
16 demandload(globals(), "mercurial.hgweb.common:get_mtime,staticfile") |
|
2311
b832b6eb65ab
Moving hgweb.py into it's own module in preparation for breaking it up.
Eric Hopper <hopper@omnifarious.org>
parents:
2275
diff
changeset
|
17 from mercurial.node import * |
|
b832b6eb65ab
Moving hgweb.py into it's own module in preparation for breaking it up.
Eric Hopper <hopper@omnifarious.org>
parents:
2275
diff
changeset
|
18 from mercurial.i18n import gettext as _ |
| 138 | 19 |
|
2356
2db831b33e8f
Final stage of the hgweb split up.
Eric Hopper <hopper@omnifarious.org>
parents:
2355
diff
changeset
|
20 def _up(p): |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
21 if p[0] != "/": |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
22 p = "/" + p |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
23 if p[-1] == "/": |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
24 p = p[:-1] |
| 138 | 25 up = os.path.dirname(p) |
| 26 if up == "/": | |
| 27 return "/" | |
| 28 return up + "/" | |
| 131 | 29 |
|
1559
59b3639df0a9
Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents:
1554
diff
changeset
|
30 class hgweb(object): |
| 987 | 31 def __init__(self, repo, name=None): |
| 32 if type(repo) == type(""): | |
| 1213 | 33 self.repo = hg.repository(ui.ui(), repo) |
| 987 | 34 else: |
| 35 self.repo = repo | |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
36 |
| 258 | 37 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
|
38 self.reponame = name |
| 1078 | 39 self.archives = 'zip', 'gz', 'bz2' |
| 131 | 40 |
| 258 | 41 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
|
42 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
|
43 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
|
44 self.mtime = mtime |
| 1213 | 45 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
|
46 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
|
47 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
|
48 self.allowpull = self.repo.ui.configbool("web", "allowpull", True) |
| 258 | 49 |
|
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
50 def archivelist(self, nodeid): |
|
2359
a392eaa81f29
Allow comma to separate types in allow_archive, too. Use longer variable name.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2358
diff
changeset
|
51 allowed = (self.repo.ui.config("web", "allow_archive", "") |
|
a392eaa81f29
Allow comma to separate types in allow_archive, too. Use longer variable name.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2358
diff
changeset
|
52 .replace(",", " ").split()) |
|
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
53 for i in self.archives: |
|
2359
a392eaa81f29
Allow comma to separate types in allow_archive, too. Use longer variable name.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2358
diff
changeset
|
54 if i in allowed or self.repo.ui.configbool("web", "allow" + i): |
|
2171
290534ee163c
Add download links to hgwebdir index page for allowed archive types.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2170
diff
changeset
|
55 yield {"type" : i, "node" : nodeid, "url": ""} |
|
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
56 |
| 138 | 57 def listfiles(self, files, mf): |
| 58 for f in files[:self.maxfiles]: | |
| 1062 | 59 yield self.t("filenodelink", node=hex(mf[f]), file=f) |
| 138 | 60 if len(files) > self.maxfiles: |
| 61 yield self.t("fileellipses") | |
| 62 | |
| 63 def listfilediffs(self, files, changeset): | |
| 64 for f in files[:self.maxfiles]: | |
| 1062 | 65 yield self.t("filedifflink", node=hex(changeset), file=f) |
| 138 | 66 if len(files) > self.maxfiles: |
| 67 yield self.t("fileellipses") | |
| 68 | |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
69 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
|
70 if not rev: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
71 rev = lambda x: "" |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
72 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
|
73 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
|
74 return |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
75 for s in siblings: |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
76 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
|
77 |
|
1653
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
78 def renamelink(self, fl, node): |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
79 r = fl.renamed(node) |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
80 if r: |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
81 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
|
82 return [] |
|
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
83 |
| 568 | 84 def showtag(self, t1, node=nullid, **args): |
| 85 for t in self.repo.nodetags(node): | |
| 1062 | 86 yield self.t(t1, tag=t, **args) |
| 568 | 87 |
| 138 | 88 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
|
89 def filterfiles(filters, files): |
|
1627
11cd38286fdb
fix for hgweb.filterfiles
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1626
diff
changeset
|
90 l = [x for x in files if x in filters] |
| 515 | 91 |
|
1626
f2b1df3dbcbb
make the order of the arguments for filterfiles consistent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1619
diff
changeset
|
92 for t in filters: |
|
1627
11cd38286fdb
fix for hgweb.filterfiles
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1626
diff
changeset
|
93 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
|
94 t += os.sep |
|
f2b1df3dbcbb
make the order of the arguments for filterfiles consistent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1619
diff
changeset
|
95 l += [x for x in files if x.startswith(t)] |
| 138 | 96 return l |
| 131 | 97 |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
98 parity = [0] |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
99 def diffblock(diff, f, fn): |
|
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
100 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
|
101 lines=prettyprintlines(diff), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
102 parity=parity[0], |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
103 file=f, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
104 filenode=hex(fn or nullid)) |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
105 parity[0] = 1 - parity[0] |
| 515 | 106 |
|
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
107 def prettyprintlines(diff): |
| 138 | 108 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
|
109 if l.startswith('+'): |
| 1062 | 110 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
|
111 elif l.startswith('-'): |
| 1062 | 112 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
|
113 elif l.startswith('@'): |
| 1062 | 114 yield self.t("difflineat", line=l) |
| 138 | 115 else: |
| 1062 | 116 yield self.t("diffline", line=l) |
| 131 | 117 |
| 138 | 118 r = self.repo |
| 119 cl = r.changelog | |
| 120 mf = r.manifest | |
| 121 change1 = cl.read(node1) | |
| 122 change2 = cl.read(node2) | |
| 123 mmap1 = mf.read(change1[0]) | |
| 124 mmap2 = mf.read(change2[0]) | |
|
1333
901c645c1943
hgweb: fix date bug in hgweb diff generation
mpm@selenic.com
parents:
1324
diff
changeset
|
125 date1 = util.datestr(change1[2]) |
|
901c645c1943
hgweb: fix date bug in hgweb diff generation
mpm@selenic.com
parents:
1324
diff
changeset
|
126 date2 = util.datestr(change2[2]) |
| 131 | 127 |
|
1619
1ba0d7041ac4
Distinguish removed and deleted files. Tests are not fixed yet.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1618
diff
changeset
|
128 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
|
129 if files: |
|
1626
f2b1df3dbcbb
make the order of the arguments for filterfiles consistent
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1619
diff
changeset
|
130 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
|
131 (modified, added, removed)) |
| 131 | 132 |
| 1637 | 133 diffopts = self.repo.ui.diffopts() |
| 134 showfunc = diffopts['showfunc'] | |
| 135 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
|
136 for f in modified: |
| 138 | 137 to = r.file(f).read(mmap1[f]) |
| 138 tn = r.file(f).read(mmap2[f]) | |
| 1637 | 139 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, |
| 140 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
|
141 for f in added: |
|
265
7ca05593bd30
hgweb: fix non-existent source or destination for diff
mpm@selenic.com
parents:
258
diff
changeset
|
142 to = None |
| 138 | 143 tn = r.file(f).read(mmap2[f]) |
| 1637 | 144 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, |
| 145 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
|
146 for f in removed: |
| 138 | 147 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
|
148 tn = None |
| 1637 | 149 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, |
| 150 showfunc=showfunc, ignorews=ignorews), f, tn) | |
| 131 | 151 |
| 180 | 152 def changelog(self, pos): |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
153 def changenav(**map): |
|
1703
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
154 def seq(factor, maxchanges=None): |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
155 if maxchanges: |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
156 yield maxchanges |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
157 if maxchanges >= 20 and maxchanges <= 40: |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
158 yield 50 |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
159 else: |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
160 yield 1 * factor |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
161 yield 3 * factor |
| 138 | 162 for f in seq(factor * 10): |
| 163 yield f | |
| 131 | 164 |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
165 l = [] |
|
1703
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
166 last = 0 |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
167 for f in seq(1, self.maxchanges): |
|
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
168 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
|
169 continue |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
170 if f > count: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
171 break |
|
1703
41d884f741ca
fix changenav for maxchanges != 10
Johannes Stezenbach <js@linuxtv.org>
parents:
1653
diff
changeset
|
172 last = f |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
173 r = "%d" % f |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
174 if pos + f < count: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
175 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
|
176 if pos - f >= 0: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
177 l.insert(0, ("-" + r, pos - f)) |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
178 |
|
975
bdd7c53fca00
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
974
diff
changeset
|
179 yield {"rev": 0, "label": "(0)"} |
| 515 | 180 |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
181 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
|
182 yield {"label": label, "rev": rev} |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
183 |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
184 yield {"label": "tip", "rev": "tip"} |
| 131 | 185 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
186 def changelist(**map): |
| 142 | 187 parity = (start - end) & 1 |
| 138 | 188 cl = self.repo.changelog |
| 189 l = [] # build a list in forward order for efficiency | |
| 351 | 190 for i in range(start, end): |
| 138 | 191 n = cl.node(i) |
| 192 changes = cl.read(n) | |
| 193 hn = hex(n) | |
| 131 | 194 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
195 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
|
196 "author": changes[1], |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
197 "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
|
198 cl.rev(n) - 1), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
199 "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
|
200 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
|
201 "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
|
202 "manifest": hex(changes[0]), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
203 "desc": changes[4], |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
204 "date": changes[2], |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
205 "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
|
206 "rev": i, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
207 "node": hn}) |
| 142 | 208 parity = 1 - parity |
| 138 | 209 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
210 for e in l: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
211 yield e |
| 131 | 212 |
| 168 | 213 cl = self.repo.changelog |
| 214 mf = cl.read(cl.tip())[0] | |
| 215 count = cl.count() | |
| 351 | 216 start = max(0, pos - self.maxchanges + 1) |
| 217 end = min(count, start + self.maxchanges) | |
| 218 pos = end - 1 | |
| 138 | 219 |
| 142 | 220 yield self.t('changelog', |
| 1062 | 221 changenav=changenav, |
| 222 manifest=hex(mf), | |
|
2170
29eeb2717915
Add archive download links to tip on main changeset list page
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
2148
diff
changeset
|
223 rev=pos, changesets=count, entries=changelist, |
|
29eeb2717915
Add archive download links to tip on main changeset list page
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
2148
diff
changeset
|
224 archives=self.archivelist("tip")) |
| 131 | 225 |
| 538 | 226 def search(self, query): |
| 227 | |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
228 def changelist(**map): |
| 538 | 229 cl = self.repo.changelog |
| 230 count = 0 | |
| 231 qw = query.lower().split() | |
| 232 | |
| 233 def revgen(): | |
| 234 for i in range(cl.count() - 1, 0, -100): | |
| 235 l = [] | |
| 236 for j in range(max(0, i - 100), i): | |
| 237 n = cl.node(j) | |
| 238 changes = cl.read(n) | |
| 1023 | 239 l.append((n, j, changes)) |
| 240 l.reverse() | |
| 538 | 241 for e in l: |
| 242 yield e | |
| 243 | |
| 244 for n, i, changes in revgen(): | |
| 245 miss = 0 | |
| 246 for q in qw: | |
| 247 if not (q in changes[1].lower() or | |
| 248 q in changes[4].lower() or | |
| 249 q in " ".join(changes[3][:20]).lower()): | |
| 250 miss = 1 | |
| 251 break | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
252 if miss: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
253 continue |
| 538 | 254 |
| 255 count += 1 | |
| 256 hn = hex(n) | |
| 257 | |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
258 yield self.t('searchentry', |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
259 parity=count & 1, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
260 author=changes[1], |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
261 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
|
262 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
|
263 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
|
264 manifest=hex(changes[0]), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
265 desc=changes[4], |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
266 date=changes[2], |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
267 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
|
268 rev=i, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
269 node=hn) |
| 538 | 270 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
271 if count >= self.maxchanges: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
272 break |
| 538 | 273 |
| 274 cl = self.repo.changelog | |
| 275 mf = cl.read(cl.tip())[0] | |
| 276 | |
| 277 yield self.t('search', | |
| 1062 | 278 query=query, |
| 279 manifest=hex(mf), | |
| 280 entries=changelist) | |
| 538 | 281 |
| 138 | 282 def changeset(self, nodeid): |
| 283 cl = self.repo.changelog | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
284 n = self.repo.lookup(nodeid) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
285 nodeid = hex(n) |
| 138 | 286 changes = cl.read(n) |
|
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
582
diff
changeset
|
287 p1 = cl.parents(n)[0] |
| 515 | 288 |
|
133
fb84d3e71042
added template support for some hgweb output, also, template files for
jake@edge2.net
parents:
132
diff
changeset
|
289 files = [] |
| 138 | 290 mf = self.repo.manifest.read(changes[0]) |
| 131 | 291 for f in changes[3]: |
| 138 | 292 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
|
293 filenode=hex(mf.get(f, nullid)), file=f)) |
| 138 | 294 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
295 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
|
296 yield self.diff(p1, n, None) |
| 131 | 297 |
| 138 | 298 yield self.t('changeset', |
| 1062 | 299 diff=diff, |
| 300 rev=cl.rev(n), | |
| 301 node=nodeid, | |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
302 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
|
303 child=self.siblings(cl.children(n), cl.rev), |
| 1062 | 304 changesettag=self.showtag("changesettag",n), |
| 305 manifest=hex(changes[0]), | |
| 306 author=changes[1], | |
| 307 desc=changes[4], | |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
308 date=changes[2], |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
309 files=files, |
|
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
310 archives=self.archivelist(nodeid)) |
| 131 | 311 |
| 138 | 312 def filelog(self, f, filenode): |
| 313 cl = self.repo.changelog | |
| 314 fl = self.repo.file(f) | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
315 filenode = hex(fl.lookup(filenode)) |
| 138 | 316 count = fl.count() |
| 317 | |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
318 def entries(**map): |
| 138 | 319 l = [] |
| 142 | 320 parity = (count - 1) & 1 |
| 515 | 321 |
| 138 | 322 for i in range(count): |
| 323 n = fl.node(i) | |
| 324 lr = fl.linkrev(n) | |
| 325 cn = cl.node(lr) | |
| 326 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
|
327 |
|
978
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
328 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
|
329 "filenode": hex(n), |
|
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
330 "filerev": i, |
|
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
331 "file": f, |
|
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
332 "node": hex(cn), |
|
ea67e5b37043
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
977
diff
changeset
|
333 "author": cs[1], |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
334 "date": cs[2], |
|
1653
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
335 "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
|
336 "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
|
337 fl.rev, file=f), |
|
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
338 "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
|
339 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
|
340 "desc": cs[4]}) |
| 142 | 341 parity = 1 - parity |
| 138 | 342 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
343 for e in l: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
344 yield e |
| 138 | 345 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
346 yield self.t("filelog", file=f, filenode=filenode, entries=entries) |
| 131 | 347 |
| 138 | 348 def filerevision(self, f, node): |
| 349 fl = self.repo.file(f) | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
350 n = fl.lookup(node) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
351 node = hex(n) |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
352 text = fl.read(n) |
| 138 | 353 changerev = fl.linkrev(n) |
| 354 cl = self.repo.changelog | |
| 355 cn = cl.node(changerev) | |
| 356 cs = cl.read(cn) | |
| 357 mfn = cs[0] | |
| 142 | 358 |
|
1411
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
359 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
|
360 rawtext = text |
|
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
361 if util.binary(text): |
|
2103
caccf539c9a4
Use application/octet-stream as the content-type of unknown binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2095
diff
changeset
|
362 mt = mt or 'application/octet-stream' |
|
caccf539c9a4
Use application/octet-stream as the content-type of unknown binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2095
diff
changeset
|
363 text = "(binary:%s)" % mt |
|
2095
0bf2a9e5eff1
Don't send "Content-Type: none"
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
1964
diff
changeset
|
364 mt = mt or 'text/plain' |
|
1411
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
365 |
| 142 | 366 def lines(): |
| 367 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
|
368 yield {"line": t, |
|
5d5ab159d197
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
975
diff
changeset
|
369 "linenumber": "% 6d" % (l + 1), |
|
5d5ab159d197
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
975
diff
changeset
|
370 "parity": l & 1} |
| 359 | 371 |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
372 yield self.t("filerevision", |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
373 file=f, |
| 1062 | 374 filenode=node, |
|
2356
2db831b33e8f
Final stage of the hgweb split up.
Eric Hopper <hopper@omnifarious.org>
parents:
2355
diff
changeset
|
375 path=_up(f), |
| 1062 | 376 text=lines(), |
|
1411
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
377 raw=rawtext, |
|
e2ba788545bf
hgweb: make viewing of non-text work in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1409
diff
changeset
|
378 mimetype=mt, |
| 1062 | 379 rev=changerev, |
| 380 node=hex(cn), | |
| 381 manifest=hex(mfn), | |
| 382 author=cs[1], | |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
383 date=cs[2], |
|
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1579
diff
changeset
|
384 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
|
385 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
|
386 rename=self.renamelink(fl, n), |
| 1062 | 387 permissions=self.repo.manifest.readflags(mfn)[f]) |
| 138 | 388 |
| 389 def fileannotate(self, f, node): | |
| 390 bcache = {} | |
| 391 ncache = {} | |
| 392 fl = self.repo.file(f) | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
393 n = fl.lookup(node) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
394 node = hex(n) |
| 138 | 395 changerev = fl.linkrev(n) |
| 396 | |
| 397 cl = self.repo.changelog | |
| 398 cn = cl.node(changerev) | |
| 399 cs = cl.read(cn) | |
| 400 mfn = cs[0] | |
| 131 | 401 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
402 def annotate(**map): |
| 142 | 403 parity = 1 |
| 404 last = None | |
| 138 | 405 for r, l in fl.annotate(n): |
| 406 try: | |
| 407 cnode = ncache[r] | |
| 408 except KeyError: | |
| 409 cnode = ncache[r] = self.repo.changelog.node(r) | |
| 515 | 410 |
| 138 | 411 try: |
| 412 name = bcache[r] | |
| 413 except KeyError: | |
| 414 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
|
415 bcache[r] = name = self.repo.ui.shortuser(cl[1]) |
| 131 | 416 |
| 142 | 417 if last != cnode: |
| 418 parity = 1 - parity | |
| 419 last = cnode | |
| 420 | |
|
977
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
421 yield {"parity": parity, |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
422 "node": hex(cnode), |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
423 "rev": r, |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
424 "author": name, |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
425 "file": f, |
|
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
976
diff
changeset
|
426 "line": l} |
| 138 | 427 |
| 428 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
|
429 file=f, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
430 filenode=node, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
431 annotate=annotate, |
|
2356
2db831b33e8f
Final stage of the hgweb split up.
Eric Hopper <hopper@omnifarious.org>
parents:
2355
diff
changeset
|
432 path=_up(f), |
|
1063
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
433 rev=changerev, |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
434 node=hex(cn), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
435 manifest=hex(mfn), |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
436 author=cs[1], |
|
1324
77cd8068dbf4
hgweb: pass date tuples around rather than whole changesets for dates
mpm@selenic.com
parents:
1321
diff
changeset
|
437 date=cs[2], |
|
1653
e8a3df8b62b3
hgweb: show copy/rename links in file history
Matt Mackall <mpm@selenic.com>
parents:
1650
diff
changeset
|
438 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
|
439 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
|
440 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
|
441 permissions=self.repo.manifest.readflags(mfn)[f]) |
| 136 | 442 |
| 138 | 443 def manifest(self, mnode, path): |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
444 man = self.repo.manifest |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
445 mn = man.lookup(mnode) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
446 mnode = hex(mn) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
447 mf = man.read(mn) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
448 rev = man.rev(mn) |
|
2328
f789602ba840
hgweb.manifest: revno of manifest and changelog aren't always the same
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2311
diff
changeset
|
449 changerev = man.linkrev(mn) |
|
f789602ba840
hgweb.manifest: revno of manifest and changelog aren't always the same
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2311
diff
changeset
|
450 node = self.repo.changelog.node(changerev) |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
451 mff = man.readflags(mn) |
| 138 | 452 |
| 453 files = {} | |
| 515 | 454 |
| 138 | 455 p = path[1:] |
|
1649
beb7da710c8a
hgweb: fix breakage on manifest subdirs from path cleaning
Matt Mackall <mpm@selenic.com>
parents:
1646
diff
changeset
|
456 if p and p[-1] != "/": |
|
beb7da710c8a
hgweb: fix breakage on manifest subdirs from path cleaning
Matt Mackall <mpm@selenic.com>
parents:
1646
diff
changeset
|
457 p += "/" |
| 138 | 458 l = len(p) |
| 131 | 459 |
| 138 | 460 for f,n in mf.items(): |
| 461 if f[:l] != p: | |
| 462 continue | |
| 463 remain = f[l:] | |
| 464 if "/" in remain: | |
| 465 short = remain[:remain.find("/") + 1] # bleah | |
| 142 | 466 files[short] = (f, None) |
| 138 | 467 else: |
| 468 short = os.path.basename(remain) | |
| 469 files[short] = (f, n) | |
| 131 | 470 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
471 def filelist(**map): |
| 142 | 472 parity = 0 |
| 138 | 473 fl = files.keys() |
| 474 fl.sort() | |
| 475 for f in fl: | |
| 476 full, fnode = files[f] | |
|
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
477 if not fnode: |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
478 continue |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
479 |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
480 yield {"file": full, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
481 "manifest": mnode, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
482 "filenode": hex(fnode), |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
483 "parity": parity, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
484 "basename": f, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
485 "permissions": mff[full]} |
| 142 | 486 parity = 1 - parity |
| 138 | 487 |
|
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
488 def dirlist(**map): |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
489 parity = 0 |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
490 fl = files.keys() |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
491 fl.sort() |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
492 for f in fl: |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
493 full, fnode = files[f] |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
494 if fnode: |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
495 continue |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
496 |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
497 yield {"parity": parity, |
|
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
498 "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
|
499 "manifest": mnode, |
| 980 | 500 "basename": f[:-1]} |
|
979
87d40e085e08
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
978
diff
changeset
|
501 parity = 1 - parity |
|
982
8d2e24bae760
hgweb: convert index entries to list expansion style
mpm@selenic.com
parents:
981
diff
changeset
|
502 |
| 138 | 503 yield self.t("manifest", |
| 1062 | 504 manifest=mnode, |
| 505 rev=rev, | |
| 506 node=hex(node), | |
| 507 path=path, | |
|
2356
2db831b33e8f
Final stage of the hgweb split up.
Eric Hopper <hopper@omnifarious.org>
parents:
2355
diff
changeset
|
508 up=_up(path), |
| 1062 | 509 fentries=filelist, |
|
1498
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
510 dentries=dirlist, |
|
78590fb4a82b
hgweb: Added archive download buttons to manifest page.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1473
diff
changeset
|
511 archives=self.archivelist(hex(node))) |
| 131 | 512 |
| 168 | 513 def tags(self): |
| 514 cl = self.repo.changelog | |
| 515 mf = cl.read(cl.tip())[0] | |
| 516 | |
| 343 | 517 i = self.repo.tagslist() |
| 518 i.reverse() | |
| 168 | 519 |
|
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
|
520 def entries(notip=False, **map): |
| 168 | 521 parity = 0 |
| 522 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
|
523 if notip and k == "tip": continue |
|
974
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
524 yield {"parity": parity, |
|
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
525 "tag": k, |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
526 "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
|
527 "date": cl.read(n)[2], |
|
974
aedb47764f29
Added support for #foo%bar# syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
938
diff
changeset
|
528 "node": hex(n)} |
| 168 | 529 parity = 1 - parity |
| 530 | |
| 531 yield self.t("tags", | |
| 1062 | 532 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
|
533 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
|
534 entriesnotip=lambda **x: entries(True, **x)) |
| 168 | 535 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
536 def summary(self): |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
537 cl = self.repo.changelog |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
538 mf = cl.read(cl.tip())[0] |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
539 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
540 i = self.repo.tagslist() |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
541 i.reverse() |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
542 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
543 def tagentries(**map): |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
544 parity = 0 |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
545 count = 0 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
546 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
|
547 if k == "tip": # skip tip |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
548 continue; |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
549 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
550 count += 1 |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
551 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
|
552 break; |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
553 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
554 c = cl.read(n) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
555 m = c[0] |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
556 t = c[2] |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
557 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
558 yield self.t("tagentry", |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
559 parity = parity, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
560 tag = k, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
561 node = hex(n), |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
562 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
|
563 tagmanifest = hex(m)) |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
564 parity = 1 - parity |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
565 |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
566 def changelist(**map): |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
567 parity = 0 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
568 cl = self.repo.changelog |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
569 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
|
570 for i in range(start, end): |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
571 n = cl.node(i) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
572 changes = cl.read(n) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
573 hn = hex(n) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
574 t = changes[2] |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
575 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
576 l.insert(0, self.t( |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
577 'shortlogentry', |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
578 parity = parity, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
579 author = changes[1], |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
580 manifest = hex(changes[0]), |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
581 desc = changes[4], |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
582 date = t, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
583 rev = i, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
584 node = hn)) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
585 parity = 1 - parity |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
586 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
587 yield l |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
588 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
589 cl = self.repo.changelog |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
590 mf = cl.read(cl.tip())[0] |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
591 count = cl.count() |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
592 start = max(0, count - self.maxchanges) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
593 end = min(count, start + self.maxchanges) |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
594 pos = end - 1 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
595 |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
596 yield self.t("summary", |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
597 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
|
598 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
|
599 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
|
600 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
|
601 lastchange = (0, 0), # FIXME |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
602 manifest = hex(mf), |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
603 tags = tagentries, |
|
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
604 shortlog = changelist) |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
605 |
| 138 | 606 def filediff(self, file, changeset): |
| 607 cl = self.repo.changelog | |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
608 n = self.repo.lookup(changeset) |
|
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
609 changeset = hex(n) |
| 138 | 610 p1 = cl.parents(n)[0] |
| 611 cs = cl.read(n) | |
| 612 mf = self.repo.manifest.read(cs[0]) | |
| 515 | 613 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
614 def diff(**map): |
|
2275
714f4d25a7a9
Fix hgweb.filediff
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2174
diff
changeset
|
615 yield self.diff(p1, n, [file]) |
| 131 | 616 |
| 138 | 617 yield self.t("filediff", |
| 1062 | 618 file=file, |
| 619 filenode=hex(mf.get(file, nullid)), | |
| 620 node=changeset, | |
| 621 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
|
622 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
|
623 child=self.siblings(cl.children(n), cl.rev), |
| 1062 | 624 diff=diff) |
| 515 | 625 |
|
2113
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
626 archive_specs = { |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
627 'bz2': ('application/x-tar', 'tbz2', '.tar.bz2', 'x-bzip2'), |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
628 'gz': ('application/x-tar', 'tgz', '.tar.gz', 'x-gzip'), |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
629 'zip': ('application/zip', 'zip', '.zip', None), |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
630 } |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
631 |
|
2113
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
632 def archive(self, req, cnode, type): |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
633 reponame = re.sub(r"\W+", "-", os.path.basename(self.reponame)) |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
634 name = "%s-%s" % (reponame, short(cnode)) |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
635 mimetype, artype, extension, encoding = self.archive_specs[type] |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
636 headers = [('Content-type', mimetype), |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
637 ('Content-disposition', 'attachment; filename=%s%s' % |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
638 (name, extension))] |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
639 if encoding: |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
640 headers.append(('Content-encoding', encoding)) |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
641 req.header(headers) |
|
633d733e7b11
make hgweb use new archival module.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2103
diff
changeset
|
642 archival.archive(self.repo, req.out, cnode, artype, prefix=name) |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
643 |
| 138 | 644 # add tags to things |
| 645 # tags -> list of changesets corresponding to tags | |
| 646 # find tag, changeset, file | |
| 131 | 647 |
|
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
|
648 def run(self, req=hgrequest()): |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
649 def clean(path): |
|
1864
7a09785d3237
Fix manifest view on Windows
Lee Cantey <lcantey@gmail.com>
parents:
1834
diff
changeset
|
650 p = util.normpath(path) |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
651 if p[:2] == "..": |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
652 raise "suspicious path" |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
653 return p |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
654 |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
655 def header(**map): |
|
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
656 yield self.t("header", **map) |
|
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
657 |
|
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
658 def footer(**map): |
|
2148
c72e618c1204
Add MOTD display to hgweb and hgwebdir.
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
2127
diff
changeset
|
659 yield self.t("footer", |
|
c72e618c1204
Add MOTD display to hgweb and hgwebdir.
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
2127
diff
changeset
|
660 motd=self.repo.ui.config("web", "motd", ""), |
|
c72e618c1204
Add MOTD display to hgweb and hgwebdir.
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
2127
diff
changeset
|
661 **map) |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
662 |
|
1406
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
663 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
|
664 shortcuts = { |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
665 '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
|
666 '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
|
667 '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
|
668 '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
|
669 '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
|
670 '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
|
671 '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
|
672 '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
|
673 '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
|
674 'tip': [('cmd', ['changeset']), ('node', ['tip'])], |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
675 '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
|
676 } |
|
1409
964baa35faf8
hgweb: add shortcuts for all the web commands / fix empty arg bug
Matt Mackall <mpm@selenic.com>
parents:
1407
diff
changeset
|
677 |
|
1406
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
678 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
|
679 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
|
680 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
|
681 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
|
682 value = form[k] |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
683 form[name] = value |
|
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
684 del form[k] |
|
857
41b344235bb7
[PATCH] Propagate the template map though recursively
Jeff Sipek <jeffpc@optonline.net>
parents:
839
diff
changeset
|
685 |
| 258 | 686 self.refresh() |
| 132 | 687 |
|
1406
34cb3957d875
hgweb: allow urls to be shorter by using shortcuts
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1402
diff
changeset
|
688 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
|
689 |
|
1897
58b6784cf9f1
move hgweb.templatepath into templater
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1896
diff
changeset
|
690 t = self.repo.ui.config("web", "templates", templater.templatepath()) |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
691 static = self.repo.ui.config("web", "static", os.path.join(t,"static")) |
| 938 | 692 m = os.path.join(t, "map") |
| 986 | 693 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
|
694 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
|
695 style = req.form['style'][0] |
| 986 | 696 if style: |
| 697 b = os.path.basename("map-" + style) | |
| 983 | 698 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
|
699 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
|
700 m = p |
| 515 | 701 |
|
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
|
702 port = req.env["SERVER_PORT"] |
| 601 | 703 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
|
704 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
|
705 if "?" in uri: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
706 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
|
707 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
|
708 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
|
709 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
|
710 or uri.strip('/') or self.repo.root) |
| 601 | 711 |
|
1896
f8f818a04f5b
move hgweb template code out to templater
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1796
diff
changeset
|
712 self.t = templater.templater(m, templater.common_filters, |
|
1964
778281d46bb2
fix template bug that made hgweb break.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1920
diff
changeset
|
713 defaults={"url": url, |
|
778281d46bb2
fix template bug that made hgweb break.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1920
diff
changeset
|
714 "repo": self.reponame, |
|
778281d46bb2
fix template bug that made hgweb break.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1920
diff
changeset
|
715 "header": header, |
|
778281d46bb2
fix template bug that made hgweb break.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1920
diff
changeset
|
716 "footer": footer, |
|
778281d46bb2
fix template bug that made hgweb break.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1920
diff
changeset
|
717 }) |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
198
diff
changeset
|
718 |
|
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
|
719 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
|
720 req.form['cmd'] = [self.t.cache['default'],] |
| 937 | 721 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
722 cmd = req.form['cmd'][0] |
|
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
723 if cmd == 'changelog': |
|
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
724 hi = self.repo.changelog.count() - 1 |
|
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
|
725 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
|
726 hi = req.form['rev'][0] |
|
166
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
727 try: |
|
39624c47060f
hgweb: don't blow up on search for unknown keys
mpm@selenic.com
parents:
165
diff
changeset
|
728 hi = self.repo.changelog.rev(self.repo.lookup(hi)) |
| 1219 | 729 except hg.RepoError: |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
730 req.write(self.search(hi)) # XXX redirect to 404 page? |
| 538 | 731 return |
| 575 | 732 |
|
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
|
733 req.write(self.changelog(hi)) |
| 515 | 734 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
735 elif cmd == 'changeset': |
|
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
|
736 req.write(self.changeset(req.form['node'][0])) |
| 138 | 737 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
738 elif cmd == 'manifest': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
739 req.write(self.manifest(req.form['manifest'][0], |
|
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
740 clean(req.form['path'][0]))) |
| 138 | 741 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
742 elif cmd == 'tags': |
|
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
|
743 req.write(self.tags()) |
| 168 | 744 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
745 elif cmd == 'summary': |
|
1572
385b8872b8e3
[hgweb] Initial import of the "gitweb" style
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1559
diff
changeset
|
746 req.write(self.summary()) |
|
1579
85803ec2daab
Remove tabs, and trailing whitespace from hgweb.py
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1575
diff
changeset
|
747 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
748 elif cmd == 'filediff': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
749 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
|
750 req.form['node'][0])) |
| 131 | 751 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
752 elif cmd == 'file': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
753 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
|
754 req.form['filenode'][0])) |
| 131 | 755 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
756 elif cmd == 'annotate': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
757 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
|
758 req.form['filenode'][0])) |
| 131 | 759 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
760 elif cmd == 'filelog': |
|
1646
8e9c203946ae
Clean up paths passed to hgweb
Matt Mackall <mpm@selenic.com>
parents:
1637
diff
changeset
|
761 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
|
762 req.form['filenode'][0])) |
| 136 | 763 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
764 elif cmd == '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
|
765 req.httphdr("application/mercurial-0.1") |
| 222 | 766 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
|
767 req.write(" ".join(map(hex, h)) + "\n") |
| 222 | 768 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
769 elif cmd == 'branches': |
|
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 req.httphdr("application/mercurial-0.1") |
| 132 | 771 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
|
772 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
|
773 nodes = map(bin, req.form['nodes'][0].split(" ")) |
| 138 | 774 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
|
775 req.write(" ".join(map(hex, b)) + "\n") |
| 131 | 776 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
777 elif cmd == 'between': |
|
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
|
778 req.httphdr("application/mercurial-0.1") |
| 132 | 779 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
|
780 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
|
781 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
|
782 for p in req.form['pairs'][0].split(" ")] |
| 138 | 783 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
|
784 req.write(" ".join(map(hex, b)) + "\n") |
| 132 | 785 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
786 elif cmd == 'changegroup': |
|
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
|
787 req.httphdr("application/mercurial-0.1") |
| 132 | 788 nodes = [] |
|
964
3f37720e7dc7
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com
parents:
957
diff
changeset
|
789 if not self.allowpull: |
| 197 | 790 return |
| 791 | |
|
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
|
792 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
|
793 nodes = map(bin, req.form['roots'][0].split(" ")) |
| 131 | 794 |
| 132 | 795 z = zlib.compressobj() |
|
1736
50de0887bbcd
add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1703
diff
changeset
|
796 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
|
797 while 1: |
|
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
620
diff
changeset
|
798 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
|
799 if not chunk: |
|
58eefdfb8472
Some more spacing/indentation/linebreak cleanups to hgweb.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1062
diff
changeset
|
800 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
|
801 req.write(z.compress(chunk)) |
| 132 | 802 |
|
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
|
803 req.write(z.flush()) |
| 131 | 804 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
805 elif cmd == 'archive': |
|
1369
b6d4ebebc35c
Allows abbreviated hashes in hgweb
Matt Mackall <mpm@selenic.com>
parents:
1348
diff
changeset
|
806 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
|
807 type = req.form['type'][0] |
|
2358
8819fc1dcf4b
hgweb: add allow_archive support to [web] section of hgrc
TK Soh <teekaysoh@yahoo.com>
parents:
2356
diff
changeset
|
808 allowed = self.repo.ui.config("web", "allow_archive", "").split() |
|
8819fc1dcf4b
hgweb: add allow_archive support to [web] section of hgrc
TK Soh <teekaysoh@yahoo.com>
parents:
2356
diff
changeset
|
809 if (type in self.archives and (type in allowed or |
|
8819fc1dcf4b
hgweb: add allow_archive support to [web] section of hgrc
TK Soh <teekaysoh@yahoo.com>
parents:
2356
diff
changeset
|
810 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
|
811 self.archive(req, changeset, type) |
| 1078 | 812 return |
|
1077
b87aeccf73d9
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1076
diff
changeset
|
813 |
|
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
|
814 req.write(self.t("error")) |
|
1076
01db658cc78a
tarball support v0.3
Wojciech Milkowski <wmilkowski@interia.pl>
parents:
1073
diff
changeset
|
815 |
|
2119
f62195054c5b
Cleaned hgweb.py a little bit
Alexander Schremmer <alex AT alexanderweb DOT de>
parents:
2113
diff
changeset
|
816 elif cmd == 'static': |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
817 fname = req.form['file'][0] |
|
1793
83c6d8355909
Allow serving static files from hgwebdir to fix CSS and favicon.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1792
diff
changeset
|
818 req.write(staticfile(static, fname) |
|
1796
a373881fdf2a
Fixed wrong (copy&paste) usage of tmpl instead of self.t in hgweb.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1795
diff
changeset
|
819 or self.t("error", error="%r not found" % fname)) |
|
1777
a2316878f19d
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
1703
diff
changeset
|
820 |
| 132 | 821 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
|
822 req.write(self.t("error")) |