mercurial-scm/hg-stable: mercurial/hgweb.py annotate

annotate mercurial/hgweb.py @ 987:bfe12654764d

hgweb: change startup argument processing - allow passing a repo object instead of a path (if we get a string, we construct a repo object) - hg serve: pass options via repo.ui.setconfig - add --style option - get default name from repo.root rather than getcwd() - remove template argument to hgweb() - reduce create_server from 8 args to 1

author	mpm@selenic.com
date	Sun, 21 Aug 2005 15:56:14 -0700
parents	2810c625ca98
children	31dcaf9123ba

rev	line source
238 3b92f8fe47ae hgweb.py: kill #! line, clean up copyright notice mpm@selenic.com parents: 222 diff changeset	1 # hgweb.py - web interface to a mercurial repository
131 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>
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 572 diff changeset	4 # Copyright 2005 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
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	9 import os, cgi, time, re, difflib, socket, sys, zlib
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	10 from mercurial.hg import *
215 9ff5a78d0c45 hgweb: import ui mpm@selenic.com parents: 201 diff changeset	11 from mercurial.ui import *
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	12
157 2653740d8118 Install the templates where they can be found by hgweb.py mpm@selenic.com parents: 156 diff changeset	13 def templatepath():
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	14 for f in "templates", "../templates":
157 2653740d8118 Install the templates where they can be found by hgweb.py mpm@selenic.com parents: 156 diff changeset	15 p = os.path.join(os.path.dirname(__file__), f)
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	16 if os.path.isdir(p): return p
157 2653740d8118 Install the templates where they can be found by hgweb.py mpm@selenic.com parents: 156 diff changeset	17
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	18 def age(t):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	19 def plural(t, c):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	20 if c == 1: return t
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	21 return t + "s"
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	22 def fmt(t, c):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	23 return "%d %s" % (c, plural(t, c))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	24
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	25 now = time.time()
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	26 delta = max(1, int(now - t))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	27
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	28 scales = [["second", 1],
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	29 ["minute", 60],
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	30 ["hour", 3600],
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	31 ["day", 3600 * 24],
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	32 ["week", 3600 * 24 * 7],
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	33 ["month", 3600 * 24 * 30],
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	34 ["year", 3600 * 24 * 365]]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	35
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	36 scales.reverse()
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	37
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	38 for t, s in scales:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	39 n = delta / s
195 b98bcf66dd9d hgweb: make age() smarter mpm@selenic.com parents: 183 diff changeset	40 if n >= 2 or s == 1: return fmt(t, n)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	41
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	42 def nl2br(text):
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	43 return text.replace('\n', '<br/>\n')
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	44
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	45 def obfuscate(text):
533 b8404005d6d5 [PATCH] Generate correctly XML entities for obfuscated user mpm@selenic.com parents: 515 diff changeset	46 return ''.join([ '&#%d;' % ord(c) for c in text ])
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	47
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	48 def up(p):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	49 if p[0] != "/": p = "/" + p
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	50 if p[-1] == "/": p = p[:-1]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	51 up = os.path.dirname(p)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	52 if up == "/":
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	53 return "/"
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	54 return up + "/"
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	55
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	56 def httphdr(type):
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 575 diff changeset	57 sys.stdout.write('Content-type: %s\n\n' % type)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	58
135 c0faf50822ea change template to a generator jake@edge2.net parents: 134 diff changeset	59 def write(*things):
c0faf50822ea change template to a generator jake@edge2.net parents: 134 diff changeset	60 for thing in things:
c0faf50822ea change template to a generator jake@edge2.net parents: 134 diff changeset	61 if hasattr(thing, "__iter__"):
c0faf50822ea change template to a generator jake@edge2.net parents: 134 diff changeset	62 for part in thing:
c0faf50822ea change template to a generator jake@edge2.net parents: 134 diff changeset	63 write(part)
c0faf50822ea change template to a generator jake@edge2.net parents: 134 diff changeset	64 else:
c0faf50822ea change template to a generator jake@edge2.net parents: 134 diff changeset	65 sys.stdout.write(str(thing))
c0faf50822ea change template to a generator jake@edge2.net parents: 134 diff changeset	66
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	67 class templater:
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	68 def __init__(self, mapfile, filters = {}, defaults = {}):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	69 self.cache = {}
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	70 self.map = {}
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	71 self.base = os.path.dirname(mapfile)
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	72 self.filters = filters
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	73 self.defaults = defaults
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	74
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	75 for l in file(mapfile):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	76 m = re.match(r'(\S+)\s=\s"(.*)"$', l)
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	77 if m:
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	78 self.cache[m.group(1)] = m.group(2)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	79 else:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	80 m = re.match(r'(\S+)\s=\s(\S+)', l)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	81 if m:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	82 self.map[m.group(1)] = os.path.join(self.base, m.group(2))
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	83 else:
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	84 raise "unknown map entry '%s'" % l
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	85
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	86 def __call__(self, t, **map):
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	87 m = self.defaults.copy()
8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	88 m.update(map)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	89 try:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	90 tmpl = self.cache[t]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	91 except KeyError:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	92 tmpl = self.cache[t] = file(self.map[t]).read()
974 aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	93 return self.template(tmpl, self.filters, **m)
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	94
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	95 def template(self, tmpl, filters = {}, **map):
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	96 while tmpl:
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	97 m = re.search(r"#([a-zA-Z0-9]+)((%[a-zA-Z0-9]+))((\\|[a-zA-Z0-9]+))#", tmpl)
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	98 if m:
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	99 yield tmpl[:m.start(0)]
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	100 v = map.get(m.group(1), "")
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	101 v = callable(v) and v(**map) or v
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	102
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	103 format = m.group(2)
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	104 fl = m.group(4)
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	105
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	106 if format:
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	107 q = v.__iter__
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	108 for i in q():
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	109 lm = map.copy()
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	110 lm.update(i)
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	111 yield self(format[1:], **lm)
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	112
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	113 v = ""
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	114
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	115 elif fl:
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	116 for f in fl.split("\|")[1:]:
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	117 v = filters[f](v)
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	118
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	119 yield v
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	120 tmpl = tmpl[m.end(0):]
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	121 else:
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	122 yield tmpl
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	123 return
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	124
599 765182a4c843 [PATCH] Add RSS support to hgweb mpm@selenic.com parents: 598 diff changeset	125 def rfc822date(x):
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	126 return time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime(x))
599 765182a4c843 [PATCH] Add RSS support to hgweb mpm@selenic.com parents: 598 diff changeset	127
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	128 common_filters = {
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	129 "escape": cgi.escape,
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	130 "age": age,
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	131 "date": (lambda x: time.asctime(time.gmtime(x))),
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	132 "addbreaks": nl2br,
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	133 "obfuscate": obfuscate,
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	134 "short": (lambda x: x[:12]),
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	135 "firstline": (lambda x: x.splitlines(1)[0]),
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	136 "permissions": (lambda x: x and "-rwxr-xr-x" or "-rw-r--r--"),
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	137 "rfc822date": rfc822date,
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	138 }
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	139
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	140 class hgweb:
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	141 def __init__(self, repo, name=None):
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	142 if type(repo) == type(""):
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	143 self.repo = repository(ui(), repo)
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	144 else:
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	145 self.repo = repo
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	146
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	147 self.mtime = -1
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	148 self.reponame = name or self.repo.ui.config("web", "name",
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	149 self.repo.root)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	150
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	151 def refresh(self):
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	152 s = os.stat(os.path.join(self.repo.root, ".hg", "00changelog.i"))
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	153 if s.st_mtime != self.mtime:
322 a0acae914e95 hgweb: Fix reloading of index mpm@selenic.com parents: 271 diff changeset	154 self.mtime = s.st_mtime
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	155 self.repo = repository(self.repo.ui, self.repo.root)
964 3f37720e7dc7 hgweb: Make maxfiles, maxchanges, and allowpull proper config options mpm@selenic.com parents: 957 diff changeset	156 self.maxchanges = self.repo.ui.config("web", "maxchanges", 10)
3f37720e7dc7 hgweb: Make maxfiles, maxchanges, and allowpull proper config options mpm@selenic.com parents: 957 diff changeset	157 self.maxfiles = self.repo.ui.config("web", "maxchanges", 10)
3f37720e7dc7 hgweb: Make maxfiles, maxchanges, and allowpull proper config options mpm@selenic.com parents: 957 diff changeset	158 self.allowpull = self.repo.ui.configbool("web", "allowpull", True)
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	159
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	160 def date(self, cs):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	161 return time.asctime(time.gmtime(float(cs[2].split(' ')[0])))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	162
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	163 def listfiles(self, files, mf):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	164 for f in files[:self.maxfiles]:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	165 yield self.t("filenodelink", node = hex(mf[f]), file = f)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	166 if len(files) > self.maxfiles:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	167 yield self.t("fileellipses")
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	168
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	169 def listfilediffs(self, files, changeset):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	170 for f in files[:self.maxfiles]:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	171 yield self.t("filedifflink", node = hex(changeset), file = f)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	172 if len(files) > self.maxfiles:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	173 yield self.t("fileellipses")
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	174
569 3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	175 def parents(self, t1, nodes=[], rev=None,**args):
3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	176 if not rev: rev = lambda x: ""
3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	177 for node in nodes:
3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	178 if node != nullid:
3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	179 yield self.t(t1, node = hex(node), rev = rev(node), **args)
3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	180
568 e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	181 def showtag(self, t1, node=nullid, **args):
e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	182 for t in self.repo.nodetags(node):
e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	183 yield self.t(t1, tag = t, **args)
e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	184
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	185 def diff(self, node1, node2, files):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	186 def filterfiles(list, files):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	187 l = [ x for x in list if x in files ]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	188
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	189 for f in files:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	190 if f[-1] != os.sep: f += os.sep
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	191 l += [ x for x in list if x.startswith(f) ]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	192 return l
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	193
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	194 parity = [0]
e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	195 def diffblock(diff, f, fn):
e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	196 yield self.t("diffblock",
e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	197 lines = prettyprintlines(diff),
e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	198 parity = parity[0],
e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	199 file = f,
369 09f24af48b82 hgweb: fix deleted file in changeset key error mpm@selenic.com parents: 366 diff changeset	200 filenode = hex(fn or nullid))
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	201 parity[0] = 1 - parity[0]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	202
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	203 def prettyprintlines(diff):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	204 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	205 if l.startswith('+'):
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	206 yield self.t("difflineplus", line = l)
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	207 elif l.startswith('-'):
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	208 yield self.t("difflineminus", line = l)
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	209 elif l.startswith('@'):
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	210 yield self.t("difflineat", line = l)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	211 else:
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	212 yield self.t("diffline", line = l)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	213
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	214 r = self.repo
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	215 cl = r.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	216 mf = r.manifest
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	217 change1 = cl.read(node1)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	218 change2 = cl.read(node2)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	219 mmap1 = mf.read(change1[0])
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	220 mmap2 = mf.read(change2[0])
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	221 date1 = self.date(change1)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	222 date2 = self.date(change2)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	223
539 44b29b98254a Minor hgweb fixup for new diff code mpm@selenic.com parents: 538 diff changeset	224 c, a, d, u = r.changes(node1, node2)
645 a55048b2ae3a this patch permits hgweb to show the deleted files in the changeset diff kreijack@inwind.REMOVEME.it parents: 635 diff changeset	225 if files:
a55048b2ae3a this patch permits hgweb to show the deleted files in the changeset diff kreijack@inwind.REMOVEME.it parents: 635 diff changeset	226 c, a, d = map(lambda x: filterfiles(x, files), (c, a, d))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	227
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	228 for f in c:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	229 to = r.file(f).read(mmap1[f])
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	230 tn = r.file(f).read(mmap2[f])
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	231 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	232 for f in a:
265 7ca05593bd30 hgweb: fix non-existent source or destination for diff mpm@selenic.com parents: 258 diff changeset	233 to = None
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	234 tn = r.file(f).read(mmap2[f])
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	235 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	236 for f in d:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	237 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	238 tn = None
172 e9b1147db448 hgweb: alternating colors for multifile diffs mpm@selenic.com parents: 168 diff changeset	239 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	240
180 f25944662097 hgweb: Fix navigate to 0 bug mpm@selenic.com parents: 173 diff changeset	241 def changelog(self, pos):
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	242 def changenav(**map):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	243 def seq(factor = 1):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	244 yield 1 * factor
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	245 yield 3 * factor
8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	246 #yield 5 * factor
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	247 for f in seq(factor * 10):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	248 yield f
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	249
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	250 l = []
8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	251 for f in seq():
8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	252 if f < self.maxchanges / 2: continue
8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	253 if f > count: break
8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	254 r = "%d" % f
351 9525208e1c1d hgweb: change number navigation tidy up mpm@selenic.com parents: 350 diff changeset	255 if pos + f < count: l.append(("+" + r, pos + f))
9525208e1c1d hgweb: change number navigation tidy up mpm@selenic.com parents: 350 diff changeset	256 if pos - f >= 0: l.insert(0, ("-" + r, pos - f))
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	257
975 bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	258 yield {"rev": 0, "label": "(0)"}
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	259
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	260 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	261 yield {"label": label, "rev": rev}
173 8da1df932c16 hgweb: make navigation of changesets a bit nicer mpm@selenic.com parents: 172 diff changeset	262
975 bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	263 yield {"label": "tip", "rev": ""}
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	264
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	265 def changelist(**map):
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	266 parity = (start - end) & 1
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	267 cl = self.repo.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	268 l = [] # build a list in forward order for efficiency
351 9525208e1c1d hgweb: change number navigation tidy up mpm@selenic.com parents: 350 diff changeset	269 for i in range(start, end):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	270 n = cl.node(i)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	271 changes = cl.read(n)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	272 hn = hex(n)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	273 t = float(changes[2].split(' ')[0])
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	274
975 bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	275 l.insert(0, {
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	276 "parity": parity,
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	277 "author": changes[1],
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	278 "parent": self.parents("changelogparent",
569 3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	279 cl.parents(n), cl.rev),
975 bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	280 "changelogtag": self.showtag("changelogtag",n),
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	281 "manifest": hex(changes[0]),
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	282 "desc": changes[4],
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	283 "date": t,
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	284 "files": self.listfilediffs(changes[3], n),
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	285 "rev": i,
bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	286 "node": hn})
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	287 parity = 1 - parity
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	288
975 bdd7c53fca00 hgweb: Changed changelog page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 974 diff changeset	289 for e in l: yield e
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	290
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	291 cl = self.repo.changelog
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	292 mf = cl.read(cl.tip())[0]
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	293 count = cl.count()
351 9525208e1c1d hgweb: change number navigation tidy up mpm@selenic.com parents: 350 diff changeset	294 start = max(0, pos - self.maxchanges + 1)
9525208e1c1d hgweb: change number navigation tidy up mpm@selenic.com parents: 350 diff changeset	295 end = min(count, start + self.maxchanges)
9525208e1c1d hgweb: change number navigation tidy up mpm@selenic.com parents: 350 diff changeset	296 pos = end - 1
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	297
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	298 yield self.t('changelog',
529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	299 changenav = changenav,
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	300 manifest = hex(mf),
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	301 rev = pos, changesets = count, entries = changelist)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	302
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	303 def search(self, query):
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	304
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	305 def changelist(**map):
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	306 cl = self.repo.changelog
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	307 count = 0
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	308 qw = query.lower().split()
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	309
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	310 def revgen():
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	311 for i in range(cl.count() - 1, 0, -100):
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	312 l = []
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	313 for j in range(max(0, i - 100), i):
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	314 n = cl.node(j)
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	315 changes = cl.read(n)
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	316 l.insert(0, (n, j, changes))
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	317 for e in l:
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	318 yield e
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	319
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	320 for n, i, changes in revgen():
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	321 miss = 0
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	322 for q in qw:
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	323 if not (q in changes[1].lower() or
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	324 q in changes[4].lower() or
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	325 q in " ".join(changes[3][:20]).lower()):
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	326 miss = 1
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	327 break
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	328 if miss: continue
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	329
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	330 count += 1
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	331 hn = hex(n)
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	332 t = float(changes[2].split(' ')[0])
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	333
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	334 yield self.t(
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	335 'searchentry',
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	336 parity = count & 1,
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	337 author = changes[1],
570 2ee819a950aa [PATCH 2/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 569 diff changeset	338 parent = self.parents("changelogparent",
569 3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	339 cl.parents(n), cl.rev),
568 e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	340 changelogtag = self.showtag("changelogtag",n),
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	341 manifest = hex(changes[0]),
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	342 desc = changes[4],
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	343 date = t,
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	344 files = self.listfilediffs(changes[3], n),
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	345 rev = i,
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	346 node = hn)
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	347
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	348 if count >= self.maxchanges: break
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	349
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	350 cl = self.repo.changelog
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	351 mf = cl.read(cl.tip())[0]
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	352
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	353 yield self.t('search',
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	354 query = query,
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	355 manifest = hex(mf),
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	356 entries = changelist)
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	357
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	358 def changeset(self, nodeid):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	359 n = bin(nodeid)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	360 cl = self.repo.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	361 changes = cl.read(n)
598 f8d44a2e6928 [PATCH 4/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 582 diff changeset	362 p1 = cl.parents(n)[0]
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	363 t = float(changes[2].split(' ')[0])
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	364
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	365 files = []
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	366 mf = self.repo.manifest.read(changes[0])
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	367 for f in changes[3]:
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	368 files.append(self.t("filenodelink",
369 09f24af48b82 hgweb: fix deleted file in changeset key error mpm@selenic.com parents: 366 diff changeset	369 filenode = hex(mf.get(f, nullid)), file = f))
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	370
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	371 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	372 yield self.diff(p1, n, None)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	373
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	374 yield self.t('changeset',
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	375 diff = diff,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	376 rev = cl.rev(n),
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	377 node = nodeid,
570 2ee819a950aa [PATCH 2/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 569 diff changeset	378 parent = self.parents("changesetparent",
569 3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	379 cl.parents(n), cl.rev),
568 e8fd41110dce [PATCH] Add tags to hgweb mpm@selenic.com parents: 547 diff changeset	380 changesettag = self.showtag("changesettag",n),
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	381 manifest = hex(changes[0]),
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	382 author = changes[1],
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	383 desc = changes[4],
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	384 date = t,
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	385 files = files)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	386
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	387 def filelog(self, f, filenode):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	388 cl = self.repo.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	389 fl = self.repo.file(f)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	390 count = fl.count()
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	391
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	392 def entries(**map):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	393 l = []
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	394 parity = (count - 1) & 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	395
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	396 for i in range(count):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	397
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	398 n = fl.node(i)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	399 lr = fl.linkrev(n)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	400 cn = cl.node(lr)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	401 cs = cl.read(cl.node(lr))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	402 t = float(cs[2].split(' ')[0])
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	403
978 ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	404 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	405 "filenode": hex(n),
ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	406 "filerev": i,
ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	407 "file": f,
ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	408 "node": hex(cn),
ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	409 "author": cs[1],
ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	410 "date": t,
ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	411 "parent": self.parents("filelogparent",
598 f8d44a2e6928 [PATCH 4/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 582 diff changeset	412 fl.parents(n), fl.rev, file=f),
978 ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	413 "desc": cs[4]})
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	414 parity = 1 - parity
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	415
978 ea67e5b37043 hgweb: Changed file revision page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 977 diff changeset	416 for e in l: yield e
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	417
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	418 yield self.t("filelog",
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	419 file = f,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	420 filenode = filenode,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	421 entries = entries)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	422
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	423 def filerevision(self, f, node):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	424 fl = self.repo.file(f)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	425 n = bin(node)
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	426 text = fl.read(n)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	427 changerev = fl.linkrev(n)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	428 cl = self.repo.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	429 cn = cl.node(changerev)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	430 cs = cl.read(cn)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	431 t = float(cs[2].split(' ')[0])
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	432 mfn = cs[0]
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	433
529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	434 def lines():
529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	435 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	436 yield {"line": t,
5d5ab159d197 hgweb: Changed file page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 975 diff changeset	437 "linenumber": "% 6d" % (l + 1),
5d5ab159d197 hgweb: Changed file page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 975 diff changeset	438 "parity": l & 1}
359 0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 351 diff changeset	439
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	440 yield self.t("filerevision", file = f,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	441 filenode = node,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	442 path = up(f),
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	443 text = lines(),
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	444 rev = changerev,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	445 node = hex(cn),
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	446 manifest = hex(mfn),
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	447 author = cs[1],
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	448 date = t,
570 2ee819a950aa [PATCH 2/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 569 diff changeset	449 parent = self.parents("filerevparent",
569 3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	450 fl.parents(n), fl.rev, file=f),
598 f8d44a2e6928 [PATCH 4/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 582 diff changeset	451 permissions = self.repo.manifest.readflags(mfn)[f])
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	452
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	453 def fileannotate(self, f, node):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	454 bcache = {}
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	455 ncache = {}
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	456 fl = self.repo.file(f)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	457 n = bin(node)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	458 changerev = fl.linkrev(n)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	459
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	460 cl = self.repo.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	461 cn = cl.node(changerev)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	462 cs = cl.read(cn)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	463 t = float(cs[2].split(' ')[0])
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	464 mfn = cs[0]
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	465
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	466 def annotate(**map):
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	467 parity = 1
529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	468 last = None
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	469 for r, l in fl.annotate(n):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	470 try:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	471 cnode = ncache[r]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	472 except KeyError:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	473 cnode = ncache[r] = self.repo.changelog.node(r)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	474
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	475 try:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	476 name = bcache[r]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	477 except KeyError:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	478 cl = self.repo.changelog.read(cnode)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	479 name = cl[1]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	480 f = name.find('@')
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	481 if f >= 0:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	482 name = name[:f]
534 ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 533 diff changeset	483 f = name.find('<')
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 533 diff changeset	484 if f >= 0:
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 533 diff changeset	485 name = name[f+1:]
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	486 bcache[r] = name
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	487
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	488 if last != cnode:
529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	489 parity = 1 - parity
529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	490 last = cnode
529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	491
977 289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	492 yield {"parity": parity,
289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	493 "node": hex(cnode),
289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	494 "rev": r,
289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	495 "author": name,
289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	496 "file": f,
289975641886 hgweb: Changed annotate page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 976 diff changeset	497 "line": l}
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	498
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	499 yield self.t("fileannotate",
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	500 file = f,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	501 filenode = node,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	502 annotate = annotate,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	503 path = up(f),
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	504 rev = changerev,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	505 node = hex(cn),
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	506 manifest = hex(mfn),
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	507 author = cs[1],
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	508 date = t,
570 2ee819a950aa [PATCH 2/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 569 diff changeset	509 parent = self.parents("fileannotateparent",
569 3e347929f5f9 [PATCH 1/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 568 diff changeset	510 fl.parents(n), fl.rev, file=f),
598 f8d44a2e6928 [PATCH 4/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 582 diff changeset	511 permissions = self.repo.manifest.readflags(mfn)[f])
136 0e8d60d2bb2b added annotate jake@edge2.net parents: 135 diff changeset	512
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	513 def manifest(self, mnode, path):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	514 mf = self.repo.manifest.read(bin(mnode))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	515 rev = self.repo.manifest.rev(bin(mnode))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	516 node = self.repo.changelog.node(rev)
359 0c4688e9ee5c hgweb: add file permissions mpm@selenic.com parents: 351 diff changeset	517 mff=self.repo.manifest.readflags(bin(mnode))
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	518
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	519 files = {}
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	520
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	521 p = path[1:]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	522 l = len(p)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	523
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	524 for f,n in mf.items():
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	525 if f[:l] != p:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	526 continue
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	527 remain = f[l:]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	528 if "/" in remain:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	529 short = remain[:remain.find("/") + 1] # bleah
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	530 files[short] = (f, None)
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	531 else:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	532 short = os.path.basename(remain)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	533 files[short] = (f, n)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	534
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	535 def filelist(**map):
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	536 parity = 0
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	537 fl = files.keys()
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	538 fl.sort()
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	539 for f in fl:
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	540 full, fnode = files[f]
979 87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	541 if not fnode:
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	542 continue
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	543
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	544 yield {"file": full,
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	545 "manifest": mnode,
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	546 "filenode": hex(fnode),
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	547 "parity": parity,
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	548 "basename": f,
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	549 "permissions": mff[full]}
142 529bf610092e Prettify the web interface mpm@selenic.com parents: 138 diff changeset	550 parity = 1 - parity
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	551
979 87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	552 def dirlist(**map):
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	553 parity = 0
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	554 fl = files.keys()
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	555 fl.sort()
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	556 for f in fl:
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	557 full, fnode = files[f]
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	558 if fnode:
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	559 continue
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	560
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	561 yield {"parity": parity,
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	562 "path": os.path.join(path, f),
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	563 "manifest": mnode,
980 5197fb9d65d5 Merge with MPM Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 979 939 diff changeset	564 "basename": f[:-1]}
979 87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	565 parity = 1 - parity
982 8d2e24bae760 hgweb: convert index entries to list expansion style mpm@selenic.com parents: 981 diff changeset	566
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	567 yield self.t("manifest",
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	568 manifest = mnode,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	569 rev = rev,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	570 node = hex(node),
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	571 path = path,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	572 up = up(path),
979 87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	573 fentries = filelist,
87d40e085e08 hgweb: Changed manifest page to list format syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 978 diff changeset	574 dentries = dirlist)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	575
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	576 def tags(self):
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	577 cl = self.repo.changelog
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	578 mf = cl.read(cl.tip())[0]
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	579
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 330 diff changeset	580 i = self.repo.tagslist()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 330 diff changeset	581 i.reverse()
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	582
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	583 def entries(**map):
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	584 parity = 0
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	585 for k,n in i:
974 aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	586 yield {"parity": parity,
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	587 "tag": k,
aedb47764f29 Added support for #foo%bar# syntax Josef "Jeff" Sipek <jeffpc@optonline.net> parents: 938 diff changeset	588 "node": hex(n)}
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	589 parity = 1 - parity
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	590
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	591 yield self.t("tags",
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	592 manifest = hex(mf),
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	593 entries = entries)
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	594
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	595 def filediff(self, file, changeset):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	596 n = bin(changeset)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	597 cl = self.repo.changelog
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	598 p1 = cl.parents(n)[0]
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	599 cs = cl.read(n)
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	600 mf = self.repo.manifest.read(cs[0])
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	601
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	602 def diff(**map):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	603 yield self.diff(p1, n, file)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	604
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	605 yield self.t("filediff",
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	606 file = file,
376 fadc9e126369 hgweb: fix deleted file in filediff key error Thomas Arendsen Hein <thomas@intevation.de> parents: 369 diff changeset	607 filenode = hex(mf.get(file, nullid)),
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	608 node = changeset,
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	609 rev = self.repo.changelog.rev(n),
571 c7364b985ca2 [PATCH 3/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 570 diff changeset	610 parent = self.parents("filediffparent",
c7364b985ca2 [PATCH 3/5]: cleaning the template parent management in hgweb mpm@selenic.com parents: 570 diff changeset	611 cl.parents(n), cl.rev),
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	612 diff = diff)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	613
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	614 # add tags to things
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	615 # tags -> list of changesets corresponding to tags
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	616 # find tag, changeset, file
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	617
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	618 def run(self):
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	619 def header(**map):
41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	620 yield self.t("header", **map)
41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	621
41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	622 def footer(**map):
41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	623 yield self.t("footer", **map)
41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	624
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	625 self.refresh()
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	626 args = cgi.parse()
210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	627
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	628 t = self.repo.ui.config("web", "templates", templatepath())
938 54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	629 m = os.path.join(t, "map")
986 2810c625ca98 Add web:style option mpm@selenic.com parents: 984 diff changeset	630 style = self.repo.ui.config("web", "style", "")
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	631 if args.has_key('style'):
986 2810c625ca98 Add web:style option mpm@selenic.com parents: 984 diff changeset	632 style = args['style'][0]
2810c625ca98 Add web:style option mpm@selenic.com parents: 984 diff changeset	633 if style:
2810c625ca98 Add web:style option mpm@selenic.com parents: 984 diff changeset	634 b = os.path.basename("map-" + style)
983 4a988dc8d9b8 Fix RSS feeds mpm@selenic.com parents: 982 diff changeset	635 p = os.path.join(t, b)
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	636 if os.path.isfile(p): m = p
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	637
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	638 port = os.environ["SERVER_PORT"]
8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	639 port = port != "80" and (":" + port) or ""
620 7369ec5d93f2 Attempt to handle RSS URIs properly Matt Mackall <mpm@selenic.com> parents: 605 diff changeset	640 uri = os.environ["REQUEST_URI"]
7369ec5d93f2 Attempt to handle RSS URIs properly Matt Mackall <mpm@selenic.com> parents: 605 diff changeset	641 if "?" in uri: uri = uri.split("?")[0]
7369ec5d93f2 Attempt to handle RSS URIs properly Matt Mackall <mpm@selenic.com> parents: 605 diff changeset	642 url = "http://%s%s%s" % (os.environ["SERVER_NAME"], port, uri)
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	643
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	644 self.t = templater(m, common_filters,
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	645 {"url":url,
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	646 "repo":self.reponame,
857 41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	647 "header":header,
41b344235bb7 [PATCH] Propagate the template map though recursively Jeff Sipek <jeffpc@optonline.net> parents: 839 diff changeset	648 "footer":footer,
601 8865eb8ade99 Add globals to templater/fixup RSS mpm@selenic.com parents: 600 diff changeset	649 })
201 f918a6fa2572 hgweb: add template filters, template style maps, and raw pages mpm@selenic.com parents: 198 diff changeset	650
858 c333dfa8fa1a [PATCH] Move default page name into map file Jeff Sipek <jeffpc@optonline.net> parents: 857 diff changeset	651 if not args.has_key('cmd'):
c333dfa8fa1a [PATCH] Move default page name into map file Jeff Sipek <jeffpc@optonline.net> parents: 857 diff changeset	652 args['cmd'] = [self.t.cache['default'],]
937 e4f1b76831b2 Whitespace mpm@selenic.com parents: 896 diff changeset	653
858 c333dfa8fa1a [PATCH] Move default page name into map file Jeff Sipek <jeffpc@optonline.net> parents: 857 diff changeset	654 if args['cmd'][0] == 'changelog':
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	655 c = self.repo.changelog.count() - 1
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	656 hi = c
153 e8a360cd5a9f changed pos to rev for changelog cmd, changed & to ; jake@edge2.net parents: 142 diff changeset	657 if args.has_key('rev'):
165 7fc8385df514 Add tag/rev/node search to hgweb mpm@selenic.com parents: 158 diff changeset	658 hi = args['rev'][0]
166 39624c47060f hgweb: don't blow up on search for unknown keys mpm@selenic.com parents: 165 diff changeset	659 try:
39624c47060f hgweb: don't blow up on search for unknown keys mpm@selenic.com parents: 165 diff changeset	660 hi = self.repo.changelog.rev(self.repo.lookup(hi))
688 b50cd98bb7e4 Repair the hgweb search interface mpm@selenic.com parents: 645 diff changeset	661 except RepoError:
538 7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	662 write(self.search(hi))
7140bc781655 Add multiple keyword search to hgweb mpm@selenic.com parents: 536 diff changeset	663 return
575 7f5ce4bbdd7b More whitespace cleanups mpm@selenic.com parents: 572 diff changeset	664
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	665 write(self.changelog(hi))
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	666
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	667 elif args['cmd'][0] == 'changeset':
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	668 write(self.changeset(args['node'][0]))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	669
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	670 elif args['cmd'][0] == 'manifest':
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	671 write(self.manifest(args['manifest'][0], args['path'][0]))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	672
168 65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	673 elif args['cmd'][0] == 'tags':
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	674 write(self.tags())
65cf1b0cfe86 hgweb: add tags links and manifest links mpm@selenic.com parents: 166 diff changeset	675
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	676 elif args['cmd'][0] == 'filediff':
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	677 write(self.filediff(args['file'][0], args['node'][0]))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	678
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	679 elif args['cmd'][0] == 'file':
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	680 write(self.filerevision(args['file'][0], args['filenode'][0]))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	681
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	682 elif args['cmd'][0] == 'annotate':
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	683 write(self.fileannotate(args['file'][0], args['filenode'][0]))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	684
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	685 elif args['cmd'][0] == 'filelog':
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	686 write(self.filelog(args['file'][0], args['filenode'][0]))
136 0e8d60d2bb2b added annotate jake@edge2.net parents: 135 diff changeset	687
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 215 diff changeset	688 elif args['cmd'][0] == 'heads':
751 0b245edec124 When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg) Muli Ben-Yehuda <mulix@mulix.org> parents: 688 diff changeset	689 httphdr("application/mercurial-0.1")
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 215 diff changeset	690 h = self.repo.heads()
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 215 diff changeset	691 sys.stdout.write(" ".join(map(hex, h)) + "\n")
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 215 diff changeset	692
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	693 elif args['cmd'][0] == 'branches':
751 0b245edec124 When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg) Muli Ben-Yehuda <mulix@mulix.org> parents: 688 diff changeset	694 httphdr("application/mercurial-0.1")
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	695 nodes = []
210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	696 if args.has_key('nodes'):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	697 nodes = map(bin, args['nodes'][0].split(" "))
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	698 for b in self.repo.branches(nodes):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	699 sys.stdout.write(" ".join(map(hex, b)) + "\n")
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	700
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	701 elif args['cmd'][0] == 'between':
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 751 diff changeset	702 httphdr("application/mercurial-0.1")
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	703 nodes = []
210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	704 if args.has_key('pairs'):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	705 pairs = [ map(bin, p.split("-"))
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	706 for p in args['pairs'][0].split(" ") ]
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	707 for b in self.repo.between(pairs):
c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	708 sys.stdout.write(" ".join(map(hex, b)) + "\n")
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	709
210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	710 elif args['cmd'][0] == 'changegroup':
751 0b245edec124 When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg) Muli Ben-Yehuda <mulix@mulix.org> parents: 688 diff changeset	711 httphdr("application/mercurial-0.1")
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	712 nodes = []
964 3f37720e7dc7 hgweb: Make maxfiles, maxchanges, and allowpull proper config options mpm@selenic.com parents: 957 diff changeset	713 if not self.allowpull:
197 b388603984fc hgweb: add view-only support mpm@selenic.com parents: 195 diff changeset	714 return
b388603984fc hgweb: add view-only support mpm@selenic.com parents: 195 diff changeset	715
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	716 if args.has_key('roots'):
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	717 nodes = map(bin, args['roots'][0].split(" "))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	718
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	719 z = zlib.compressobj()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 620 diff changeset	720 f = self.repo.changegroup(nodes)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 620 diff changeset	721 while 1:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 620 diff changeset	722 chunk = f.read(4096)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 620 diff changeset	723 if not chunk: break
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	724 sys.stdout.write(z.compress(chunk))
210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	725
210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	726 sys.stdout.write(z.flush())
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	727
132 210eeb6f5197 making hgweb class jake@edge2.net parents: 131 diff changeset	728 else:
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	729 write(self.t("error"))
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	730
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	731 def create_server(repo):
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	732
938 54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	733 def openlog(opt, default):
54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	734 if opt and opt != '-':
54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	735 return open(opt, 'w')
54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	736 return default
54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	737
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	738 address = repo.ui.config("web", "address", "")
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	739 port = int(repo.ui.config("web", "port", 8000))
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	740 use_ipv6 = repo.ui.configbool("web", "ipv6")
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	741 accesslog = openlog(repo.ui.config("web", "accesslog", "-"), sys.stdout)
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	742 errorlog = openlog(repo.ui.config("web", "errorlog", "-"), sys.stderr)
938 54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 937 diff changeset	743
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	744 import BaseHTTPServer
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	745
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	746 class IPv6HTTPServer(BaseHTTPServer.HTTPServer):
881 16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	747 address_family = getattr(socket, 'AF_INET6', None)
16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	748
16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	749 def __init__(self, args, *kwargs):
16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	750 if self.address_family is None:
16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	751 raise RepoError('IPv6 not available on this system')
16ce690c411d Fix problem with "hg serve" on systems not providing IPv6. Bryan O'Sullivan <bos@serpentine.com> parents: 858 diff changeset	752 BaseHTTPServer.HTTPServer.__init__(self, args, *kwargs)
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	753
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	754 class hgwebhandler(BaseHTTPServer.BaseHTTPRequestHandler):
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	755 def log_error(self, format, *args):
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	756 errorlog.write("%s - - [%s] %s\n" % (self.address_string(),
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	757 self.log_date_time_string(),
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	758 format % args))
937 e4f1b76831b2 Whitespace mpm@selenic.com parents: 896 diff changeset	759
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	760 def log_message(self, format, *args):
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	761 accesslog.write("%s - - [%s] %s\n" % (self.address_string(),
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	762 self.log_date_time_string(),
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	763 format % args))
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	764
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	765 def do_POST(self):
271 35acefbf0ae6 hgweb: ignore pipe errors mpm@selenic.com parents: 269 diff changeset	766 try:
35acefbf0ae6 hgweb: ignore pipe errors mpm@selenic.com parents: 269 diff changeset	767 self.do_hgweb()
35acefbf0ae6 hgweb: ignore pipe errors mpm@selenic.com parents: 269 diff changeset	768 except socket.error, inst:
35acefbf0ae6 hgweb: ignore pipe errors mpm@selenic.com parents: 269 diff changeset	769 if inst.args[0] != 32: raise
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	770
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	771 def do_GET(self):
271 35acefbf0ae6 hgweb: ignore pipe errors mpm@selenic.com parents: 269 diff changeset	772 self.do_POST()
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	773
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	774 def do_hgweb(self):
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	775 query = ""
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	776 p = self.path.find("?")
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	777 if p:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	778 query = self.path[p + 1:]
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	779 query = query.replace('+', ' ')
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 391 diff changeset	780
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	781 env = {}
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	782 env['GATEWAY_INTERFACE'] = 'CGI/1.1'
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	783 env['REQUEST_METHOD'] = self.command
599 765182a4c843 [PATCH] Add RSS support to hgweb mpm@selenic.com parents: 598 diff changeset	784 env['SERVER_NAME'] = self.server.server_name
765182a4c843 [PATCH] Add RSS support to hgweb mpm@selenic.com parents: 598 diff changeset	785 env['SERVER_PORT'] = str(self.server.server_port)
765182a4c843 [PATCH] Add RSS support to hgweb mpm@selenic.com parents: 598 diff changeset	786 env['REQUEST_URI'] = "/"
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	787 if query:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	788 env['QUERY_STRING'] = query
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	789 host = self.address_string()
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	790 if host != self.client_address[0]:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	791 env['REMOTE_HOST'] = host
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	792 env['REMOTE_ADDR'] = self.client_address[0]
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	793
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	794 if self.headers.typeheader is None:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	795 env['CONTENT_TYPE'] = self.headers.type
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	796 else:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	797 env['CONTENT_TYPE'] = self.headers.typeheader
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	798 length = self.headers.getheader('content-length')
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	799 if length:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	800 env['CONTENT_LENGTH'] = length
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	801 accept = []
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	802 for line in self.headers.getallmatchingheaders('accept'):
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	803 if line[:1] in "\t\n\r ":
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	804 accept.append(line.strip())
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	805 else:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	806 accept = accept + line[7:].split(',')
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	807 env['HTTP_ACCEPT'] = ','.join(accept)
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	808
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	809 os.environ.update(env)
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	810
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	811 save = sys.argv, sys.stdin, sys.stdout, sys.stderr
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	812 try:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	813 sys.stdin = self.rfile
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	814 sys.stdout = self.wfile
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	815 sys.argv = ["hgweb.py"]
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	816 if '=' not in query:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	817 sys.argv.append(query)
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	818 self.send_response(200, "Script output follows")
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	819 hg.run()
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	820 finally:
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	821 sys.argv, sys.stdin, sys.stdout, sys.stderr = save
be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	822
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	823 hg = hgweb(repo)
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	824 if use_ipv6:
0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	825 return IPv6HTTPServer((address, port), hgwebhandler)
0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	826 else:
0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	827 return BaseHTTPServer.HTTPServer((address, port), hgwebhandler)
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 601 diff changeset	828
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	829 def server(path, name, templates, address, port, use_ipv6 = False,
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	830 accesslog = sys.stdout, errorlog = sys.stderr):
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 753 diff changeset	831 httpd = create_server(path, name, templates, address, port, use_ipv6,
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 603 diff changeset	832 accesslog, errorlog)
158 be7103467d2e Add 'hg serve' command for stand-alone server mpm@selenic.com parents: 157 diff changeset	833 httpd.serve_forever()
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	834
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	835 # This is a stopgap
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	836 class hgwebdir:
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	837 def __init__(self, config):
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	838 self.cp = ConfigParser.SafeConfigParser()
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	839 self.cp.read(config)
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	840
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	841 def run(self):
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	842 try:
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	843 virtual = os.environ["PATH_INFO"]
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	844 except:
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	845 virtual = ""
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	846
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	847 if virtual:
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	848 real = self.cp.get("paths", virtual[1:])
956 16c8b36fd3c1 Fix hgwebdir virtual start-up mpm@selenic.com parents: 953 diff changeset	849 h = hgweb(real)
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	850 h.run()
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	851 return
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	852
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	853 def header(**map):
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	854 yield tmpl("header", **map)
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	855
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	856 def footer(**map):
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	857 yield tmpl("footer", **map)
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	858
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	859 templates = templatepath()
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	860 m = os.path.join(templates, "map")
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	861 tmpl = templater(m, common_filters,
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	862 {"header": header, "footer": footer})
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	863
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	864 def entries(**map):
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	865 parity = 0
957 305ab68c4394 hgweb: sort repository list mpm@selenic.com parents: 956 diff changeset	866 l = self.cp.items("paths")
305ab68c4394 hgweb: sort repository list mpm@selenic.com parents: 956 diff changeset	867 l.sort()
305ab68c4394 hgweb: sort repository list mpm@selenic.com parents: 956 diff changeset	868 for v,r in l:
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	869 cp2 = ConfigParser.SafeConfigParser()
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	870 cp2.read(os.path.join(r, ".hg", "hgrc"))
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	871
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	872 def get(sec, val, default):
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	873 try:
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	874 return cp2.get(sec, val)
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	875 except:
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	876 return default
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	877
982 8d2e24bae760 hgweb: convert index entries to list expansion style mpm@selenic.com parents: 981 diff changeset	878 yield dict(author = get("web", "author", "unknown"),
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	879 name = get("web", "name", v),
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	880 url = os.environ["REQUEST_URI"] + "/" + v,
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	881 parity = parity,
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	882 shortdesc = get("web", "description", "unknown"),
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	883 lastupdate = os.stat(os.path.join(r, ".hg",
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	884 "00changelog.d")).st_mtime)
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	885
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	886 parity = 1 - parity
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	887
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	888 write(tmpl("index", entries = entries))

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb.py @ 987:bfe12654764d