hg/gitserve: mercurial/hgweb/hgweb

annotate mercurial/hgweb/hgweb_mod.py @ 3280:e0cd1b98bf8d

hgweb: be more conservative about expanding SCRIPT_NAME

author	Brendan Cully <brendan@kublai.com>
date	Thu, 05 Oct 2006 15:36:53 -0700
parents	10277edf7e5b
children	db9d2a624521

rev	line source
2391 d351a3be3371 Fixing up comment headers for split up code. Eric Hopper <hopper@omnifarious.org> parents: 2361 diff changeset	1 # hgweb/hgweb_mod.py - Web interface for a repository.
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	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>
2865 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2863 diff changeset	4 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	5 #
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	6 # This software may be used and distributed according to the terms
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	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
2514 419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	13 demandload(globals(), "re zlib ConfigParser mimetools cStringIO sys tempfile")
3276 a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	14 demandload(globals(), 'urllib')
2894 3848488244fc Move ui.diffopts to patch.diffopts where it belongs Matt Mackall <mpm@selenic.com> parents: 2882 diff changeset	15 demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,streamclone,patch")
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2580 diff changeset	16 demandload(globals(), "mercurial:templater")
2356 2db831b33e8f Final stage of the hgweb split up. Eric Hopper <hopper@omnifarious.org> parents: 2355 diff changeset	17 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	18 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	19 from mercurial.i18n import gettext as _
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	20
2356 2db831b33e8f Final stage of the hgweb split up. Eric Hopper <hopper@omnifarious.org> parents: 2355 diff changeset	21 def _up(p):
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	22 if p[0] != "/":
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	23 p = "/" + p
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	24 if p[-1] == "/":
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	25 p = p[:-1]
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	26 up = os.path.dirname(p)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	27 if up == "/":
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	28 return "/"
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	29 return up + "/"
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	30
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1554 diff changeset	31 class hgweb(object):
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	32 def __init__(self, repo, name=None):
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	33 if type(repo) == type(""):
1213 db9639b8594c Clean up hgweb imports mpm@selenic.com parents: 1210 diff changeset	34 self.repo = hg.repository(ui.ui(), repo)
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	35 else:
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	36 self.repo = repo
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	37
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	38 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	39 self.reponame = name
1078 33f40d0c6124 Various cleanups for tarball support mpm@selenic.com parents: 1077 diff changeset	40 self.archives = 'zip', 'gz', 'bz2'
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	41 self.stripecount = 1
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	42 self.templatepath = self.repo.ui.config("web", "templates",
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	43 templater.templatepath())
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	44
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	45 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	46 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	47 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	48 self.mtime = mtime
1213 db9639b8594c Clean up hgweb imports mpm@selenic.com parents: 1210 diff changeset	49 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	50 self.maxchanges = int(self.repo.ui.config("web", "maxchanges", 10))
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	51 self.stripecount = int(self.repo.ui.config("web", "stripes", 1))
2684 783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	52 self.maxshortchanges = int(self.repo.ui.config("web", "maxshortchanges", 60))
1275 a1a84dd489ff Fix cut and paste error in hgweb.py Florian La Roche <laroche@redhat.com> parents: 1260 diff changeset	53 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	54 self.allowpull = self.repo.ui.configbool("web", "allowpull", True)
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	55
1498 78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	56 def archivelist(self, nodeid):
2500 76ff5efe8181 Fixed [web] allow_archive for comma separated parameters by using ui.configlist. Thomas Arendsen Hein <thomas@intevation.de> parents: 2466 diff changeset	57 allowed = self.repo.ui.configlist("web", "allow_archive")
3266 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	58 for i, spec in self.archive_specs.iteritems():
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	59 if i in allowed or self.repo.ui.configbool("web", "allow" + i):
3266 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	60 yield {"type" : i, "extension" : spec[2], "node" : nodeid}
1498 78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	61
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	62 def listfiles(self, files, mf):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	63 for f in files[:self.maxfiles]:
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	64 yield self.t("filenodelink", node=hex(mf[f]), file=f)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	65 if len(files) > self.maxfiles:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	66 yield self.t("fileellipses")
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	67
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	68 def listfilediffs(self, files, changeset):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	69 for f in files[:self.maxfiles]:
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	70 yield self.t("filedifflink", node=hex(changeset), file=f)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	71 if len(files) > self.maxfiles:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	72 yield self.t("fileellipses")
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	73
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	74 def siblings(self, siblings=[], hiderev=None, **args):
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	75 siblings = [s for s in siblings if s.node() != nullid]
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	76 if len(siblings) == 1 and siblings[0].rev() == hiderev:
1416 19d2776f1725 hgweb: hide trivial parent (like in show_changeset) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1411 diff changeset	77 return
1606 ba625c8083d8 - duplicate the parent link logic to show child links Muli Ben-Yehuda <mulix@mulix.org> parents: 1579 diff changeset	78 for s in siblings:
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	79 yield dict(node=hex(s.node()), rev=s.rev(), **args)
569 3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	80
1653 e8a3df8b62b3 hgweb: show copy/rename links in file history Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	81 def renamelink(self, fl, node):
e8a3df8b62b3 hgweb: show copy/rename links in file history Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	82 r = fl.renamed(node)
e8a3df8b62b3 hgweb: show copy/rename links in file history Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	83 if r:
e8a3df8b62b3 hgweb: show copy/rename links in file history Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	84 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	85 return []
e8a3df8b62b3 hgweb: show copy/rename links in file history Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	86
568 e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	87 def showtag(self, t1, node=nullid, **args):
e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	88 for t in self.repo.nodetags(node):
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	89 yield self.t(t1, tag=t, **args)
568 e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	90
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	91 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	92 def filterfiles(filters, files):
1627 11cd38286fdb fix for hgweb.filterfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1626 diff changeset	93 l = [x for x in files if x in filters]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	94
1626 f2b1df3dbcbb make the order of the arguments for filterfiles consistent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	95 for t in filters:
1627 11cd38286fdb fix for hgweb.filterfiles Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1626 diff changeset	96 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	97 t += os.sep
f2b1df3dbcbb make the order of the arguments for filterfiles consistent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	98 l += [x for x in files if x.startswith(t)]
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	99 return l
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	100
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	101 parity = [0]
e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	102 def diffblock(diff, f, fn):
e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	103 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	104 lines=prettyprintlines(diff),
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	105 parity=parity[0],
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	106 file=f,
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	107 filenode=hex(fn or nullid))
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	108 parity[0] = 1 - parity[0]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	109
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	110 def prettyprintlines(diff):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	111 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	112 if l.startswith('+'):
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	113 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	114 elif l.startswith('-'):
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	115 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	116 elif l.startswith('@'):
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	117 yield self.t("difflineat", line=l)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	118 else:
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	119 yield self.t("diffline", line=l)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	120
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	121 r = self.repo
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	122 cl = r.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	123 mf = r.manifest
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	124 change1 = cl.read(node1)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	125 change2 = cl.read(node2)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	126 mmap1 = mf.read(change1[0])
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	127 mmap2 = mf.read(change2[0])
1333 901c645c1943 hgweb: fix date bug in hgweb diff generation mpm@selenic.com parents: 1324 diff changeset	128 date1 = util.datestr(change1[2])
901c645c1943 hgweb: fix date bug in hgweb diff generation mpm@selenic.com parents: 1324 diff changeset	129 date2 = util.datestr(change2[2])
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	130
2882 cf86bbb8ed68 hgweb: repo.changes() is now called repo.status() Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 2880 diff changeset	131 modified, added, removed, deleted, unknown = r.status(node1, node2)[:5]
645 a55048b2ae3a this patch permits hgweb to show the deleted files in the changeset diff kreijack@inwind.REMOVEME.it parents: 635 diff changeset	132 if files:
1626 f2b1df3dbcbb make the order of the arguments for filterfiles consistent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	133 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	134 (modified, added, removed))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	135
2933 ee6ed2b29e1a Fix hgweb's patch display in changeset view. Thomas Arendsen Hein <thomas@intevation.de> parents: 2894 diff changeset	136 diffopts = patch.diffopts(self.repo.ui)
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	137 for f in modified:
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	138 to = r.file(f).read(mmap1[f])
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	139 tn = r.file(f).read(mmap2[f])
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1627 diff changeset	140 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
2880 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2865 diff changeset	141 opts=diffopts), 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	142 for f in added:
265 7ca05593bd30 hgweb: fix non-existent source or destination for diff mpm@selenic.com parents: 258 diff changeset	143 to = None
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	144 tn = r.file(f).read(mmap2[f])
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1627 diff changeset	145 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
2880 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2865 diff changeset	146 opts=diffopts), 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	147 for f in removed:
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	148 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	149 tn = None
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1627 diff changeset	150 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
2880 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2865 diff changeset	151 opts=diffopts), f, tn)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	152
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	153 def changelog(self, ctx, shortlog=False):
325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	154 pos = ctx.rev()
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	155 def changenav(**map):
1703 41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	156 def seq(factor, maxchanges=None):
41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	157 if maxchanges:
41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	158 yield maxchanges
41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	159 if maxchanges >= 20 and maxchanges <= 40:
41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	160 yield 50
41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	161 else:
41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	162 yield 1 * factor
41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	163 yield 3 * factor
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	164 for f in seq(factor * 10):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	165 yield f
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	166
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	167 l = []
1703 41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	168 last = 0
2684 783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	169 maxchanges = shortlog and self.maxshortchanges or self.maxchanges
783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	170 for f in seq(1, maxchanges):
783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	171 if f < 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	172 continue
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	173 if f > count:
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	174 break
1703 41d884f741ca fix changenav for maxchanges != 10 Johannes Stezenbach <js@linuxtv.org> parents: 1653 diff changeset	175 last = f
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	176 r = "%d" % f
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	177 if pos + f < count:
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	178 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	179 if pos - f >= 0:
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	180 l.insert(0, ("-" + r, pos - f))
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	181
975 bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	182 yield {"rev": 0, "label": "(0)"}
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	183
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	184 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	185 yield {"label": label, "rev": rev}
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	186
1409 964baa35faf8 hgweb: add shortcuts for all the web commands / fix empty arg bug Matt Mackall <mpm@selenic.com> parents: 1407 diff changeset	187 yield {"label": "tip", "rev": "tip"}
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	188
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	189 def changelist(**map):
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	190 parity = (start - end) & 1
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	191 cl = self.repo.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	192 l = [] # build a list in forward order for efficiency
351 9525208e1c1d hgweb: change number navigation tidy up mpm@selenic.com parents: 350 diff changeset	193 for i in range(start, end):
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	194 ctx = self.repo.changectx(i)
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	195 n = ctx.node()
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	196
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	197 l.insert(0, {"parity": parity,
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	198 "author": ctx.user(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	199 "parent": self.siblings(ctx.parents(), i - 1),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	200 "child": self.siblings(ctx.children(), i + 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),
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	202 "desc": ctx.description(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	203 "date": ctx.date(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	204 "files": self.listfilediffs(ctx.files(), n),
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	205 "rev": i,
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	206 "node": hex(n)})
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	207 parity = 1 - parity
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	208
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	209 for e in l:
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	210 yield e
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	211
2684 783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	212 maxchanges = shortlog and self.maxshortchanges or self.maxchanges
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	213 cl = self.repo.changelog
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	214 count = cl.count()
2684 783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	215 start = max(0, pos - maxchanges + 1)
783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	216 end = min(count, start + maxchanges)
351 9525208e1c1d hgweb: change number navigation tidy up mpm@selenic.com parents: 350 diff changeset	217 pos = end - 1
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	218
2684 783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	219 yield self.t(shortlog and 'shortlog' or 'changelog',
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	220 changenav=changenav,
3211 48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	221 node=hex(cl.tip()),
2170 29eeb2717915 Add archive download links to tip on main changeset list page Colin McMillen <mcmillen@cs.cmu.edu> parents: 2148 diff changeset	222 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	223 archives=self.archivelist("tip"))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	224
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	225 def search(self, query):
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	226
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	227 def changelist(**map):
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	228 cl = self.repo.changelog
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	229 count = 0
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	230 qw = query.lower().split()
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	231
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	232 def revgen():
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	233 for i in range(cl.count() - 1, 0, -100):
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	234 l = []
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	235 for j in range(max(0, i - 100), i):
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	236 ctx = self.repo.changectx(j)
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	237 l.append(ctx)
1023 bc806ba72959 Minor tweak to the revgen algorithm mpm@selenic.com parents: 1022 diff changeset	238 l.reverse()
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	239 for e in l:
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	240 yield e
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	241
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	242 for ctx in revgen():
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	243 miss = 0
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	244 for q in qw:
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	245 if not (q in ctx.user().lower() or
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	246 q in ctx.description().lower() or
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	247 q in " ".join(ctx.files()[:20]).lower()):
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	248 miss = 1
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	249 break
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	250 if miss:
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	251 continue
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	252
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	253 count += 1
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	254 n = ctx.node()
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	255
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	256 yield self.t('searchentry',
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	257 parity=self.stripes(count),
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	258 author=ctx.user(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	259 parent=self.siblings(ctx.parents()),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	260 child=self.siblings(ctx.children()),
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	261 changelogtag=self.showtag("changelogtag",n),
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	262 desc=ctx.description(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	263 date=ctx.date(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	264 files=self.listfilediffs(ctx.files(), n),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	265 rev=ctx.rev(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	266 node=hex(n))
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	267
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	268 if count >= self.maxchanges:
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	269 break
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	270
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	271 cl = self.repo.changelog
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	272
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	273 yield self.t('search',
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	274 query=query,
3211 48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	275 node=hex(cl.tip()),
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	276 entries=changelist)
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	277
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	278 def changeset(self, ctx):
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	279 n = ctx.node()
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	280 parents = ctx.parents()
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	281 p1 = parents[0].node()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	282
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	283 files = []
3185 76ab39df0917 gitweb: cosmetic fixes. Brendan Cully <brendan@kublai.com> parents: 3184 diff changeset	284 parity = 0
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	285 for f in ctx.files():
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	286 files.append(self.t("filenodelink",
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	287 node=hex(n), file=f,
3185 76ab39df0917 gitweb: cosmetic fixes. Brendan Cully <brendan@kublai.com> parents: 3184 diff changeset	288 parity=parity))
76ab39df0917 gitweb: cosmetic fixes. Brendan Cully <brendan@kublai.com> parents: 3184 diff changeset	289 parity = 1 - parity
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	290
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	291 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	292 yield self.diff(p1, n, None)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	293
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	294 yield self.t('changeset',
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	295 diff=diff,
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	296 rev=ctx.rev(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	297 node=hex(n),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	298 parent=self.siblings(parents),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	299 child=self.siblings(ctx.children()),
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	300 changesettag=self.showtag("changesettag",n),
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	301 author=ctx.user(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	302 desc=ctx.description(),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	303 date=ctx.date(),
1076 01db658cc78a tarball support v0.3 Wojciech Milkowski <wmilkowski@interia.pl> parents: 1073 diff changeset	304 files=files,
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	305 archives=self.archivelist(hex(n)))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	306
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	307 def filelog(self, fctx):
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	308 f = fctx.path()
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	309 fl = fctx.filelog()
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	310 count = fl.count()
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	311
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	312 def entries(**map):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	313 l = []
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	314 parity = (count - 1) & 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	315
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	316 for i in range(count):
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	317 ctx = fctx.filectx(i)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	318 n = fl.node(i)
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	319
978 ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	320 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	321 "filerev": i,
ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	322 "file": f,
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	323 "node": hex(ctx.node()),
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	324 "author": ctx.user(),
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	325 "date": ctx.date(),
1653 e8a3df8b62b3 hgweb: show copy/rename links in file history Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	326 "rename": self.renamelink(fl, n),
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	327 "parent": self.siblings(fctx.parents(), file=f),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	328 "child": self.siblings(fctx.children(), file=f),
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	329 "desc": ctx.description()})
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	330 parity = 1 - parity
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	331
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	332 for e in l:
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	333 yield e
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	334
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	335 yield self.t("filelog", file=f, node=hex(fctx.node()), entries=entries)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	336
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	337 def filerevision(self, fctx):
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	338 f = fctx.path()
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	339 text = fctx.data()
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	340 fl = fctx.filelog()
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	341 n = fctx.filenode()
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	342
1411 e2ba788545bf hgweb: make viewing of non-text work in hgweb Matt Mackall <mpm@selenic.com> parents: 1409 diff changeset	343 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	344 rawtext = text
e2ba788545bf hgweb: make viewing of non-text work in hgweb Matt Mackall <mpm@selenic.com> parents: 1409 diff changeset	345 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	346 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	347 text = "(binary:%s)" % mt
2095 0bf2a9e5eff1 Don't send "Content-Type: none" Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1964 diff changeset	348 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	349
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	350 def lines():
529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	351 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	352 yield {"line": t,
5d5ab159d197 hgweb: Changed file page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 975 diff changeset	353 "linenumber": "% 6d" % (l + 1),
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	354 "parity": self.stripes(l)}
359 0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 351 diff changeset	355
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	356 yield self.t("filerevision",
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	357 file=f,
2356 2db831b33e8f Final stage of the hgweb split up. Eric Hopper <hopper@omnifarious.org> parents: 2355 diff changeset	358 path=_up(f),
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	359 text=lines(),
1411 e2ba788545bf hgweb: make viewing of non-text work in hgweb Matt Mackall <mpm@selenic.com> parents: 1409 diff changeset	360 raw=rawtext,
e2ba788545bf hgweb: make viewing of non-text work in hgweb Matt Mackall <mpm@selenic.com> parents: 1409 diff changeset	361 mimetype=mt,
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	362 rev=fctx.rev(),
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	363 node=hex(fctx.node()),
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	364 author=fctx.user(),
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	365 date=fctx.date(),
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	366 parent=self.siblings(fctx.parents(), file=f),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	367 child=self.siblings(fctx.children(), file=f),
1653 e8a3df8b62b3 hgweb: show copy/rename links in file history Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	368 rename=self.renamelink(fl, n),
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	369 permissions=fctx.manifest().execf(f))
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	370
3212 79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	371 def fileannotate(self, fctx):
79fd7a92f3e2 hgweb: kill off #filenode# Brendan Cully <brendan@kublai.com> parents: 3211 diff changeset	372 f = fctx.path()
3179 3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	373 n = fctx.filenode()
3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	374 fl = fctx.filelog()
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	375
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	376 def annotate(**map):
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	377 parity = 0
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	378 last = None
3181 fc379b91f602 hgweb: make annotate line revisions point to annotation for that rev Brendan Cully <brendan@kublai.com> parents: 3179 diff changeset	379 for f, l in fctx.annotate(follow=True):
fc379b91f602 hgweb: make annotate line revisions point to annotation for that rev Brendan Cully <brendan@kublai.com> parents: 3179 diff changeset	380 fnode = f.filenode()
3179 3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	381 name = self.repo.ui.shortuser(f.user())
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	382
3181 fc379b91f602 hgweb: make annotate line revisions point to annotation for that rev Brendan Cully <brendan@kublai.com> parents: 3179 diff changeset	383 if last != fnode:
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	384 parity = 1 - parity
3181 fc379b91f602 hgweb: make annotate line revisions point to annotation for that rev Brendan Cully <brendan@kublai.com> parents: 3179 diff changeset	385 last = fnode
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	386
977 289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	387 yield {"parity": parity,
3184 0d0d7317bbc8 hgweb: yield filenode as well as node in annotate, use filenode in annotateline Brendan Cully <brendan@kublai.com> parents: 3183 diff changeset	388 "node": hex(f.node()),
3179 3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	389 "rev": f.rev(),
977 289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	390 "author": name,
3179 3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	391 "file": f.path(),
977 289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	392 "line": l}
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	393
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	394 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	395 file=f,
58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	396 annotate=annotate,
2356 2db831b33e8f Final stage of the hgweb split up. Eric Hopper <hopper@omnifarious.org> parents: 2355 diff changeset	397 path=_up(f),
3179 3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	398 rev=fctx.rev(),
3183 8683c7a637ad hgweb: fix changeset link in annotate view. Brendan Cully <brendan@kublai.com> parents: 3181 diff changeset	399 node=hex(fctx.node()),
3179 3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	400 author=fctx.user(),
3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	401 date=fctx.date(),
1653 e8a3df8b62b3 hgweb: show copy/rename links in file history Matt Mackall <mpm@selenic.com> parents: 1650 diff changeset	402 rename=self.renamelink(fl, n),
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	403 parent=self.siblings(fctx.parents(), file=f),
e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	404 child=self.siblings(fctx.children(), file=f),
3179 3466bd7b9754 hgweb: use filectx.annotate instead of filelog Brendan Cully <brendan@kublai.com> parents: 3137 diff changeset	405 permissions=fctx.manifest().execf(f))
136 0e8d60d2bb2b added annotate jake@edge2.net parents: 135 diff changeset	406
3211 48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	407 def manifest(self, ctx, path):
48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	408 mf = ctx.manifest()
48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	409 node = ctx.node()
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	410
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	411 files = {}
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	412
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	413 p = path[1:]
1649 beb7da710c8a hgweb: fix breakage on manifest subdirs from path cleaning Matt Mackall <mpm@selenic.com> parents: 1646 diff changeset	414 if p and p[-1] != "/":
beb7da710c8a hgweb: fix breakage on manifest subdirs from path cleaning Matt Mackall <mpm@selenic.com> parents: 1646 diff changeset	415 p += "/"
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	416 l = len(p)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	417
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	418 for f,n in mf.items():
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	419 if f[:l] != p:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	420 continue
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	421 remain = f[l:]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	422 if "/" in remain:
2579 0875cda033fd use __contains__, index or split instead of str.find Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2558 diff changeset	423 short = remain[:remain.index("/") + 1] # bleah
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	424 files[short] = (f, None)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	425 else:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	426 short = os.path.basename(remain)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	427 files[short] = (f, n)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	428
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	429 def filelist(**map):
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	430 parity = 0
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	431 fl = files.keys()
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	432 fl.sort()
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	433 for f in fl:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	434 full, fnode = files[f]
979 87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	435 if not fnode:
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	436 continue
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	437
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	438 yield {"file": full,
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	439 "filenode": hex(fnode),
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	440 "parity": self.stripes(parity),
979 87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	441 "basename": f,
2863 18cf5349a361 Fix some bugs introduced during the manifest refactoring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2840 diff changeset	442 "permissions": mf.execf(full)}
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	443 parity += 1
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	444
979 87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	445 def dirlist(**map):
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	446 parity = 0
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	447 fl = files.keys()
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	448 fl.sort()
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	449 for f in fl:
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	450 full, fnode = files[f]
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	451 if fnode:
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	452 continue
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	453
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	454 yield {"parity": self.stripes(parity),
979 87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	455 "path": os.path.join(path, f),
980 5197fb9d65d5 Merge with MPM Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 979 939 diff changeset	456 "basename": f[:-1]}
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	457 parity += 1
982 8d2e24bae760 hgweb: convert index entries to list expansion style mpm@selenic.com parents: 981 diff changeset	458
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	459 yield self.t("manifest",
3211 48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	460 rev=ctx.rev(),
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	461 node=hex(node),
6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	462 path=path,
2356 2db831b33e8f Final stage of the hgweb split up. Eric Hopper <hopper@omnifarious.org> parents: 2355 diff changeset	463 up=_up(path),
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	464 fentries=filelist,
1498 78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	465 dentries=dirlist,
78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	466 archives=self.archivelist(hex(node)))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	467
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	468 def tags(self):
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	469 cl = self.repo.changelog
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	470
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 330 diff changeset	471 i = self.repo.tagslist()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 330 diff changeset	472 i.reverse()
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	473
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	474 def entries(notip=False, **map):
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	475 parity = 0
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	476 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	477 if notip and k == "tip": continue
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	478 yield {"parity": self.stripes(parity),
974 aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	479 "tag": k,
1579 85803ec2daab Remove tabs, and trailing whitespace from hgweb.py Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1575 diff changeset	480 "date": cl.read(n)[2],
974 aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	481 "node": hex(n)}
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	482 parity += 1
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	483
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	484 yield self.t("tags",
3211 48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	485 node=hex(self.repo.changelog.tip()),
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	486 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	487 entriesnotip=lambda x: entries(True, x))
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	488
1572 385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	489 def summary(self):
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	490 cl = self.repo.changelog
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	491
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	492 i = self.repo.tagslist()
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	493 i.reverse()
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	494
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	495 def tagentries(**map):
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	496 parity = 0
1579 85803ec2daab Remove tabs, and trailing whitespace from hgweb.py Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1575 diff changeset	497 count = 0
1572 385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	498 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	499 if k == "tip": # skip tip
1572 385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	500 continue;
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	501
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	502 count += 1
1579 85803ec2daab Remove tabs, and trailing whitespace from hgweb.py Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1575 diff changeset	503 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	504 break;
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	505
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	506 c = cl.read(n)
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	507 t = c[2]
1579 85803ec2daab Remove tabs, and trailing whitespace from hgweb.py Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1575 diff changeset	508
1572 385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	509 yield self.t("tagentry",
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	510 parity = self.stripes(parity),
1572 385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	511 tag = k,
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	512 node = hex(n),
3211 48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	513 date = t)
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	514 parity += 1
1579 85803ec2daab Remove tabs, and trailing whitespace from hgweb.py Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1575 diff changeset	515
1572 385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	516 def changelist(**map):
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	517 parity = 0
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	518 cl = self.repo.changelog
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	519 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	520 for i in range(start, end):
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	521 n = cl.node(i)
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	522 changes = cl.read(n)
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	523 hn = hex(n)
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	524 t = changes[2]
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	525
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	526 l.insert(0, self.t(
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	527 'shortlogentry',
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	528 parity = parity,
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	529 author = changes[1],
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	530 desc = changes[4],
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	531 date = t,
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	532 rev = i,
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	533 node = hn))
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	534 parity = 1 - parity
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	535
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	536 yield l
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	537
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	538 count = cl.count()
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	539 start = max(0, count - self.maxchanges)
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	540 end = min(count, start + self.maxchanges)
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	541
385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	542 yield self.t("summary",
1579 85803ec2daab Remove tabs, and trailing whitespace from hgweb.py Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1575 diff changeset	543 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	544 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	545 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	546 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	547 lastchange = (0, 0), # FIXME
1572 385b8872b8e3 [hgweb] Initial import of the "gitweb" style Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1559 diff changeset	548 tags = tagentries,
2683 8a798185809d [hgweb] Fixed up gitweb templates Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2622 diff changeset	549 shortlog = changelist,
3211 48395d2692de hgweb: kill #manifest# Brendan Cully <brendan@kublai.com> parents: 3185 diff changeset	550 node = hex(self.repo.changelog.tip()),
2683 8a798185809d [hgweb] Fixed up gitweb templates Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2622 diff changeset	551 archives=self.archivelist("tip"))
1579 85803ec2daab Remove tabs, and trailing whitespace from hgweb.py Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1575 diff changeset	552
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	553 def filediff(self, fctx):
325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	554 n = fctx.node()
325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	555 path = fctx.path()
325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	556 parents = fctx.changectx().parents()
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	557 p1 = parents[0].node()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	558
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	559 def diff(**map):
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	560 yield self.diff(p1, n, [path])
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	561
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	562 yield self.t("filediff",
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	563 file=path,
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	564 node=hex(n),
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	565 rev=fctx.rev(),
3214 e7b7906cc47e hgweb: teach siblings and callers to use contexts Brendan Cully <brendan@kublai.com> parents: 3212 diff changeset	566 parent=self.siblings(parents),
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	567 child=self.siblings(fctx.children()),
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	568 diff=diff)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	569
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	570 archive_specs = {
2361 d3adb454c5a9 Fix automatic decompression of tarballs with Firefox. Thomas Arendsen Hein <thomas@intevation.de> parents: 2359 diff changeset	571 'bz2': ('application/x-tar', 'tbz2', '.tar.bz2', None),
d3adb454c5a9 Fix automatic decompression of tarballs with Firefox. Thomas Arendsen Hein <thomas@intevation.de> parents: 2359 diff changeset	572 'gz': ('application/x-tar', 'tgz', '.tar.gz', None),
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	573 'zip': ('application/zip', 'zip', '.zip', None),
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	574 }
1076 01db658cc78a tarball support v0.3 Wojciech Milkowski <wmilkowski@interia.pl> parents: 1073 diff changeset	575
2394 a8f1049d1d2d hgweb: fix errors and warnings found by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2391 diff changeset	576 def archive(self, req, cnode, type_):
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	577 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	578 name = "%s-%s" % (reponame, short(cnode))
2394 a8f1049d1d2d hgweb: fix errors and warnings found by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2391 diff changeset	579 mimetype, artype, extension, encoding = self.archive_specs[type_]
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	580 headers = [('Content-type', mimetype),
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	581 ('Content-disposition', 'attachment; filename=%s%s' %
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	582 (name, extension))]
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	583 if encoding:
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	584 headers.append(('Content-encoding', encoding))
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	585 req.header(headers)
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	586 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	587
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	588 # add tags to things
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	589 # tags -> list of changesets corresponding to tags
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	590 # find tag, changeset, file
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	591
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	592 def cleanpath(self, path):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	593 p = util.normpath(path)
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	594 if p[:2] == "..":
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	595 raise Exception("suspicious path")
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	596 return p
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	597
2535 b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2534 diff changeset	598 def run(self):
2538 f4b7d71c1c60 Cleanup hgweb and hgwebdir's run method a bit. Eric Hopper <hopper@omnifarious.org> parents: 2535 diff changeset	599 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
2535 b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2534 diff changeset	600 raise RuntimeError("This function is only intended to be called while running as a CGI script.")
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2534 diff changeset	601 import mercurial.hgweb.wsgicgi as wsgicgi
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2534 diff changeset	602 from request import wsgiapplication
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2534 diff changeset	603 def make_web_app():
2538 f4b7d71c1c60 Cleanup hgweb and hgwebdir's run method a bit. Eric Hopper <hopper@omnifarious.org> parents: 2535 diff changeset	604 return self
2535 b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2534 diff changeset	605 wsgicgi.launch(wsgiapplication(make_web_app))
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2534 diff changeset	606
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2534 diff changeset	607 def run_wsgi(self, req):
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	608 def header(**map):
2514 419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	609 header_file = cStringIO.StringIO(''.join(self.t("header", **map)))
419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	610 msg = mimetools.Message(header_file, 0)
419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	611 req.header(msg.items())
419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	612 yield header_file.read()
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	613
2534 d5a3cc6520d5 Fix raw files in the web UI. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	614 def rawfileheader(**map):
d5a3cc6520d5 Fix raw files in the web UI. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	615 req.header([('Content-type', map['mimetype']),
d5a3cc6520d5 Fix raw files in the web UI. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	616 ('Content-disposition', 'filename=%s' % map['file']),
d5a3cc6520d5 Fix raw files in the web UI. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	617 ('Content-length', str(len(map['raw'])))])
d5a3cc6520d5 Fix raw files in the web UI. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	618 yield ''
d5a3cc6520d5 Fix raw files in the web UI. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	619
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	620 def footer(**map):
2148 c72e618c1204 Add MOTD display to hgweb and hgwebdir. Colin McMillen <mcmillen@cs.cmu.edu> parents: 2127 diff changeset	621 yield self.t("footer",
c72e618c1204 Add MOTD display to hgweb and hgwebdir. Colin McMillen <mcmillen@cs.cmu.edu> parents: 2127 diff changeset	622 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	623 **map)
1409 964baa35faf8 hgweb: add shortcuts for all the web commands / fix empty arg bug Matt Mackall <mpm@selenic.com> parents: 1407 diff changeset	624
1406 34cb3957d875 hgweb: allow urls to be shorter by using shortcuts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	625 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	626 shortcuts = {
1409 964baa35faf8 hgweb: add shortcuts for all the web commands / fix empty arg bug Matt Mackall <mpm@selenic.com> parents: 1407 diff changeset	627 'cl': [('cmd', ['changelog']), ('rev', None)],
2684 783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	628 'sl': [('cmd', ['shortlog']), ('rev', None)],
1406 34cb3957d875 hgweb: allow urls to be shorter by using shortcuts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	629 '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	630 '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	631 '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	632 '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	633 '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	634 '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	635 '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	636 '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	637 'tip': [('cmd', ['changeset']), ('node', ['tip'])],
1777 a2316878f19d [hgweb] Static content serving Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 1703 diff changeset	638 '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	639 }
1409 964baa35faf8 hgweb: add shortcuts for all the web commands / fix empty arg bug Matt Mackall <mpm@selenic.com> parents: 1407 diff changeset	640
1406 34cb3957d875 hgweb: allow urls to be shorter by using shortcuts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	641 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	642 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	643 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	644 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	645 value = form[k]
34cb3957d875 hgweb: allow urls to be shorter by using shortcuts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	646 form[name] = value
34cb3957d875 hgweb: allow urls to be shorter by using shortcuts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	647 del form[k]
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	648
3266 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	649 def rewrite_request(req):
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	650 '''translate new web interface to traditional format'''
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	651
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	652 def spliturl(req):
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	653 def firstitem(query):
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	654 return query.split('&', 1)[0].split(';', 1)[0]
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	655
3280 e0cd1b98bf8d hgweb: be more conservative about expanding SCRIPT_NAME Brendan Cully <brendan@kublai.com> parents: 3278 diff changeset	656 root = req.env.get('REQUEST_URI', '').split('?', 1)[0]
e0cd1b98bf8d hgweb: be more conservative about expanding SCRIPT_NAME Brendan Cully <brendan@kublai.com> parents: 3278 diff changeset	657 pi = req.env.get('PATH_INFO', '')
e0cd1b98bf8d hgweb: be more conservative about expanding SCRIPT_NAME Brendan Cully <brendan@kublai.com> parents: 3278 diff changeset	658 if pi:
e0cd1b98bf8d hgweb: be more conservative about expanding SCRIPT_NAME Brendan Cully <brendan@kublai.com> parents: 3278 diff changeset	659 root = root[:-len(pi)]
e0cd1b98bf8d hgweb: be more conservative about expanding SCRIPT_NAME Brendan Cully <brendan@kublai.com> parents: 3278 diff changeset	660
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	661 if req.env.has_key('REPO_NAME'):
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	662 base = '/' + req.env['REPO_NAME']
3278 10277edf7e5b hgweb: fix NWI parsing when hgwebdir isn't at / Brendan Cully <brendan@kublai.com> parents: 3276 diff changeset	663 else:
10277edf7e5b hgweb: fix NWI parsing when hgwebdir isn't at / Brendan Cully <brendan@kublai.com> parents: 3276 diff changeset	664 base = root
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	665
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	666 if pi:
3273 b4f16bf59a5d hgweb: Added safety net for PATH_INFO starting with double slash. Thomas Arendsen Hein <thomas@intevation.de> parents: 3269 diff changeset	667 while pi.startswith('//'):
b4f16bf59a5d hgweb: Added safety net for PATH_INFO starting with double slash. Thomas Arendsen Hein <thomas@intevation.de> parents: 3269 diff changeset	668 pi = pi[1:]
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	669 if pi.startswith(base):
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	670 if len(pi) > len(base):
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	671 base += '/'
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	672 query = pi[len(base):]
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	673 else:
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	674 if req.env.has_key('REPO_NAME'):
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	675 # We are using hgwebdir
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	676 base += '/'
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	677 else:
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	678 base += '?'
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	679 query = firstitem(req.env['QUERY_STRING'])
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	680 else:
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	681 base += '/'
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	682 query = pi[1:]
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	683 else:
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	684 base += '?'
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	685 query = firstitem(req.env['QUERY_STRING'])
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	686
3278 10277edf7e5b hgweb: fix NWI parsing when hgwebdir isn't at / Brendan Cully <brendan@kublai.com> parents: 3276 diff changeset	687 return (root + base, query)
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	688
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	689 req.url, query = spliturl(req)
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	690
3266 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	691 if req.form.has_key('cmd'):
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	692 # old style
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	693 return
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	694
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	695 args = query.split('/', 2)
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	696 if not args or not args[0]:
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	697 return
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	698
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	699 cmd = args.pop(0)
3267 329ac0c0c0e8 hgweb: extract raw prefix from NWI commands Brendan Cully <brendan@kublai.com> parents: 3266 diff changeset	700 style = cmd.rfind('-')
329ac0c0c0e8 hgweb: extract raw prefix from NWI commands Brendan Cully <brendan@kublai.com> parents: 3266 diff changeset	701 if style != -1:
329ac0c0c0e8 hgweb: extract raw prefix from NWI commands Brendan Cully <brendan@kublai.com> parents: 3266 diff changeset	702 req.form['style'] = [cmd[:style]]
329ac0c0c0e8 hgweb: extract raw prefix from NWI commands Brendan Cully <brendan@kublai.com> parents: 3266 diff changeset	703 cmd = cmd[style+1:]
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	704 # avoid accepting e.g. style parameter as command
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	705 if hasattr(self, 'do_' + cmd):
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	706 req.form['cmd'] = [cmd]
3266 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	707
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	708 if args and args[0]:
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	709 node = args.pop(0)
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	710 req.form['node'] = [node]
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	711 if args:
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	712 req.form['file'] = args
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	713
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	714 if cmd == 'static':
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	715 req.form['file'] = req.form['node']
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	716 elif cmd == 'archive':
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	717 fn = req.form['node'][0]
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	718 for type_, spec in self.archive_specs.iteritems():
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	719 ext = spec[2]
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	720 if fn.endswith(ext):
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	721 req.form['node'] = [fn[:-len(ext)]]
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	722 req.form['type'] = [type_]
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	723
3276 a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	724 def queryprefix(**map):
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	725 return req.url[-1] == '?' and ';' or '?'
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	726
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	727 def getentries(**map):
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	728 fields = {}
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	729 if req.form.has_key('style'):
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	730 style = req.form['style'][0]
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	731 if style != self.repo.ui.config('web', 'style', ''):
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	732 fields['style'] = style
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	733
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	734 if fields:
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	735 fields = ['%s=%s' % (k, urllib.quote(v))
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	736 for k, v in fields.iteritems()]
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	737 yield '%s%s' % (queryprefix(), ';'.join(fields))
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	738 else:
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	739 yield ''
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	740
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	741 self.refresh()
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	742
1406 34cb3957d875 hgweb: allow urls to be shorter by using shortcuts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	743 expand_form(req.form)
3266 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	744 rewrite_request(req)
1406 34cb3957d875 hgweb: allow urls to be shorter by using shortcuts Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1402 diff changeset	745
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	746 m = os.path.join(self.templatepath, "map")
986 2810c625ca98 Add web:style option mpm@selenic.com parents: 984 diff changeset	747 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	748 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	749 style = req.form['style'][0]
986 2810c625ca98 Add web:style option mpm@selenic.com parents: 984 diff changeset	750 if style:
2810c625ca98 Add web:style option mpm@selenic.com parents: 984 diff changeset	751 b = os.path.basename("map-" + style)
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	752 p = os.path.join(self.templatepath, b)
1063 58eefdfb8472 Some more spacing/indentation/linebreak cleanups to hgweb.py. Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	753 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	754 m = p
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	755
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	756 if not req.url:
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	757 port = req.env["SERVER_PORT"]
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	758 port = port != "80" and (":" + port) or ""
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	759 uri = req.env["REQUEST_URI"]
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	760 if "?" in uri:
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	761 uri = uri.split("?")[0]
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	762 req.url = "http://%s%s%s" % (req.env["SERVER_NAME"], port, uri)
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	763
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	764 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	765 self.reponame = (self.repo.ui.config("web", "name")
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	766 or req.env.get('REPO_NAME')
3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	767 or req.url.strip('/') or self.repo.root)
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	768
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1796 diff changeset	769 self.t = templater.templater(m, templater.common_filters,
3269 3207e30bf468 hgweb: support for generating and parsing NWI URLs Brendan Cully <brendan@kublai.com> parents: 3267 diff changeset	770 defaults={"url": req.url,
1964 778281d46bb2 fix template bug that made hgweb break. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	771 "repo": self.reponame,
778281d46bb2 fix template bug that made hgweb break. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	772 "header": header,
778281d46bb2 fix template bug that made hgweb break. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	773 "footer": footer,
2534 d5a3cc6520d5 Fix raw files in the web UI. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	774 "rawfileheader": rawfileheader,
3276 a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	775 "queryprefix": queryprefix,
a7370503d800 hgweb: provide means for handling query parameters Brendan Cully <brendan@kublai.com> parents: 3273 diff changeset	776 "getentries": getentries
1964 778281d46bb2 fix template bug that made hgweb break. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	777 })
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	778
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	779 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	780 req.form['cmd'] = [self.t.cache['default'],]
937 e4f1b76831b2 Whitespace mpm@selenic.com parents: 896 diff changeset	781
2119 f62195054c5b Cleaned hgweb.py a little bit Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2113 diff changeset	782 cmd = req.form['cmd'][0]
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 572 diff changeset	783
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	784 method = getattr(self, 'do_' + cmd, None)
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	785 if method:
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	786 method(req)
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	787 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	788 req.write(self.t("error"))
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	789
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	790 def changectx(self, req):
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	791 if req.form.has_key('node'):
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	792 changeid = req.form['node'][0]
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	793 else:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	794 changeid = req.form['manifest'][0]
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	795 try:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	796 ctx = self.repo.changectx(changeid)
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	797 except hg.RepoError:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	798 man = self.repo.manifest
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	799 mn = man.lookup(changeid)
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	800 ctx = self.repo.changectx(man.linkrev(mn))
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	801
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	802 return ctx
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	803
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	804 def filectx(self, req):
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	805 path = self.cleanpath(req.form['file'][0])
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	806 if req.form.has_key('node'):
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	807 changeid = req.form['node'][0]
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	808 else:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	809 changeid = req.form['filenode'][0]
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	810 try:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	811 ctx = self.repo.changectx(changeid)
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	812 fctx = ctx.filectx(path)
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	813 except hg.RepoError:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	814 fctx = self.repo.filectx(path, fileid=changeid)
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	815
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	816 return fctx
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	817
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	818 def stripes(self, parity):
ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	819 "make horizontal stripes for easier reading"
ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	820 if self.stripecount:
ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	821 return (1 + parity / self.stripecount) & 1
ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	822 else:
ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	823 return 0
ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	824
3266 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	825 def do_log(self, req):
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	826 if req.form.has_key('file') and req.form['file'][0]:
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	827 self.do_filelog(req)
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	828 else:
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	829 self.do_changelog(req)
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	830
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	831 def do_rev(self, req):
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	832 self.do_changeset(req)
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	833
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	834 def do_file(self, req):
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	835 path = req.form.get('file', [''])[0]
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	836 if path:
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	837 try:
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	838 req.write(self.filerevision(self.filectx(req)))
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	839 return
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	840 except hg.RepoError:
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	841 pass
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	842 path = self.cleanpath(path)
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	843
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	844 req.write(self.manifest(self.changectx(req), '/' + path))
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	845
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	846 def do_diff(self, req):
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	847 self.do_filediff(req)
1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3237 diff changeset	848
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	849 def do_changelog(self, req, shortlog = False):
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	850 if req.form.has_key('node'):
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	851 ctx = self.changectx(req)
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	852 else:
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	853 if req.form.has_key('rev'):
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	854 hi = req.form['rev'][0]
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	855 else:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	856 hi = self.repo.changelog.count() - 1
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	857 try:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	858 ctx = self.repo.changectx(hi)
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	859 except hg.RepoError:
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	860 req.write(self.search(hi)) # XXX redirect to 404 page?
5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	861 return
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	862
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	863 req.write(self.changelog(ctx, shortlog = shortlog))
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	864
2684 783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	865 def do_shortlog(self, req):
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	866 self.do_changelog(req, shortlog = True)
2684 783220e5d2d1 [hgweb] Implemented shortlog (gitweb templates only) Josef "Jeff" Sipek <jeffpc@josefsipek.net> parents: 2683 diff changeset	867
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	868 def do_changeset(self, req):
3226 325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	869 ctx = self.repo.changectx(req.form['node'][0])
325278542ea8 hgweb: use contexts in more handlers Brendan Cully <brendan@kublai.com> parents: 3214 diff changeset	870 req.write(self.changeset(ctx))
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	871
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	872 def do_manifest(self, req):
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	873 req.write(self.manifest(self.changectx(req),
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	874 self.cleanpath(req.form['path'][0])))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	875
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	876 def do_tags(self, req):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	877 req.write(self.tags())
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	878
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	879 def do_summary(self, req):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	880 req.write(self.summary())
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	881
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	882 def do_filediff(self, req):
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	883 req.write(self.filediff(self.filectx(req)))
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	884
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	885 def do_annotate(self, req):
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	886 req.write(self.fileannotate(self.filectx(req)))
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	887
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	888 def do_filelog(self, req):
3232 5c6028778c5a hgweb: add methods to get contexts from request Brendan Cully <brendan@kublai.com> parents: 3226 diff changeset	889 req.write(self.filelog(self.filectx(req)))
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	890
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	891 def do_heads(self, req):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	892 resp = " ".join(map(hex, self.repo.heads())) + "\n"
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	893 req.httphdr("application/mercurial-0.1", length=len(resp))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	894 req.write(resp)
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	895
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	896 def do_branches(self, req):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	897 nodes = []
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	898 if req.form.has_key('nodes'):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	899 nodes = map(bin, req.form['nodes'][0].split(" "))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	900 resp = cStringIO.StringIO()
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	901 for b in self.repo.branches(nodes):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	902 resp.write(" ".join(map(hex, b)) + "\n")
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	903 resp = resp.getvalue()
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	904 req.httphdr("application/mercurial-0.1", length=len(resp))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	905 req.write(resp)
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	906
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	907 def do_between(self, req):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	908 if req.form.has_key('pairs'):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	909 pairs = [map(bin, p.split("-"))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	910 for p in req.form['pairs'][0].split(" ")]
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	911 resp = cStringIO.StringIO()
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	912 for b in self.repo.between(pairs):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	913 resp.write(" ".join(map(hex, b)) + "\n")
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	914 resp = resp.getvalue()
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	915 req.httphdr("application/mercurial-0.1", length=len(resp))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	916 req.write(resp)
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	917
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	918 def do_changegroup(self, req):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	919 req.httphdr("application/mercurial-0.1")
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	920 nodes = []
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	921 if not self.allowpull:
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	922 return
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	923
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	924 if req.form.has_key('roots'):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	925 nodes = map(bin, req.form['roots'][0].split(" "))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	926
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	927 z = zlib.compressobj()
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	928 f = self.repo.changegroup(nodes, 'serve')
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	929 while 1:
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	930 chunk = f.read(4096)
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	931 if not chunk:
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	932 break
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	933 req.write(z.compress(chunk))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	934
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	935 req.write(z.flush())
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	936
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	937 def do_archive(self, req):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	938 changeset = self.repo.lookup(req.form['node'][0])
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	939 type_ = req.form['type'][0]
2500 76ff5efe8181 Fixed [web] allow_archive for comma separated parameters by using ui.configlist. Thomas Arendsen Hein <thomas@intevation.de> parents: 2466 diff changeset	940 allowed = self.repo.ui.configlist("web", "allow_archive")
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	941 if (type_ in self.archives and (type_ in allowed or
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	942 self.repo.ui.configbool("web", "allow" + type_, False))):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	943 self.archive(req, changeset, type_)
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	944 return
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	945
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	946 req.write(self.t("error"))
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	947
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	948 def do_static(self, req):
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	949 fname = req.form['file'][0]
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	950 static = self.repo.ui.config("web", "static",
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	951 os.path.join(self.templatepath,
f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	952 "static"))
2514 419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	953 req.write(staticfile(static, fname, req)
2436 f910b91dd912 hgweb: split "verbs" into methods. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2434 diff changeset	954 or self.t("error", error="%r not found" % fname))
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2436 diff changeset	955
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2436 diff changeset	956 def do_capabilities(self, req):
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	957 caps = ['unbundle']
2622 064aef9162cc rename stream hgrc option to compressed. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2621 diff changeset	958 if self.repo.ui.configbool('server', 'uncompressed'):
2621 5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	959 caps.append('stream=%d' % self.repo.revlogversion)
5a5852a417b1 clone: disable stream support on server side by default. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	960 resp = ' '.join(caps)
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2436 diff changeset	961 req.httphdr("application/mercurial-0.1", length=len(resp))
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2436 diff changeset	962 req.write(resp)
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2436 diff changeset	963
2466 e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	964 def check_perm(self, req, op, default):
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	965 '''check permission for operation based on user auth.
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	966 return true if op allowed, else false.
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	967 default is policy to use if no config given.'''
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	968
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	969 user = req.env.get('REMOTE_USER')
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	970
2501 b73552a00b20 Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist. Thomas Arendsen Hein <thomas@intevation.de> parents: 2500 diff changeset	971 deny = self.repo.ui.configlist('web', 'deny_' + op)
2466 e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	972 if deny and (not user or deny == ['*'] or user in deny):
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	973 return False
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	974
2501 b73552a00b20 Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist. Thomas Arendsen Hein <thomas@intevation.de> parents: 2500 diff changeset	975 allow = self.repo.ui.configlist('web', 'allow_' + op)
2466 e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	976 return (allow and (allow == ['*'] or user in allow)) or default
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	977
2464 09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	978 def do_unbundle(self, req):
2466 e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	979 def bail(response, headers={}):
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	980 length = int(req.env['CONTENT_LENGTH'])
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	981 for s in util.filechunkiter(req, limit=length):
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	982 # drain incoming bundle, else client will not see
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	983 # response when run outside cgi script
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	984 pass
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	985 req.httphdr("application/mercurial-0.1", headers=headers)
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	986 req.write('0\n')
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	987 req.write(response)
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	988
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	989 # require ssl by default, auth info cannot be sniffed and
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	990 # replayed
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	991 ssl_req = self.repo.ui.configbool('web', 'push_ssl', True)
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	992 if ssl_req:
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	993 if not req.env.get('HTTPS'):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	994 bail(_('ssl required\n'))
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	995 return
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	996 proto = 'https'
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	997 else:
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	998 proto = 'http'
2466 e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	999
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1000 # do not allow push unless explicitly allowed
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1001 if not self.check_perm(req, 'push', False):
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1002 bail(_('push not authorized\n'),
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1003 headers={'status': '401 Unauthorized'})
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1004 return
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1005
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1006 req.httphdr("application/mercurial-0.1")
e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1007
2464 09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1008 their_heads = req.form['heads'][0].split(' ')
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1009
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1010 def check_heads():
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1011 heads = map(hex, self.repo.heads())
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1012 return their_heads == [hex('force')] or their_heads == heads
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1013
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1014 # fail early if possible
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1015 if not check_heads():
2466 e10665147d26 push over http: server side authorization support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2464 diff changeset	1016 bail(_('unsynced changes\n'))
2464 09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1017 return
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1018
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1019 # do not lock repo until all changegroup data is
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1020 # streamed. save to temporary file.
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1021
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1022 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1023 fp = os.fdopen(fd, 'wb+')
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1024 try:
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1025 length = int(req.env['CONTENT_LENGTH'])
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1026 for s in util.filechunkiter(req, limit=length):
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1027 fp.write(s)
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1028
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1029 lock = self.repo.lock()
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1030 try:
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1031 if not check_heads():
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1032 req.write('0\n')
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1033 req.write(_('unsynced changes\n'))
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1034 return
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1035
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1036 fp.seek(0)
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1037
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1038 # send addchangegroup output to client
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1039
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1040 old_stdout = sys.stdout
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1041 sys.stdout = cStringIO.StringIO()
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1042
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1043 try:
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	1044 url = 'remote:%s:%s' % (proto,
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	1045 req.env.get('REMOTE_HOST', ''))
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2666 diff changeset	1046 ret = self.repo.addchangegroup(fp, 'serve', url)
2464 09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1047 finally:
2558 1120302009d7 hgweb: fix unbundle. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2538 diff changeset	1048 val = sys.stdout.getvalue()
2464 09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1049 sys.stdout = old_stdout
2558 1120302009d7 hgweb: fix unbundle. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2538 diff changeset	1050 req.write('%d\n' % ret)
1120302009d7 hgweb: fix unbundle. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2538 diff changeset	1051 req.write(val)
2464 09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1052 finally:
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1053 lock.release()
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1054 finally:
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1055 fp.close()
09b1c9ef317c push over http: server support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	1056 os.unlink(tempname)
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2580 diff changeset	1057
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2580 diff changeset	1058 def do_stream_out(self, req):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2580 diff changeset	1059 req.httphdr("application/mercurial-0.1")
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2580 diff changeset	1060 streamclone.stream_out(self.repo, req)

Mercurial > hg > gitserve

annotate mercurial/hgweb/hgweb_mod.py @ 3280:e0cd1b98bf8d