##// END OF EJS Templates
This changes the revlog.group and re-implements the localrepo.changeroup...
This changes the revlog.group and re-implements the localrepo.changeroup function in terms of it. revlog.group now takes a list of nodes, and some callback functions instead of a linkmap.

File last commit:

r1445:56281e08 default
r1458:1033892b default
Show More
hgweb.py
986 lines | 32.5 KiB | text/x-python | PythonLexer
mpm@selenic.com
hgweb.py: kill #! line, clean up copyright notice...
r238 # hgweb.py - web interface to a mercurial repository
jake@edge2.net
moving hgweb to mercurial subdir
r131 #
mpm@selenic.com
hgweb.py: kill #! line, clean up copyright notice...
r238 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
mpm@selenic.com
More whitespace cleanups...
r575 # Copyright 2005 Matt Mackall <mpm@selenic.com>
jake@edge2.net
moving hgweb to mercurial subdir
r131 #
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
mpm@selenic.com
Clean up hgweb imports...
r1213 import os, cgi, sys
from demandload import demandload
mpm@selenic.com
Add missing import for hgwebdir
r1217 demandload(globals(), "mdiff time re socket zlib errno ui hg ConfigParser")
Bryan O'Sullivan
Fix up representation of dates in hgweb....
r1320 demandload(globals(), "zipfile tempfile StringIO tarfile BaseHTTPServer util")
mpm@selenic.com
Clean up hgweb imports...
r1213 from node import *
mpm@selenic.com
Revamped templated hgweb
r138
mpm@selenic.com
Install the templates where they can be found by hgweb.py...
r157 def templatepath():
mpm@selenic.com
hgweb: add template filters, template style maps, and raw pages...
r201 for f in "templates", "../templates":
mpm@selenic.com
Install the templates where they can be found by hgweb.py...
r157 p = os.path.join(os.path.dirname(__file__), f)
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if os.path.isdir(p):
return p
mpm@selenic.com
Install the templates where they can be found by hgweb.py...
r157
Bryan O'Sullivan
Fix up representation of dates in hgweb....
r1320 def age(x):
mpm@selenic.com
Revamped templated hgweb
r138 def plural(t, c):
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if c == 1:
return t
mpm@selenic.com
Revamped templated hgweb
r138 return t + "s"
def fmt(t, c):
return "%d %s" % (c, plural(t, c))
now = time.time()
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 then = x[0]
Bryan O'Sullivan
Fix up representation of dates in hgweb....
r1320 delta = max(1, int(now - then))
mpm@selenic.com
Revamped templated hgweb
r138
scales = [["second", 1],
["minute", 60],
["hour", 3600],
["day", 3600 * 24],
["week", 3600 * 24 * 7],
["month", 3600 * 24 * 30],
["year", 3600 * 24 * 365]]
scales.reverse()
for t, s in scales:
n = delta / s
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if n >= 2 or s == 1:
return fmt(t, n)
jake@edge2.net
moving hgweb to mercurial subdir
r131
def nl2br(text):
mpm@selenic.com
hgweb: add template filters, template style maps, and raw pages...
r201 return text.replace('\n', '<br/>\n')
jake@edge2.net
moving hgweb to mercurial subdir
r131
def obfuscate(text):
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 return ''.join(['&#%d;' % ord(c) for c in text])
mpm@selenic.com
Revamped templated hgweb
r138
def up(p):
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if p[0] != "/":
p = "/" + p
if p[-1] == "/":
p = p[:-1]
mpm@selenic.com
Revamped templated hgweb
r138 up = os.path.dirname(p)
if up == "/":
return "/"
return up + "/"
jake@edge2.net
moving hgweb to mercurial subdir
r131
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 class hgrequest:
def __init__(self, inp=None, out=None, env=None):
self.inp = inp or sys.stdin
self.out = out or sys.stdout
self.env = env or os.environ
self.form = cgi.parse(self.inp, self.env)
jake@edge2.net
moving hgweb to mercurial subdir
r131
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 def write(self, *things):
for thing in things:
if hasattr(thing, "__iter__"):
for part in thing:
self.write(part)
else:
try:
Vincent Wagelaar
Fix TypeError
r1160 self.out.write(str(thing))
Thomas Arendsen Hein
Added missing 'import errno', and use errno for EPIPE, too.
r1174 except socket.error, inst:
if inst[0] != errno.ECONNRESET:
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 raise
def header(self, headers=[('Content-type','text/html')]):
for header in headers:
self.out.write("%s: %s\r\n" % header)
self.out.write("\r\n")
def httphdr(self, type, file="", size=0):
headers = [('Content-type', type)]
if file:
headers.append(('Content-disposition', 'attachment; filename=%s' % file))
if size > 0:
headers.append(('Content-length', str(size)))
self.header(headers)
jake@edge2.net
change template to a generator...
r135
mpm@selenic.com
Revamped templated hgweb
r138 class templater:
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 def __init__(self, mapfile, filters={}, defaults={}):
mpm@selenic.com
Revamped templated hgweb
r138 self.cache = {}
self.map = {}
self.base = os.path.dirname(mapfile)
mpm@selenic.com
hgweb: add template filters, template style maps, and raw pages...
r201 self.filters = filters
mpm@selenic.com
Add globals to templater/fixup RSS...
r601 self.defaults = defaults
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Revamped templated hgweb
r138 for l in file(mapfile):
m = re.match(r'(\S+)\s*=\s*"(.*)"$', l)
jake@edge2.net
added template support for some hgweb output, also, template files for...
r133 if m:
mpm@selenic.com
Revamped templated hgweb
r138 self.cache[m.group(1)] = m.group(2)
else:
m = re.match(r'(\S+)\s*=\s*(\S+)', l)
if m:
self.map[m.group(1)] = os.path.join(self.base, m.group(2))
jake@edge2.net
added template support for some hgweb output, also, template files for...
r133 else:
Bart Trojanowski
[PATCH] raise exceptions with Exception subclasses...
r1073 raise LookupError("unknown map entry '%s'" % l)
jake@edge2.net
added template support for some hgweb output, also, template files for...
r133
mpm@selenic.com
Revamped templated hgweb
r138 def __call__(self, t, **map):
mpm@selenic.com
Add globals to templater/fixup RSS...
r601 m = self.defaults.copy()
m.update(map)
mpm@selenic.com
Revamped templated hgweb
r138 try:
tmpl = self.cache[t]
except KeyError:
tmpl = self.cache[t] = file(self.map[t]).read()
Josef "Jeff" Sipek
Added support for #foo%bar# syntax...
r974 return self.template(tmpl, self.filters, **m)
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 def template(self, tmpl, filters={}, **map):
Josef "Jeff" Sipek
Added support for #foo%bar# syntax...
r974 while tmpl:
m = re.search(r"#([a-zA-Z0-9]+)((%[a-zA-Z0-9]+)*)((\|[a-zA-Z0-9]+)*)#", tmpl)
if m:
yield tmpl[:m.start(0)]
v = map.get(m.group(1), "")
v = callable(v) and v(**map) or v
format = m.group(2)
fl = m.group(4)
if format:
q = v.__iter__
for i in q():
lm = map.copy()
lm.update(i)
yield self(format[1:], **lm)
v = ""
elif fl:
for f in fl.split("|")[1:]:
v = filters[f](v)
yield v
tmpl = tmpl[m.end(0):]
else:
yield tmpl
return
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Add a multi-repository server...
r941 common_filters = {
"escape": cgi.escape,
"age": age,
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 "date": lambda x: util.datestr(x),
mpm@selenic.com
Add a multi-repository server...
r941 "addbreaks": nl2br,
"obfuscate": obfuscate,
"short": (lambda x: x[:12]),
"firstline": (lambda x: x.splitlines(1)[0]),
"permissions": (lambda x: x and "-rwxr-xr-x" or "-rw-r--r--"),
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 "rfc822date": lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S"),
mpm@selenic.com
Add a multi-repository server...
r941 }
mpm@selenic.com
Revamped templated hgweb
r138 class hgweb:
mpm@selenic.com
hgweb: change startup argument processing...
r987 def __init__(self, repo, name=None):
if type(repo) == type(""):
mpm@selenic.com
Clean up hgweb imports...
r1213 self.repo = hg.repository(ui.ui(), repo)
mpm@selenic.com
hgweb: change startup argument processing...
r987 else:
self.repo = repo
jake@edge2.net
added template support for some hgweb output, also, template files for...
r133
mpm@selenic.com
hgweb: watch changelog for changes...
r258 self.mtime = -1
Thomas Arendsen Hein
Use path relative to document root as reponame if published via a web server....
r1172 self.reponame = name
mpm@selenic.com
Various cleanups for tarball support...
r1078 self.archives = 'zip', 'gz', 'bz2'
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
hgweb: watch changelog for changes...
r258 def refresh(self):
mpm@selenic.com
hgweb: change startup argument processing...
r987 s = os.stat(os.path.join(self.repo.root, ".hg", "00changelog.i"))
mpm@selenic.com
hgweb: watch changelog for changes...
r258 if s.st_mtime != self.mtime:
mpm@selenic.com
hgweb: Fix reloading of index...
r322 self.mtime = s.st_mtime
mpm@selenic.com
Clean up hgweb imports...
r1213 self.repo = hg.repository(self.repo.ui, self.repo.root)
Florian La Roche
Fix cut and paste error in hgweb.py
r1275 self.maxchanges = int(self.repo.ui.config("web", "maxchanges", 10))
self.maxfiles = int(self.repo.ui.config("web", "maxfiles", 10))
mpm@selenic.com
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
r964 self.allowpull = self.repo.ui.configbool("web", "allowpull", True)
mpm@selenic.com
hgweb: watch changelog for changes...
r258
mpm@selenic.com
Revamped templated hgweb
r138 def listfiles(self, files, mf):
for f in files[:self.maxfiles]:
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 yield self.t("filenodelink", node=hex(mf[f]), file=f)
mpm@selenic.com
Revamped templated hgweb
r138 if len(files) > self.maxfiles:
yield self.t("fileellipses")
def listfilediffs(self, files, changeset):
for f in files[:self.maxfiles]:
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 yield self.t("filedifflink", node=hex(changeset), file=f)
mpm@selenic.com
Revamped templated hgweb
r138 if len(files) > self.maxfiles:
yield self.t("fileellipses")
mpm@selenic.com
[PATCH 1/5]: cleaning the template parent management in hgweb...
r569 def parents(self, t1, nodes=[], rev=None,**args):
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if not rev:
rev = lambda x: ""
mpm@selenic.com
[PATCH 1/5]: cleaning the template parent management in hgweb...
r569 for node in nodes:
if node != nullid:
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 yield self.t(t1, node=hex(node), rev=rev(node), **args)
mpm@selenic.com
[PATCH 1/5]: cleaning the template parent management in hgweb...
r569
mpm@selenic.com
[PATCH] Add tags to hgweb...
r568 def showtag(self, t1, node=nullid, **args):
for t in self.repo.nodetags(node):
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 yield self.t(t1, tag=t, **args)
mpm@selenic.com
[PATCH] Add tags to hgweb...
r568
mpm@selenic.com
Revamped templated hgweb
r138 def diff(self, node1, node2, files):
def filterfiles(list, files):
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 l = [x for x in list if x in files]
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Revamped templated hgweb
r138 for f in files:
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if f[-1] != os.sep:
f += os.sep
l += [x for x in list if x.startswith(f)]
mpm@selenic.com
Revamped templated hgweb
r138 return l
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
hgweb: alternating colors for multifile diffs
r172 parity = [0]
def diffblock(diff, f, fn):
yield self.t("diffblock",
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 lines=prettyprintlines(diff),
parity=parity[0],
file=f,
filenode=hex(fn or nullid))
mpm@selenic.com
hgweb: alternating colors for multifile diffs
r172 parity[0] = 1 - parity[0]
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
hgweb: alternating colors for multifile diffs
r172 def prettyprintlines(diff):
mpm@selenic.com
Revamped templated hgweb
r138 for l in diff.splitlines(1):
mpm@selenic.com
hgweb: add template filters, template style maps, and raw pages...
r201 if l.startswith('+'):
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 yield self.t("difflineplus", line=l)
mpm@selenic.com
hgweb: add template filters, template style maps, and raw pages...
r201 elif l.startswith('-'):
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 yield self.t("difflineminus", line=l)
mpm@selenic.com
hgweb: add template filters, template style maps, and raw pages...
r201 elif l.startswith('@'):
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 yield self.t("difflineat", line=l)
mpm@selenic.com
Revamped templated hgweb
r138 else:
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 yield self.t("diffline", line=l)
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Revamped templated hgweb
r138 r = self.repo
cl = r.changelog
mf = r.manifest
change1 = cl.read(node1)
change2 = cl.read(node2)
mmap1 = mf.read(change1[0])
mmap2 = mf.read(change2[0])
mpm@selenic.com
hgweb: fix date bug in hgweb diff generation
r1333 date1 = util.datestr(change1[2])
date2 = util.datestr(change2[2])
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Minor hgweb fixup for new diff code...
r539 c, a, d, u = r.changes(node1, node2)
kreijack@inwind.REMOVEME.it
this patch permits hgweb to show the deleted files in the changeset diff...
r645 if files:
c, a, d = map(lambda x: filterfiles(x, files), (c, a, d))
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Revamped templated hgweb
r138 for f in c:
to = r.file(f).read(mmap1[f])
tn = r.file(f).read(mmap2[f])
mpm@selenic.com
hgweb: alternating colors for multifile diffs
r172 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn)
mpm@selenic.com
Revamped templated hgweb
r138 for f in a:
mpm@selenic.com
hgweb: fix non-existent source or destination for diff...
r265 to = None
mpm@selenic.com
Revamped templated hgweb
r138 tn = r.file(f).read(mmap2[f])
mpm@selenic.com
hgweb: alternating colors for multifile diffs
r172 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn)
mpm@selenic.com
Revamped templated hgweb
r138 for f in d:
to = r.file(f).read(mmap1[f])
mpm@selenic.com
hgweb: fix non-existent source or destination for diff...
r265 tn = None
mpm@selenic.com
hgweb: alternating colors for multifile diffs
r172 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn)
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
hgweb: Fix navigate to 0 bug
r180 def changelog(self, pos):
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def changenav(**map):
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 def seq(factor=1):
mpm@selenic.com
Revamped templated hgweb
r138 yield 1 * factor
mpm@selenic.com
hgweb: make navigation of changesets a bit nicer
r173 yield 3 * factor
#yield 5 * factor
mpm@selenic.com
Revamped templated hgweb
r138 for f in seq(factor * 10):
yield f
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
hgweb: make navigation of changesets a bit nicer
r173 l = []
for f in seq():
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if f < self.maxchanges / 2:
continue
if f > count:
break
mpm@selenic.com
hgweb: make navigation of changesets a bit nicer
r173 r = "%d" % f
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if pos + f < count:
l.append(("+" + r, pos + f))
if pos - f >= 0:
l.insert(0, ("-" + r, pos - f))
mpm@selenic.com
hgweb: make navigation of changesets a bit nicer
r173
Josef "Jeff" Sipek
hgweb: Changed changelog page to list format syntax
r975 yield {"rev": 0, "label": "(0)"}
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
hgweb: make navigation of changesets a bit nicer
r173 for label, rev in l:
Josef "Jeff" Sipek
hgweb: Changed changelog page to list format syntax
r975 yield {"label": label, "rev": rev}
mpm@selenic.com
hgweb: make navigation of changesets a bit nicer
r173
Josef "Jeff" Sipek
hgweb: Changed changelog page to list format syntax
r975 yield {"label": "tip", "rev": ""}
jake@edge2.net
moving hgweb to mercurial subdir
r131
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def changelist(**map):
mpm@selenic.com
Prettify the web interface...
r142 parity = (start - end) & 1
mpm@selenic.com
Revamped templated hgweb
r138 cl = self.repo.changelog
l = [] # build a list in forward order for efficiency
mpm@selenic.com
hgweb: change number navigation tidy up...
r351 for i in range(start, end):
mpm@selenic.com
Revamped templated hgweb
r138 n = cl.node(i)
changes = cl.read(n)
hn = hex(n)
jake@edge2.net
moving hgweb to mercurial subdir
r131
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 l.insert(0, {"parity": parity,
"author": changes[1],
"parent": self.parents("changelogparent",
cl.parents(n), cl.rev),
"changelogtag": self.showtag("changelogtag",n),
"manifest": hex(changes[0]),
"desc": changes[4],
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 "date": changes[2],
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 "files": self.listfilediffs(changes[3], n),
"rev": i,
"node": hn})
mpm@selenic.com
Prettify the web interface...
r142 parity = 1 - parity
mpm@selenic.com
Revamped templated hgweb
r138
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 for e in l:
yield e
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
hgweb: add tags links and manifest links...
r168 cl = self.repo.changelog
mf = cl.read(cl.tip())[0]
count = cl.count()
mpm@selenic.com
hgweb: change number navigation tidy up...
r351 start = max(0, pos - self.maxchanges + 1)
end = min(count, start + self.maxchanges)
pos = end - 1
mpm@selenic.com
Revamped templated hgweb
r138
mpm@selenic.com
Prettify the web interface...
r142 yield self.t('changelog',
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 changenav=changenav,
manifest=hex(mf),
rev=pos, changesets=count, entries=changelist)
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Add multiple keyword search to hgweb...
r538 def search(self, query):
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def changelist(**map):
mpm@selenic.com
Add multiple keyword search to hgweb...
r538 cl = self.repo.changelog
count = 0
qw = query.lower().split()
def revgen():
for i in range(cl.count() - 1, 0, -100):
l = []
for j in range(max(0, i - 100), i):
n = cl.node(j)
changes = cl.read(n)
mpm@selenic.com
Minor tweak to the revgen algorithm
r1023 l.append((n, j, changes))
l.reverse()
mpm@selenic.com
Add multiple keyword search to hgweb...
r538 for e in l:
yield e
for n, i, changes in revgen():
miss = 0
for q in qw:
if not (q in changes[1].lower() or
q in changes[4].lower() or
q in " ".join(changes[3][:20]).lower()):
miss = 1
break
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if miss:
continue
mpm@selenic.com
Add multiple keyword search to hgweb...
r538
count += 1
hn = hex(n)
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 yield self.t('searchentry',
parity=count & 1,
author=changes[1],
parent=self.parents("changelogparent",
cl.parents(n), cl.rev),
changelogtag=self.showtag("changelogtag",n),
manifest=hex(changes[0]),
desc=changes[4],
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 date=changes[2],
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 files=self.listfilediffs(changes[3], n),
rev=i,
node=hn)
mpm@selenic.com
Add multiple keyword search to hgweb...
r538
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if count >= self.maxchanges:
break
mpm@selenic.com
Add multiple keyword search to hgweb...
r538
cl = self.repo.changelog
mf = cl.read(cl.tip())[0]
yield self.t('search',
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 query=query,
manifest=hex(mf),
entries=changelist)
mpm@selenic.com
Add multiple keyword search to hgweb...
r538
mpm@selenic.com
Revamped templated hgweb
r138 def changeset(self, nodeid):
cl = self.repo.changelog
Matt Mackall
Allows abbreviated hashes in hgweb
r1369 n = self.repo.lookup(nodeid)
nodeid = hex(n)
mpm@selenic.com
Revamped templated hgweb
r138 changes = cl.read(n)
mpm@selenic.com
[PATCH 4/5]: cleaning the template parent management in hgweb...
r598 p1 = cl.parents(n)[0]
mpm@selenic.com
Whitespace cleanups...
r515
jake@edge2.net
added template support for some hgweb output, also, template files for...
r133 files = []
mpm@selenic.com
Revamped templated hgweb
r138 mf = self.repo.manifest.read(changes[0])
jake@edge2.net
moving hgweb to mercurial subdir
r131 for f in changes[3]:
mpm@selenic.com
Revamped templated hgweb
r138 files.append(self.t("filenodelink",
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 filenode=hex(mf.get(f, nullid)), file=f))
mpm@selenic.com
Revamped templated hgweb
r138
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def diff(**map):
kreijack@inwind.REMOVEME.it
this patch permits hgweb to show the deleted files in the changeset diff...
r645 yield self.diff(p1, n, None)
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Various cleanups for tarball support...
r1078 def archivelist():
for i in self.archives:
if self.repo.ui.configbool("web", "allow" + i, False):
yield {"type" : i, "node" : nodeid}
Wojciech Milkowski
tarball support v0.3 pt 2
r1077
mpm@selenic.com
Revamped templated hgweb
r138 yield self.t('changeset',
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 diff=diff,
rev=cl.rev(n),
node=nodeid,
parent=self.parents("changesetparent",
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 cl.parents(n), cl.rev),
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 changesettag=self.showtag("changesettag",n),
manifest=hex(changes[0]),
author=changes[1],
desc=changes[4],
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 date=changes[2],
Wojciech Milkowski
tarball support v0.3...
r1076 files=files,
mpm@selenic.com
Various cleanups for tarball support...
r1078 archives=archivelist())
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Revamped templated hgweb
r138 def filelog(self, f, filenode):
cl = self.repo.changelog
fl = self.repo.file(f)
Matt Mackall
Allows abbreviated hashes in hgweb
r1369 filenode = hex(fl.lookup(filenode))
mpm@selenic.com
Revamped templated hgweb
r138 count = fl.count()
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def entries(**map):
mpm@selenic.com
Revamped templated hgweb
r138 l = []
mpm@selenic.com
Prettify the web interface...
r142 parity = (count - 1) & 1
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Revamped templated hgweb
r138 for i in range(count):
n = fl.node(i)
lr = fl.linkrev(n)
cn = cl.node(lr)
cs = cl.read(cl.node(lr))
jake@edge2.net
added template support for some hgweb output, also, template files for...
r133
Josef "Jeff" Sipek
hgweb: Changed file revision page to list format syntax
r978 l.insert(0, {"parity": parity,
"filenode": hex(n),
"filerev": i,
"file": f,
"node": hex(cn),
"author": cs[1],
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 "date": cs[2],
Josef "Jeff" Sipek
hgweb: Changed file revision page to list format syntax
r978 "parent": self.parents("filelogparent",
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 fl.parents(n),
fl.rev, file=f),
Josef "Jeff" Sipek
hgweb: Changed file revision page to list format syntax
r978 "desc": cs[4]})
mpm@selenic.com
Prettify the web interface...
r142 parity = 1 - parity
mpm@selenic.com
Revamped templated hgweb
r138
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 for e in l:
yield e
mpm@selenic.com
Revamped templated hgweb
r138
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 yield self.t("filelog", file=f, filenode=filenode, entries=entries)
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Revamped templated hgweb
r138 def filerevision(self, f, node):
fl = self.repo.file(f)
Matt Mackall
Allows abbreviated hashes in hgweb
r1369 n = fl.lookup(node)
node = hex(n)
mpm@selenic.com
hgweb: add template filters, template style maps, and raw pages...
r201 text = fl.read(n)
mpm@selenic.com
Revamped templated hgweb
r138 changerev = fl.linkrev(n)
cl = self.repo.changelog
cn = cl.node(changerev)
cs = cl.read(cn)
mfn = cs[0]
mpm@selenic.com
Prettify the web interface...
r142
def lines():
for l, t in enumerate(text.splitlines(1)):
Josef "Jeff" Sipek
hgweb: Changed file page to list format syntax
r976 yield {"line": t,
"linenumber": "% 6d" % (l + 1),
"parity": l & 1}
mpm@selenic.com
hgweb: add file permissions...
r359
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 yield self.t("filerevision",
file=f,
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 filenode=node,
path=up(f),
text=lines(),
rev=changerev,
node=hex(cn),
manifest=hex(mfn),
author=cs[1],
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 date=cs[2],
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 parent=self.parents("filerevparent",
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 fl.parents(n), fl.rev, file=f),
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 permissions=self.repo.manifest.readflags(mfn)[f])
mpm@selenic.com
Revamped templated hgweb
r138
def fileannotate(self, f, node):
bcache = {}
ncache = {}
fl = self.repo.file(f)
Matt Mackall
Allows abbreviated hashes in hgweb
r1369 n = fl.lookup(node)
node = hex(n)
mpm@selenic.com
Revamped templated hgweb
r138 changerev = fl.linkrev(n)
cl = self.repo.changelog
cn = cl.node(changerev)
cs = cl.read(cn)
mfn = cs[0]
jake@edge2.net
moving hgweb to mercurial subdir
r131
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def annotate(**map):
mpm@selenic.com
Prettify the web interface...
r142 parity = 1
last = None
mpm@selenic.com
Revamped templated hgweb
r138 for r, l in fl.annotate(n):
try:
cnode = ncache[r]
except KeyError:
cnode = ncache[r] = self.repo.changelog.node(r)
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Revamped templated hgweb
r138 try:
name = bcache[r]
except KeyError:
cl = self.repo.changelog.read(cnode)
Thomas Arendsen Hein
Move generating short username to display in hg/hgweb annotate to ui module.
r1129 bcache[r] = name = self.repo.ui.shortuser(cl[1])
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Prettify the web interface...
r142 if last != cnode:
parity = 1 - parity
last = cnode
Josef "Jeff" Sipek
hgweb: Changed annotate page to list format syntax
r977 yield {"parity": parity,
"node": hex(cnode),
"rev": r,
"author": name,
"file": f,
"line": l}
mpm@selenic.com
Revamped templated hgweb
r138
yield self.t("fileannotate",
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 file=f,
filenode=node,
annotate=annotate,
path=up(f),
rev=changerev,
node=hex(cn),
manifest=hex(mfn),
author=cs[1],
mpm@selenic.com
hgweb: pass date tuples around rather than whole changesets for dates
r1324 date=cs[2],
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 parent=self.parents("fileannotateparent",
fl.parents(n), fl.rev, file=f),
permissions=self.repo.manifest.readflags(mfn)[f])
jake@edge2.net
added annotate...
r136
mpm@selenic.com
Revamped templated hgweb
r138 def manifest(self, mnode, path):
Matt Mackall
Allows abbreviated hashes in hgweb
r1369 man = self.repo.manifest
mn = man.lookup(mnode)
mnode = hex(mn)
mf = man.read(mn)
rev = man.rev(mn)
mpm@selenic.com
Revamped templated hgweb
r138 node = self.repo.changelog.node(rev)
Matt Mackall
Allows abbreviated hashes in hgweb
r1369 mff = man.readflags(mn)
mpm@selenic.com
Revamped templated hgweb
r138
files = {}
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Revamped templated hgweb
r138 p = path[1:]
l = len(p)
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Revamped templated hgweb
r138 for f,n in mf.items():
if f[:l] != p:
continue
remain = f[l:]
if "/" in remain:
short = remain[:remain.find("/") + 1] # bleah
mpm@selenic.com
Prettify the web interface...
r142 files[short] = (f, None)
mpm@selenic.com
Revamped templated hgweb
r138 else:
short = os.path.basename(remain)
files[short] = (f, n)
jake@edge2.net
moving hgweb to mercurial subdir
r131
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def filelist(**map):
mpm@selenic.com
Prettify the web interface...
r142 parity = 0
mpm@selenic.com
Revamped templated hgweb
r138 fl = files.keys()
fl.sort()
for f in fl:
full, fnode = files[f]
Josef "Jeff" Sipek
hgweb: Changed manifest page to list format syntax
r979 if not fnode:
continue
yield {"file": full,
"manifest": mnode,
"filenode": hex(fnode),
"parity": parity,
"basename": f,
"permissions": mff[full]}
mpm@selenic.com
Prettify the web interface...
r142 parity = 1 - parity
mpm@selenic.com
Revamped templated hgweb
r138
Josef "Jeff" Sipek
hgweb: Changed manifest page to list format syntax
r979 def dirlist(**map):
parity = 0
fl = files.keys()
fl.sort()
for f in fl:
full, fnode = files[f]
if fnode:
continue
yield {"parity": parity,
"path": os.path.join(path, f),
"manifest": mnode,
Josef "Jeff" Sipek
Merge with MPM
r980 "basename": f[:-1]}
Josef "Jeff" Sipek
hgweb: Changed manifest page to list format syntax
r979 parity = 1 - parity
mpm@selenic.com
hgweb: convert index entries to list expansion style
r982
mpm@selenic.com
Revamped templated hgweb
r138 yield self.t("manifest",
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 manifest=mnode,
rev=rev,
node=hex(node),
path=path,
up=up(path),
fentries=filelist,
dentries=dirlist)
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
hgweb: add tags links and manifest links...
r168 def tags(self):
cl = self.repo.changelog
mf = cl.read(cl.tip())[0]
mpm@selenic.com
rework all code using tags...
r343 i = self.repo.tagslist()
i.reverse()
mpm@selenic.com
hgweb: add tags links and manifest links...
r168
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def entries(**map):
mpm@selenic.com
hgweb: add tags links and manifest links...
r168 parity = 0
for k,n in i:
Josef "Jeff" Sipek
Added support for #foo%bar# syntax...
r974 yield {"parity": parity,
"tag": k,
"node": hex(n)}
mpm@selenic.com
hgweb: add tags links and manifest links...
r168 parity = 1 - parity
yield self.t("tags",
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 manifest=hex(mf),
entries=entries)
mpm@selenic.com
hgweb: add tags links and manifest links...
r168
mpm@selenic.com
Revamped templated hgweb
r138 def filediff(self, file, changeset):
cl = self.repo.changelog
Matt Mackall
Allows abbreviated hashes in hgweb
r1369 n = self.repo.lookup(changeset)
changeset = hex(n)
mpm@selenic.com
Revamped templated hgweb
r138 p1 = cl.parents(n)[0]
cs = cl.read(n)
mf = self.repo.manifest.read(cs[0])
mpm@selenic.com
Whitespace cleanups...
r515
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def diff(**map):
mpm@selenic.com
Revamped templated hgweb
r138 yield self.diff(p1, n, file)
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
Revamped templated hgweb
r138 yield self.t("filediff",
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 file=file,
filenode=hex(mf.get(file, nullid)),
node=changeset,
rev=self.repo.changelog.rev(n),
parent=self.parents("filediffparent",
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 cl.parents(n), cl.rev),
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 diff=diff)
mpm@selenic.com
Whitespace cleanups...
r515
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 def archive(self, req, cnode, type):
mpm@selenic.com
Various cleanups for tarball support...
r1078 cs = self.repo.changelog.read(cnode)
mnode = cs[0]
mf = self.repo.manifest.read(mnode)
rev = self.repo.manifest.rev(mnode)
reponame = re.sub(r"\W+", "-", self.reponame)
name = "%s-%s/" % (reponame, short(cnode))
mpm@selenic.com
hgweb: add mdiff / fix sorting of archives
r1112 files = mf.keys()
files.sort()
Wojciech Milkowski
tarball support v0.3 pt 2
r1077 if type == 'zip':
Thomas Arendsen Hein
Fixed import needed to serve zip files which broke because of other changes.
r1165 tmp = tempfile.mkstemp()[1]
mpm@selenic.com
Various cleanups for tarball support...
r1078 try:
zf = zipfile.ZipFile(tmp, "w", zipfile.ZIP_DEFLATED)
mpm@selenic.com
hgweb: add mdiff / fix sorting of archives
r1112 for f in files:
mpm@selenic.com
Various cleanups for tarball support...
r1078 zf.writestr(name + f, self.repo.file(f).read(mf[f]))
zf.close()
Wojciech Milkowski
tarball support v0.3...
r1076
mpm@selenic.com
Various cleanups for tarball support...
r1078 f = open(tmp, 'r')
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.httphdr('application/zip', name[:-1] + '.zip',
mpm@selenic.com
Various cleanups for tarball support...
r1078 os.path.getsize(tmp))
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(f.read())
mpm@selenic.com
Various cleanups for tarball support...
r1078 f.close()
finally:
os.unlink(tmp)
Wojciech Milkowski
tarball support v0.3...
r1076
Wojciech Milkowski
tarball support v0.3 pt 2
r1077 else:
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 tf = tarfile.TarFile.open(mode='w|' + type, fileobj=req.out)
mpm@selenic.com
Various cleanups for tarball support...
r1078 mff = self.repo.manifest.readflags(mnode)
Wojciech Milkowski
tarball support v0.3 pt 2
r1077 mtime = int(time.time())
Wojciech Milkowski
tarball support v0.3...
r1076
Edouard Gomez
Output Content-encoding for tar.gz and tar.bz2 snapshots...
r1185 if type == "gz":
encoding = "gzip"
else:
encoding = "x-bzip2"
Thomas Arendsen Hein
Cleanup of tabs and trailing spaces.
r1308 req.header([('Content-type', 'application/x-tar'),
Edouard Gomez
Output Content-encoding for tar.gz and tar.bz2 snapshots...
r1185 ('Content-disposition', 'attachment; filename=%s%s%s' %
(name[:-1], '.tar.', type)),
('Content-encoding', encoding)])
mpm@selenic.com
hgweb: add mdiff / fix sorting of archives
r1112 for fname in files:
mpm@selenic.com
Various cleanups for tarball support...
r1078 rcont = self.repo.file(fname).read(mf[fname])
Wojciech Milkowski
tarball support v0.3 pt 2
r1077 finfo = tarfile.TarInfo(name + fname)
finfo.mtime = mtime
finfo.size = len(rcont)
finfo.mode = mff[fname] and 0755 or 0644
tf.addfile(finfo, StringIO.StringIO(rcont))
tf.close()
Wojciech Milkowski
tarball support v0.3...
r1076
mpm@selenic.com
Revamped templated hgweb
r138 # add tags to things
# tags -> list of changesets corresponding to tags
# find tag, changeset, file
jake@edge2.net
moving hgweb to mercurial subdir
r131
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 def run(self, req=hgrequest()):
Jeff Sipek
[PATCH] Propagate the template map though recursively...
r857 def header(**map):
yield self.t("header", **map)
def footer(**map):
yield self.t("footer", **map)
mpm@selenic.com
hgweb: watch changelog for changes...
r258 self.refresh()
jake@edge2.net
making hgweb class
r132
mpm@selenic.com
hgweb: change startup argument processing...
r987 t = self.repo.ui.config("web", "templates", templatepath())
mpm@selenic.com
hgweb: add [web] section to hgrc...
r938 m = os.path.join(t, "map")
mpm@selenic.com
Add web:style option
r986 style = self.repo.ui.config("web", "style", "")
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 if req.form.has_key('style'):
style = req.form['style'][0]
mpm@selenic.com
Add web:style option
r986 if style:
b = os.path.basename("map-" + style)
mpm@selenic.com
Fix RSS feeds
r983 p = os.path.join(t, b)
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if os.path.isfile(p):
m = p
mpm@selenic.com
Whitespace cleanups...
r515
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 port = req.env["SERVER_PORT"]
mpm@selenic.com
Add globals to templater/fixup RSS...
r601 port = port != "80" and (":" + port) or ""
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 uri = req.env["REQUEST_URI"]
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if "?" in uri:
uri = uri.split("?")[0]
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 url = "http://%s%s%s" % (req.env["SERVER_NAME"], port, uri)
Thomas Arendsen Hein
Use path relative to document root as reponame if published via a web server....
r1172 if not self.reponame:
self.reponame = (self.repo.ui.config("web", "name")
or uri.strip('/') or self.repo.root)
mpm@selenic.com
Add globals to templater/fixup RSS...
r601
mpm@selenic.com
Add a multi-repository server...
r941 self.t = templater(m, common_filters,
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 {"url": url,
"repo": self.reponame,
"header": header,
"footer": footer,
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 })
mpm@selenic.com
hgweb: add template filters, template style maps, and raw pages...
r201
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 if not req.form.has_key('cmd'):
req.form['cmd'] = [self.t.cache['default'],]
mpm@selenic.com
Whitespace
r937
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 if req.form['cmd'][0] == 'changelog':
mpm@selenic.com
Add multiple keyword search to hgweb...
r538 c = self.repo.changelog.count() - 1
hi = c
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 if req.form.has_key('rev'):
hi = req.form['rev'][0]
mpm@selenic.com
hgweb: don't blow up on search for unknown keys
r166 try:
hi = self.repo.changelog.rev(self.repo.lookup(hi))
mpm@selenic.com
hgweb: fix scope for RepoError
r1219 except hg.RepoError:
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(self.search(hi))
mpm@selenic.com
Add multiple keyword search to hgweb...
r538 return
mpm@selenic.com
More whitespace cleanups...
r575
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(self.changelog(hi))
mpm@selenic.com
Whitespace cleanups...
r515
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'changeset':
req.write(self.changeset(req.form['node'][0]))
mpm@selenic.com
Revamped templated hgweb
r138
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'manifest':
req.write(self.manifest(req.form['manifest'][0], req.form['path'][0]))
mpm@selenic.com
Revamped templated hgweb
r138
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'tags':
req.write(self.tags())
mpm@selenic.com
hgweb: add tags links and manifest links...
r168
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'filediff':
req.write(self.filediff(req.form['file'][0], req.form['node'][0]))
jake@edge2.net
moving hgweb to mercurial subdir
r131
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'file':
req.write(self.filerevision(req.form['file'][0], req.form['filenode'][0]))
jake@edge2.net
moving hgweb to mercurial subdir
r131
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'annotate':
req.write(self.fileannotate(req.form['file'][0], req.form['filenode'][0]))
jake@edge2.net
moving hgweb to mercurial subdir
r131
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'filelog':
req.write(self.filelog(req.form['file'][0], req.form['filenode'][0]))
jake@edge2.net
added annotate...
r136
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'heads':
req.httphdr("application/mercurial-0.1")
mpm@selenic.com
make pull work for multiple heads...
r222 h = self.repo.heads()
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(" ".join(map(hex, h)) + "\n")
mpm@selenic.com
make pull work for multiple heads...
r222
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'branches':
req.httphdr("application/mercurial-0.1")
jake@edge2.net
making hgweb class
r132 nodes = []
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 if req.form.has_key('nodes'):
nodes = map(bin, req.form['nodes'][0].split(" "))
mpm@selenic.com
Revamped templated hgweb
r138 for b in self.repo.branches(nodes):
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(" ".join(map(hex, b)) + "\n")
jake@edge2.net
moving hgweb to mercurial subdir
r131
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'between':
req.httphdr("application/mercurial-0.1")
jake@edge2.net
making hgweb class
r132 nodes = []
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 if req.form.has_key('pairs'):
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 pairs = [map(bin, p.split("-"))
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 for p in req.form['pairs'][0].split(" ")]
mpm@selenic.com
Revamped templated hgweb
r138 for b in self.repo.between(pairs):
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(" ".join(map(hex, b)) + "\n")
jake@edge2.net
making hgweb class
r132
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'changegroup':
req.httphdr("application/mercurial-0.1")
jake@edge2.net
making hgweb class
r132 nodes = []
mpm@selenic.com
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
r964 if not self.allowpull:
mpm@selenic.com
hgweb: add view-only support...
r197 return
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 if req.form.has_key('roots'):
nodes = map(bin, req.form['roots'][0].split(" "))
jake@edge2.net
moving hgweb to mercurial subdir
r131
jake@edge2.net
making hgweb class
r132 z = zlib.compressobj()
Matt Mackall
Protocol switch from using generators to stream-like objects....
r635 f = self.repo.changegroup(nodes)
while 1:
chunk = f.read(4096)
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 if not chunk:
break
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(z.compress(chunk))
jake@edge2.net
making hgweb class
r132
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(z.flush())
jake@edge2.net
moving hgweb to mercurial subdir
r131
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 elif req.form['cmd'][0] == 'archive':
Matt Mackall
Allows abbreviated hashes in hgweb
r1369 changeset = self.repo.lookup(req.form['node'][0])
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 type = req.form['type'][0]
mpm@selenic.com
Various cleanups for tarball support...
r1078 if (type in self.archives and
self.repo.ui.configbool("web", "allow" + type, False)):
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 self.archive(req, changeset, type)
mpm@selenic.com
Various cleanups for tarball support...
r1078 return
Wojciech Milkowski
tarball support v0.3 pt 2
r1077
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(self.t("error"))
Wojciech Milkowski
tarball support v0.3...
r1076
jake@edge2.net
making hgweb class
r132 else:
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(self.t("error"))
jake@edge2.net
moving hgweb to mercurial subdir
r131
mpm@selenic.com
hgweb: change startup argument processing...
r987 def create_server(repo):
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158
mpm@selenic.com
hgweb: add [web] section to hgrc...
r938 def openlog(opt, default):
if opt and opt != '-':
return open(opt, 'w')
return default
mpm@selenic.com
hgweb: change startup argument processing...
r987 address = repo.ui.config("web", "address", "")
port = int(repo.ui.config("web", "port", 8000))
use_ipv6 = repo.ui.configbool("web", "ipv6")
accesslog = openlog(repo.ui.config("web", "accesslog", "-"), sys.stdout)
errorlog = openlog(repo.ui.config("web", "errorlog", "-"), sys.stderr)
mpm@selenic.com
hgweb: add [web] section to hgrc...
r938
Samuel Tardieu
Add an option to hg serve to serve file using IPv6
r825 class IPv6HTTPServer(BaseHTTPServer.HTTPServer):
Bryan O'Sullivan
Fix problem with "hg serve" on systems not providing IPv6.
r881 address_family = getattr(socket, 'AF_INET6', None)
def __init__(self, *args, **kwargs):
if self.address_family is None:
mpm@selenic.com
hgweb: fix scope for RepoError
r1219 raise hg.RepoError('IPv6 not available on this system')
Bryan O'Sullivan
Fix problem with "hg serve" on systems not providing IPv6.
r881 BaseHTTPServer.HTTPServer.__init__(self, *args, **kwargs)
Samuel Tardieu
Add an option to hg serve to serve file using IPv6
r825
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158 class hgwebhandler(BaseHTTPServer.BaseHTTPRequestHandler):
mpm@selenic.com
[PATCH] Get "hg serve" to optionally log accesses and errors to files...
r605 def log_error(self, format, *args):
errorlog.write("%s - - [%s] %s\n" % (self.address_string(),
self.log_date_time_string(),
format % args))
mpm@selenic.com
Whitespace
r937
mpm@selenic.com
[PATCH] Get "hg serve" to optionally log accesses and errors to files...
r605 def log_message(self, format, *args):
accesslog.write("%s - - [%s] %s\n" % (self.address_string(),
self.log_date_time_string(),
format % args))
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158 def do_POST(self):
mpm@selenic.com
hgweb: ignore pipe errors...
r271 try:
self.do_hgweb()
except socket.error, inst:
Thomas Arendsen Hein
Added missing 'import errno', and use errno for EPIPE, too.
r1174 if inst[0] != errno.EPIPE:
Thomas Arendsen Hein
Some more spacing/indentation/linebreak cleanups to hgweb.py.
r1063 raise
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158
def do_GET(self):
mpm@selenic.com
hgweb: ignore pipe errors...
r271 self.do_POST()
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158
def do_hgweb(self):
query = ""
p = self.path.find("?")
if p:
query = self.path[p + 1:]
query = query.replace('+', ' ')
mpm@selenic.com
Whitespace cleanups...
r515
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158 env = {}
env['GATEWAY_INTERFACE'] = 'CGI/1.1'
env['REQUEST_METHOD'] = self.command
mpm@selenic.com
[PATCH] Add RSS support to hgweb...
r599 env['SERVER_NAME'] = self.server.server_name
env['SERVER_PORT'] = str(self.server.server_port)
env['REQUEST_URI'] = "/"
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158 if query:
env['QUERY_STRING'] = query
host = self.address_string()
if host != self.client_address[0]:
env['REMOTE_HOST'] = host
env['REMOTE_ADDR'] = self.client_address[0]
if self.headers.typeheader is None:
env['CONTENT_TYPE'] = self.headers.type
else:
env['CONTENT_TYPE'] = self.headers.typeheader
length = self.headers.getheader('content-length')
if length:
env['CONTENT_LENGTH'] = length
accept = []
for line in self.headers.getallmatchingheaders('accept'):
if line[:1] in "\t\n\r ":
accept.append(line.strip())
else:
accept = accept + line[7:].split(',')
env['HTTP_ACCEPT'] = ','.join(accept)
Vincent Wagelaar
Saving sys.argv and sys.stderr is not needed anymore
r1180 req = hgrequest(self.rfile, self.wfile, env)
self.send_response(200, "Script output follows")
hg.run(req)
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158
mpm@selenic.com
hgweb: change startup argument processing...
r987 hg = hgweb(repo)
Samuel Tardieu
Add an option to hg serve to serve file using IPv6
r825 if use_ipv6:
return IPv6HTTPServer((address, port), hgwebhandler)
else:
return BaseHTTPServer.HTTPServer((address, port), hgwebhandler)
mpm@selenic.com
[PATCH] Get "hg serve" to print the URL being served...
r603
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 def server(path, name, templates, address, port, use_ipv6=False,
accesslog=sys.stdout, errorlog=sys.stderr):
Samuel Tardieu
Add an option to hg serve to serve file using IPv6
r825 httpd = create_server(path, name, templates, address, port, use_ipv6,
mpm@selenic.com
[PATCH] Get "hg serve" to optionally log accesses and errors to files...
r605 accesslog, errorlog)
mpm@selenic.com
Add 'hg serve' command for stand-alone server...
r158 httpd.serve_forever()
mpm@selenic.com
Add a multi-repository server...
r941
# This is a stopgap
class hgwebdir:
def __init__(self, config):
Vincent Wagelaar
Make sure the repository names don't have slashes at the at or else in some...
r1181 def cleannames(items):
return [(name.strip('/'), path) for name, path in items]
Thomas Arendsen Hein
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
r1143 if type(config) == type([]):
Vincent Wagelaar
Make sure the repository names don't have slashes at the at or else in some...
r1181 self.repos = cleannames(config)
Thomas Arendsen Hein
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
r1143 elif type(config) == type({}):
Vincent Wagelaar
Make sure the repository names don't have slashes at the at or else in some...
r1181 self.repos = cleannames(config.items())
Thomas Arendsen Hein
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
r1143 self.repos.sort()
else:
cp = ConfigParser.SafeConfigParser()
cp.read(config)
Vincent Wagelaar
Make sure the repository names don't have slashes at the at or else in some...
r1181 self.repos = cleannames(cp.items("paths"))
Thomas Arendsen Hein
Allow list of (virtual, real) or dictionary to be passed to hgwebdir.
r1143 self.repos.sort()
mpm@selenic.com
Add a multi-repository server...
r941
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 def run(self, req=hgrequest()):
mpm@selenic.com
Add a multi-repository server...
r941 def header(**map):
yield tmpl("header", **map)
def footer(**map):
yield tmpl("footer", **map)
Thomas Arendsen Hein
Cleaned up hgweb.hgwebdir.run()
r1142 m = os.path.join(templatepath(), "map")
mpm@selenic.com
Add a multi-repository server...
r941 tmpl = templater(m, common_filters,
{"header": header, "footer": footer})
def entries(**map):
parity = 0
Thomas Arendsen Hein
Use ConfigParser only in hgwebdir.__init__()
r1141 for name, path in self.repos:
mpm@selenic.com
Clean up hgweb imports...
r1213 u = ui.ui()
Thomas Arendsen Hein
Make .hg/hgrc optional for repositories published by hgwebdir.
r1170 try:
u.readconfig(file(os.path.join(path, '.hg', 'hgrc')))
except IOError:
pass
Thomas Arendsen Hein
Don't create repo objects in hgwebdir, ui object is enough.
r1140 get = u.config
mpm@selenic.com
Add a multi-repository server...
r941
Vincent Wagelaar
Make sure the repository names don't have slashes at the at or else in some...
r1181 url = ('/'.join([req.env["REQUEST_URI"].split('?')[0], name])
Thomas Arendsen Hein
Cleaned up hgweb.hgwebdir.run()
r1142 .replace("//", "/"))
mpm@selenic.com
Minor hgwebdir tweaks...
r1022
mpm@selenic.com
hgwebdir: Fix date display
r1348 # update time with local timezone
d = (os.stat(os.path.join(path,
".hg", "00changelog.d")).st_mtime,
util.makedate()[1])
mpm@selenic.com
hgweb: use ui:username rather than web:contact...
r1260 yield dict(contact=(get("ui", "username") or # preferred
get("web", "contact") or # deprecated
get("web", "author", "unknown")), # also
Thomas Arendsen Hein
Longer variable names in hgwebdir: l->repos, v->name, r->path
r1130 name=get("web", "name", name),
benoit.boissinot@ens-lyon.fr
pep-0008 cleanup...
r1062 url=url,
parity=parity,
shortdesc=get("web", "description", "unknown"),
mpm@selenic.com
hgwebdir: Fix date display
r1348 lastupdate=d)
mpm@selenic.com
Add a multi-repository server...
r941
parity = 1 - parity
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 virtual = req.env.get("PATH_INFO", "").strip('/')
Thomas Arendsen Hein
Cleaned up hgweb.hgwebdir.run()
r1142 if virtual:
Thomas Arendsen Hein
Use ConfigParser only in hgwebdir.__init__()
r1141 real = dict(self.repos).get(virtual)
if real:
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 hgweb(real).run(req)
Ollivier Robert
Use a template for the error message.
r1123 else:
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(tmpl("notfound", repo=virtual))
Thomas Arendsen Hein
Cleaned up hgweb.hgwebdir.run()
r1142 else:
Vincent Wagelaar
Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object....
r1159 req.write(tmpl("index", entries=entries))