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

annotate mercurial/hgweb.py @ 1793:83c6d8355909

Allow serving static files from hgwebdir to fix CSS and favicon.

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Wed, 22 Feb 2006 09:14:46 +0100
parents	a161c61ba8ed
children	36e19e3da12d

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

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb.py @ 1793:83c6d8355909