##// END OF EJS Templates
Fixed contrib/hgdiff script to pass diffopts in the new format.
Fixed contrib/hgdiff script to pass diffopts in the new format.

File last commit:

r3395:3c8f0dc9 default
r3398:0f308690 default
Show More
hgweb_mod.py
1044 lines | 35.6 KiB | text/x-python | PythonLexer
Eric Hopper
Fixing up comment headers for split up code.
r2391 # hgweb/hgweb_mod.py - Web interface for a repository.
Eric Hopper
Final stage of the hgweb split up....
r2356 #
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
Vadim Gelfer
update copyrights.
r2859 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
Eric Hopper
Final stage of the hgweb split up....
r2356 #
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
import os
import os.path
import mimetypes
from mercurial.demandload import demandload
Eric Hopper
Really fix http headers for web UI and issue 254....
r2514 demandload(globals(), "re zlib ConfigParser mimetools cStringIO sys tempfile")
Brendan Cully
hgweb: provide means for handling query parameters
r3270 demandload(globals(), 'urllib')
Matt Mackall
Move ui.diffopts to patch.diffopts where it belongs
r2888 demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,streamclone,patch")
Brendan Cully
hgweb: trap lookup errors
r3359 demandload(globals(), "mercurial:revlog,templater")
Thomas Arendsen Hein
hgweb: Search templates in templatepath/style/map, too, using a common function....
r3276 demandload(globals(), "mercurial.hgweb.common:get_mtime,staticfile,style_map")
Eric Hopper
Final stage of the hgweb split up....
r2356 from mercurial.node import *
from mercurial.i18n import gettext as _
def _up(p):
if p[0] != "/":
p = "/" + p
if p[-1] == "/":
p = p[:-1]
up = os.path.dirname(p)
if up == "/":
return "/"
return up + "/"
class hgweb(object):
def __init__(self, repo, name=None):
if type(repo) == type(""):
self.repo = hg.repository(ui.ui(), repo)
else:
self.repo = repo
self.mtime = -1
self.reponame = name
self.archives = 'zip', 'gz', 'bz2'
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 self.stripecount = 1
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436 self.templatepath = self.repo.ui.config("web", "templates",
templater.templatepath())
Eric Hopper
Final stage of the hgweb split up....
r2356
def refresh(self):
mtime = get_mtime(self.repo.root)
if mtime != self.mtime:
self.mtime = mtime
self.repo = hg.repository(self.repo.ui, self.repo.root)
self.maxchanges = int(self.repo.ui.config("web", "maxchanges", 10))
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 self.stripecount = int(self.repo.ui.config("web", "stripes", 1))
Josef "Jeff" Sipek
[hgweb] Implemented shortlog (gitweb templates only)
r2684 self.maxshortchanges = int(self.repo.ui.config("web", "maxshortchanges", 60))
Eric Hopper
Final stage of the hgweb split up....
r2356 self.maxfiles = int(self.repo.ui.config("web", "maxfiles", 10))
self.allowpull = self.repo.ui.configbool("web", "allowpull", True)
def archivelist(self, nodeid):
Thomas Arendsen Hein
Fixed [web] allow_archive for comma separated parameters by using ui.configlist....
r2500 allowed = self.repo.ui.configlist("web", "allow_archive")
Brendan Cully
hgweb: accept NewWebInterface URLs
r3260 for i, spec in self.archive_specs.iteritems():
Thomas Arendsen Hein
Allow comma to separate types in allow_archive, too. Use longer variable name.
r2359 if i in allowed or self.repo.ui.configbool("web", "allow" + i):
Brendan Cully
hgweb: accept NewWebInterface URLs
r3260 yield {"type" : i, "extension" : spec[2], "node" : nodeid}
Eric Hopper
Final stage of the hgweb split up....
r2356
def listfilediffs(self, files, changeset):
for f in files[:self.maxfiles]:
yield self.t("filedifflink", node=hex(changeset), file=f)
if len(files) > self.maxfiles:
yield self.t("fileellipses")
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 def siblings(self, siblings=[], hiderev=None, **args):
siblings = [s for s in siblings if s.node() != nullid]
if len(siblings) == 1 and siblings[0].rev() == hiderev:
Eric Hopper
Final stage of the hgweb split up....
r2356 return
for s in siblings:
Brendan Cully
hgweb: fix parent/child links across renames
r3392 d = {'node': hex(s.node()), 'rev': s.rev()}
Brendan Cully
hgweb: really fix parent/child rename links
r3394 if hasattr(s, 'path'):
d['file'] = s.path()
Brendan Cully
hgweb: fix parent/child links across renames
r3392 d.update(args)
yield d
Eric Hopper
Final stage of the hgweb split up....
r2356
def renamelink(self, fl, node):
r = fl.renamed(node)
if r:
return [dict(file=r[0], node=hex(r[1]))]
return []
def showtag(self, t1, node=nullid, **args):
for t in self.repo.nodetags(node):
yield self.t(t1, tag=t, **args)
def diff(self, node1, node2, files):
def filterfiles(filters, files):
l = [x for x in files if x in filters]
for t in filters:
if t and t[-1] != os.sep:
t += os.sep
l += [x for x in files if x.startswith(t)]
return l
parity = [0]
def diffblock(diff, f, fn):
yield self.t("diffblock",
lines=prettyprintlines(diff),
parity=parity[0],
file=f,
filenode=hex(fn or nullid))
parity[0] = 1 - parity[0]
def prettyprintlines(diff):
for l in diff.splitlines(1):
if l.startswith('+'):
yield self.t("difflineplus", line=l)
elif l.startswith('-'):
yield self.t("difflineminus", line=l)
elif l.startswith('@'):
yield self.t("difflineat", line=l)
else:
yield self.t("diffline", line=l)
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])
date1 = util.datestr(change1[2])
date2 = util.datestr(change2[2])
Giorgos Keramidas
hgweb: repo.changes() is now called repo.status()
r2876 modified, added, removed, deleted, unknown = r.status(node1, node2)[:5]
Eric Hopper
Final stage of the hgweb split up....
r2356 if files:
modified, added, removed = map(lambda x: filterfiles(files, x),
(modified, added, removed))
Thomas Arendsen Hein
Fix hgweb's patch display in changeset view.
r2927 diffopts = patch.diffopts(self.repo.ui)
Eric Hopper
Final stage of the hgweb split up....
r2356 for f in modified:
to = r.file(f).read(mmap1[f])
tn = r.file(f).read(mmap2[f])
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
Vadim Gelfer
refactor text diff/patch code....
r2874 opts=diffopts), f, tn)
Eric Hopper
Final stage of the hgweb split up....
r2356 for f in added:
to = None
tn = r.file(f).read(mmap2[f])
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
Vadim Gelfer
refactor text diff/patch code....
r2874 opts=diffopts), f, tn)
Eric Hopper
Final stage of the hgweb split up....
r2356 for f in removed:
to = r.file(f).read(mmap1[f])
tn = None
yield diffblock(mdiff.unidiff(to, date1, tn, date2, f,
Vadim Gelfer
refactor text diff/patch code....
r2874 opts=diffopts), f, tn)
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: use contexts in more handlers
r3220 def changelog(self, ctx, shortlog=False):
pos = ctx.rev()
Eric Hopper
Final stage of the hgweb split up....
r2356 def changenav(**map):
def seq(factor, maxchanges=None):
if maxchanges:
yield maxchanges
if maxchanges >= 20 and maxchanges <= 40:
yield 50
else:
yield 1 * factor
yield 3 * factor
for f in seq(factor * 10):
yield f
l = []
last = 0
Josef "Jeff" Sipek
[hgweb] Implemented shortlog (gitweb templates only)
r2684 maxchanges = shortlog and self.maxshortchanges or self.maxchanges
for f in seq(1, maxchanges):
if f < maxchanges or f <= last:
Eric Hopper
Final stage of the hgweb split up....
r2356 continue
if f > count:
break
last = f
r = "%d" % f
if pos + f < count:
l.append(("+" + r, pos + f))
if pos - f >= 0:
l.insert(0, ("-" + r, pos - f))
yield {"rev": 0, "label": "(0)"}
for label, rev in l:
yield {"label": label, "rev": rev}
yield {"label": "tip", "rev": "tip"}
def changelist(**map):
parity = (start - end) & 1
cl = self.repo.changelog
l = [] # build a list in forward order for efficiency
for i in range(start, end):
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 ctx = self.repo.changectx(i)
n = ctx.node()
Eric Hopper
Final stage of the hgweb split up....
r2356
l.insert(0, {"parity": parity,
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 "author": ctx.user(),
"parent": self.siblings(ctx.parents(), i - 1),
"child": self.siblings(ctx.children(), i + 1),
Eric Hopper
Final stage of the hgweb split up....
r2356 "changelogtag": self.showtag("changelogtag",n),
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 "desc": ctx.description(),
"date": ctx.date(),
"files": self.listfilediffs(ctx.files(), n),
Eric Hopper
Final stage of the hgweb split up....
r2356 "rev": i,
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 "node": hex(n)})
Eric Hopper
Final stage of the hgweb split up....
r2356 parity = 1 - parity
for e in l:
yield e
Josef "Jeff" Sipek
[hgweb] Implemented shortlog (gitweb templates only)
r2684 maxchanges = shortlog and self.maxshortchanges or self.maxchanges
Eric Hopper
Final stage of the hgweb split up....
r2356 cl = self.repo.changelog
count = cl.count()
Josef "Jeff" Sipek
[hgweb] Implemented shortlog (gitweb templates only)
r2684 start = max(0, pos - maxchanges + 1)
end = min(count, start + maxchanges)
Eric Hopper
Final stage of the hgweb split up....
r2356 pos = end - 1
Josef "Jeff" Sipek
[hgweb] Implemented shortlog (gitweb templates only)
r2684 yield self.t(shortlog and 'shortlog' or 'changelog',
Eric Hopper
Final stage of the hgweb split up....
r2356 changenav=changenav,
Brendan Cully
hgweb: kill #manifest#
r3205 node=hex(cl.tip()),
Eric Hopper
Final stage of the hgweb split up....
r2356 rev=pos, changesets=count, entries=changelist,
archives=self.archivelist("tip"))
def search(self, query):
def changelist(**map):
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):
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 ctx = self.repo.changectx(j)
l.append(ctx)
Eric Hopper
Final stage of the hgweb split up....
r2356 l.reverse()
for e in l:
yield e
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 for ctx in revgen():
Eric Hopper
Final stage of the hgweb split up....
r2356 miss = 0
for q in qw:
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 if not (q in ctx.user().lower() or
q in ctx.description().lower() or
q in " ".join(ctx.files()[:20]).lower()):
Eric Hopper
Final stage of the hgweb split up....
r2356 miss = 1
break
if miss:
continue
count += 1
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 n = ctx.node()
Eric Hopper
Final stage of the hgweb split up....
r2356
yield self.t('searchentry',
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 parity=self.stripes(count),
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 author=ctx.user(),
parent=self.siblings(ctx.parents()),
child=self.siblings(ctx.children()),
Eric Hopper
Final stage of the hgweb split up....
r2356 changelogtag=self.showtag("changelogtag",n),
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 desc=ctx.description(),
date=ctx.date(),
files=self.listfilediffs(ctx.files(), n),
rev=ctx.rev(),
node=hex(n))
Eric Hopper
Final stage of the hgweb split up....
r2356
if count >= self.maxchanges:
break
cl = self.repo.changelog
yield self.t('search',
query=query,
Brendan Cully
hgweb: kill #manifest#
r3205 node=hex(cl.tip()),
Eric Hopper
Final stage of the hgweb split up....
r2356 entries=changelist)
Brendan Cully
hgweb: use contexts in more handlers
r3220 def changeset(self, ctx):
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 n = ctx.node()
parents = ctx.parents()
p1 = parents[0].node()
Eric Hopper
Final stage of the hgweb split up....
r2356
files = []
Brendan Cully
gitweb: cosmetic fixes....
r3179 parity = 0
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 for f in ctx.files():
Eric Hopper
Final stage of the hgweb split up....
r2356 files.append(self.t("filenodelink",
Brendan Cully
hgweb: kill off #filenode#
r3206 node=hex(n), file=f,
Brendan Cully
gitweb: cosmetic fixes....
r3179 parity=parity))
parity = 1 - parity
Eric Hopper
Final stage of the hgweb split up....
r2356
def diff(**map):
yield self.diff(p1, n, None)
yield self.t('changeset',
diff=diff,
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 rev=ctx.rev(),
node=hex(n),
parent=self.siblings(parents),
child=self.siblings(ctx.children()),
Eric Hopper
Final stage of the hgweb split up....
r2356 changesettag=self.showtag("changesettag",n),
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 author=ctx.user(),
desc=ctx.description(),
date=ctx.date(),
Eric Hopper
Final stage of the hgweb split up....
r2356 files=files,
Brendan Cully
hgweb: use contexts in more handlers
r3220 archives=self.archivelist(hex(n)))
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: kill off #filenode#
r3206 def filelog(self, fctx):
f = fctx.path()
fl = fctx.filelog()
Eric Hopper
Final stage of the hgweb split up....
r2356 count = fl.count()
def entries(**map):
l = []
parity = (count - 1) & 1
for i in range(count):
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 ctx = fctx.filectx(i)
Eric Hopper
Final stage of the hgweb split up....
r2356 n = fl.node(i)
l.insert(0, {"parity": parity,
"filerev": i,
"file": f,
Brendan Cully
hgweb: kill off #filenode#
r3206 "node": hex(ctx.node()),
"author": ctx.user(),
"date": ctx.date(),
Eric Hopper
Final stage of the hgweb split up....
r2356 "rename": self.renamelink(fl, n),
Brendan Cully
hgweb: fix parent/child links across renames
r3392 "parent": self.siblings(fctx.parents()),
"child": self.siblings(fctx.children()),
Brendan Cully
hgweb: kill off #filenode#
r3206 "desc": ctx.description()})
Eric Hopper
Final stage of the hgweb split up....
r2356 parity = 1 - parity
for e in l:
yield e
Brendan Cully
hgweb: kill off #filenode#
r3206 yield self.t("filelog", file=f, node=hex(fctx.node()), entries=entries)
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: kill off #filenode#
r3206 def filerevision(self, fctx):
f = fctx.path()
text = fctx.data()
fl = fctx.filelog()
n = fctx.filenode()
Eric Hopper
Final stage of the hgweb split up....
r2356
mt = mimetypes.guess_type(f)[0]
rawtext = text
if util.binary(text):
mt = mt or 'application/octet-stream'
text = "(binary:%s)" % mt
mt = mt or 'text/plain'
def lines():
for l, t in enumerate(text.splitlines(1)):
yield {"line": t,
"linenumber": "% 6d" % (l + 1),
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 "parity": self.stripes(l)}
Eric Hopper
Final stage of the hgweb split up....
r2356
yield self.t("filerevision",
file=f,
path=_up(f),
text=lines(),
raw=rawtext,
mimetype=mt,
Brendan Cully
hgweb: kill off #filenode#
r3206 rev=fctx.rev(),
node=hex(fctx.node()),
author=fctx.user(),
date=fctx.date(),
Brendan Cully
hgweb: add changeset description to file revision page
r3395 desc=fctx.description(),
Brendan Cully
hgweb: fix parent/child links across renames
r3392 parent=self.siblings(fctx.parents()),
child=self.siblings(fctx.children()),
Eric Hopper
Final stage of the hgweb split up....
r2356 rename=self.renamelink(fl, n),
Brendan Cully
hgweb: kill off #filenode#
r3206 permissions=fctx.manifest().execf(f))
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: kill off #filenode#
r3206 def fileannotate(self, fctx):
f = fctx.path()
Brendan Cully
hgweb: use filectx.annotate instead of filelog
r3173 n = fctx.filenode()
fl = fctx.filelog()
Eric Hopper
Final stage of the hgweb split up....
r2356
def annotate(**map):
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 parity = 0
Eric Hopper
Final stage of the hgweb split up....
r2356 last = None
Brendan Cully
hgweb: make annotate line revisions point to annotation for that rev
r3175 for f, l in fctx.annotate(follow=True):
fnode = f.filenode()
Brendan Cully
hgweb: use filectx.annotate instead of filelog
r3173 name = self.repo.ui.shortuser(f.user())
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: make annotate line revisions point to annotation for that rev
r3175 if last != fnode:
Eric Hopper
Final stage of the hgweb split up....
r2356 parity = 1 - parity
Brendan Cully
hgweb: make annotate line revisions point to annotation for that rev
r3175 last = fnode
Eric Hopper
Final stage of the hgweb split up....
r2356
yield {"parity": parity,
Brendan Cully
hgweb: yield filenode as well as node in annotate, use filenode in annotateline
r3178 "node": hex(f.node()),
Brendan Cully
hgweb: use filectx.annotate instead of filelog
r3173 "rev": f.rev(),
Eric Hopper
Final stage of the hgweb split up....
r2356 "author": name,
Brendan Cully
hgweb: use filectx.annotate instead of filelog
r3173 "file": f.path(),
Eric Hopper
Final stage of the hgweb split up....
r2356 "line": l}
yield self.t("fileannotate",
file=f,
annotate=annotate,
path=_up(f),
Brendan Cully
hgweb: use filectx.annotate instead of filelog
r3173 rev=fctx.rev(),
Brendan Cully
hgweb: fix changeset link in annotate view.
r3177 node=hex(fctx.node()),
Brendan Cully
hgweb: use filectx.annotate instead of filelog
r3173 author=fctx.user(),
date=fctx.date(),
Brendan Cully
hgweb: add changeset description to annotate page
r3391 desc=fctx.description(),
Eric Hopper
Final stage of the hgweb split up....
r2356 rename=self.renamelink(fl, n),
Brendan Cully
hgweb: fix parent/child links across renames
r3392 parent=self.siblings(fctx.parents()),
child=self.siblings(fctx.children()),
Brendan Cully
hgweb: use filectx.annotate instead of filelog
r3173 permissions=fctx.manifest().execf(f))
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: kill #manifest#
r3205 def manifest(self, ctx, path):
mf = ctx.manifest()
node = ctx.node()
Eric Hopper
Final stage of the hgweb split up....
r2356
files = {}
p = path[1:]
if p and p[-1] != "/":
p += "/"
l = len(p)
for f,n in mf.items():
if f[:l] != p:
continue
remain = f[l:]
if "/" in remain:
Benoit Boissinot
use __contains__, index or split instead of str.find...
r2579 short = remain[:remain.index("/") + 1] # bleah
Eric Hopper
Final stage of the hgweb split up....
r2356 files[short] = (f, None)
else:
short = os.path.basename(remain)
files[short] = (f, n)
def filelist(**map):
parity = 0
fl = files.keys()
fl.sort()
for f in fl:
full, fnode = files[f]
if not fnode:
continue
yield {"file": full,
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 "parity": self.stripes(parity),
Eric Hopper
Final stage of the hgweb split up....
r2356 "basename": f,
Matt Mackall
hgweb: add file sizes to manifest browsing
r3305 "size": ctx.filectx(full).size(),
Alexis S. L. Carvalho
Fix some bugs introduced during the manifest refactoring
r2857 "permissions": mf.execf(full)}
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 parity += 1
Eric Hopper
Final stage of the hgweb split up....
r2356
def dirlist(**map):
parity = 0
fl = files.keys()
fl.sort()
for f in fl:
full, fnode = files[f]
if fnode:
continue
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 yield {"parity": self.stripes(parity),
Eric Hopper
Final stage of the hgweb split up....
r2356 "path": os.path.join(path, f),
"basename": f[:-1]}
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 parity += 1
Eric Hopper
Final stage of the hgweb split up....
r2356
yield self.t("manifest",
Brendan Cully
hgweb: kill #manifest#
r3205 rev=ctx.rev(),
Eric Hopper
Final stage of the hgweb split up....
r2356 node=hex(node),
path=path,
up=_up(path),
fentries=filelist,
dentries=dirlist,
archives=self.archivelist(hex(node)))
def tags(self):
cl = self.repo.changelog
i = self.repo.tagslist()
i.reverse()
def entries(notip=False, **map):
parity = 0
for k,n in i:
if notip and k == "tip": continue
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 yield {"parity": self.stripes(parity),
Eric Hopper
Final stage of the hgweb split up....
r2356 "tag": k,
"date": cl.read(n)[2],
"node": hex(n)}
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 parity += 1
Eric Hopper
Final stage of the hgweb split up....
r2356
yield self.t("tags",
Brendan Cully
hgweb: kill #manifest#
r3205 node=hex(self.repo.changelog.tip()),
Eric Hopper
Final stage of the hgweb split up....
r2356 entries=lambda **x: entries(False, **x),
entriesnotip=lambda **x: entries(True, **x))
def summary(self):
cl = self.repo.changelog
i = self.repo.tagslist()
i.reverse()
def tagentries(**map):
parity = 0
count = 0
for k,n in i:
if k == "tip": # skip tip
continue;
count += 1
if count > 10: # limit to 10 tags
break;
c = cl.read(n)
t = c[2]
yield self.t("tagentry",
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 parity = self.stripes(parity),
Eric Hopper
Final stage of the hgweb split up....
r2356 tag = k,
node = hex(n),
Brendan Cully
hgweb: kill #manifest#
r3205 date = t)
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 parity += 1
Eric Hopper
Final stage of the hgweb split up....
r2356
def changelist(**map):
parity = 0
cl = self.repo.changelog
l = [] # build a list in forward order for efficiency
for i in range(start, end):
n = cl.node(i)
changes = cl.read(n)
hn = hex(n)
t = changes[2]
l.insert(0, self.t(
'shortlogentry',
parity = parity,
author = changes[1],
desc = changes[4],
date = t,
rev = i,
node = hn))
parity = 1 - parity
yield l
count = cl.count()
start = max(0, count - self.maxchanges)
end = min(count, start + self.maxchanges)
yield self.t("summary",
desc = self.repo.ui.config("web", "description", "unknown"),
owner = (self.repo.ui.config("ui", "username") or # preferred
self.repo.ui.config("web", "contact") or # deprecated
self.repo.ui.config("web", "author", "unknown")), # also
Brendan Cully
gitweb: fix last change field in summary
r3355 lastchange = cl.read(cl.tip())[2],
Eric Hopper
Final stage of the hgweb split up....
r2356 tags = tagentries,
Josef "Jeff" Sipek
[hgweb] Fixed up gitweb templates...
r2683 shortlog = changelist,
Brendan Cully
gitweb: fix last change field in summary
r3355 node = hex(cl.tip()),
Josef "Jeff" Sipek
[hgweb] Fixed up gitweb templates...
r2683 archives=self.archivelist("tip"))
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: use contexts in more handlers
r3220 def filediff(self, fctx):
n = fctx.node()
path = fctx.path()
parents = fctx.changectx().parents()
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 p1 = parents[0].node()
Eric Hopper
Final stage of the hgweb split up....
r2356
def diff(**map):
Brendan Cully
hgweb: use contexts in more handlers
r3220 yield self.diff(p1, n, [path])
Eric Hopper
Final stage of the hgweb split up....
r2356
yield self.t("filediff",
Brendan Cully
hgweb: use contexts in more handlers
r3220 file=path,
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 node=hex(n),
Brendan Cully
hgweb: use contexts in more handlers
r3220 rev=fctx.rev(),
Brendan Cully
hgweb: teach siblings and callers to use contexts
r3208 parent=self.siblings(parents),
Brendan Cully
hgweb: use contexts in more handlers
r3220 child=self.siblings(fctx.children()),
Eric Hopper
Final stage of the hgweb split up....
r2356 diff=diff)
archive_specs = {
Thomas Arendsen Hein
Fix automatic decompression of tarballs with Firefox....
r2361 'bz2': ('application/x-tar', 'tbz2', '.tar.bz2', None),
'gz': ('application/x-tar', 'tgz', '.tar.gz', None),
Eric Hopper
Final stage of the hgweb split up....
r2356 'zip': ('application/zip', 'zip', '.zip', None),
}
Benoit Boissinot
hgweb: fix errors and warnings found by pychecker...
r2394 def archive(self, req, cnode, type_):
Eric Hopper
Final stage of the hgweb split up....
r2356 reponame = re.sub(r"\W+", "-", os.path.basename(self.reponame))
name = "%s-%s" % (reponame, short(cnode))
Benoit Boissinot
hgweb: fix errors and warnings found by pychecker...
r2394 mimetype, artype, extension, encoding = self.archive_specs[type_]
Eric Hopper
Final stage of the hgweb split up....
r2356 headers = [('Content-type', mimetype),
('Content-disposition', 'attachment; filename=%s%s' %
(name, extension))]
if encoding:
headers.append(('Content-encoding', encoding))
req.header(headers)
archival.archive(self.repo, req.out, cnode, artype, prefix=name)
# add tags to things
# tags -> list of changesets corresponding to tags
# find tag, changeset, file
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436 def cleanpath(self, path):
Benoit Boissinot
hgweb: fix path cleaning
r3382 return util.canonpath(self.repo.root, '', path)
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436
Eric Hopper
Arrange for old copies of CGI scripts to still work.
r2535 def run(self):
Eric Hopper
Cleanup hgweb and hgwebdir's run method a bit.
r2538 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
Eric Hopper
Arrange for old copies of CGI scripts to still work.
r2535 raise RuntimeError("This function is only intended to be called while running as a CGI script.")
import mercurial.hgweb.wsgicgi as wsgicgi
from request import wsgiapplication
def make_web_app():
Eric Hopper
Cleanup hgweb and hgwebdir's run method a bit.
r2538 return self
Eric Hopper
Arrange for old copies of CGI scripts to still work.
r2535 wsgicgi.launch(wsgiapplication(make_web_app))
def run_wsgi(self, req):
Eric Hopper
Final stage of the hgweb split up....
r2356 def header(**map):
Eric Hopper
Really fix http headers for web UI and issue 254....
r2514 header_file = cStringIO.StringIO(''.join(self.t("header", **map)))
msg = mimetools.Message(header_file, 0)
req.header(msg.items())
yield header_file.read()
Eric Hopper
Final stage of the hgweb split up....
r2356
Eric Hopper
Fix raw files in the web UI.
r2534 def rawfileheader(**map):
req.header([('Content-type', map['mimetype']),
('Content-disposition', 'filename=%s' % map['file']),
('Content-length', str(len(map['raw'])))])
yield ''
Eric Hopper
Final stage of the hgweb split up....
r2356 def footer(**map):
yield self.t("footer",
motd=self.repo.ui.config("web", "motd", ""),
**map)
def expand_form(form):
shortcuts = {
'cl': [('cmd', ['changelog']), ('rev', None)],
Josef "Jeff" Sipek
[hgweb] Implemented shortlog (gitweb templates only)
r2684 'sl': [('cmd', ['shortlog']), ('rev', None)],
Eric Hopper
Final stage of the hgweb split up....
r2356 'cs': [('cmd', ['changeset']), ('node', None)],
'f': [('cmd', ['file']), ('filenode', None)],
'fl': [('cmd', ['filelog']), ('filenode', None)],
'fd': [('cmd', ['filediff']), ('node', None)],
'fa': [('cmd', ['annotate']), ('filenode', None)],
'mf': [('cmd', ['manifest']), ('manifest', None)],
'ca': [('cmd', ['archive']), ('node', None)],
'tags': [('cmd', ['tags'])],
'tip': [('cmd', ['changeset']), ('node', ['tip'])],
'static': [('cmd', ['static']), ('file', None)]
}
for k in shortcuts.iterkeys():
if form.has_key(k):
for name, value in shortcuts[k]:
if value is None:
value = form[k]
form[name] = value
del form[k]
Brendan Cully
hgweb: accept NewWebInterface URLs
r3260 def rewrite_request(req):
'''translate new web interface to traditional format'''
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 def spliturl(req):
def firstitem(query):
return query.split('&', 1)[0].split(';', 1)[0]
Brendan Cully
NWI base URL detection fixes
r3327 def normurl(url):
inner = '/'.join([x for x in url.split('/') if x])
tl = len(url) > 1 and url.endswith('/') and '/' or ''
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263
Brendan Cully
NWI base URL detection fixes
r3327 return '%s%s%s' % (url.startswith('/') and '/' or '',
inner, tl)
root = normurl(req.env.get('REQUEST_URI', '').split('?', 1)[0])
pi = normurl(req.env.get('PATH_INFO', ''))
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 if pi:
Brendan Cully
NWI base URL detection fixes
r3327 # strip leading /
pi = pi[1:]
if pi:
root = root[:-len(pi)]
if req.env.has_key('REPO_NAME'):
rn = req.env['REPO_NAME'] + '/'
root += rn
query = pi[len(rn):]
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 else:
Brendan Cully
NWI base URL detection fixes
r3327 query = pi
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 else:
Brendan Cully
NWI base URL detection fixes
r3327 root += '?'
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 query = firstitem(req.env['QUERY_STRING'])
Brendan Cully
NWI base URL detection fixes
r3327 return (root, query)
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263
req.url, query = spliturl(req)
Brendan Cully
hgweb: accept NewWebInterface URLs
r3260 if req.form.has_key('cmd'):
# old style
return
args = query.split('/', 2)
if not args or not args[0]:
return
cmd = args.pop(0)
Brendan Cully
hgweb: extract raw prefix from NWI commands
r3261 style = cmd.rfind('-')
if style != -1:
req.form['style'] = [cmd[:style]]
cmd = cmd[style+1:]
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 # avoid accepting e.g. style parameter as command
if hasattr(self, 'do_' + cmd):
req.form['cmd'] = [cmd]
Brendan Cully
hgweb: accept NewWebInterface URLs
r3260
if args and args[0]:
node = args.pop(0)
req.form['node'] = [node]
if args:
req.form['file'] = args
if cmd == 'static':
req.form['file'] = req.form['node']
elif cmd == 'archive':
fn = req.form['node'][0]
for type_, spec in self.archive_specs.iteritems():
ext = spec[2]
if fn.endswith(ext):
req.form['node'] = [fn[:-len(ext)]]
req.form['type'] = [type_]
Thomas Arendsen Hein
hgweb: Keep session variables (currently only style) in HTML forms, too....
r3362 def sessionvars(**map):
fields = []
if req.form.has_key('style'):
style = req.form['style'][0]
if style != self.repo.ui.config('web', 'style', ''):
fields.append(('style', style))
Thomas Arendsen Hein
hgweb: Apply the new method of passing session variables to links.
r3363 separator = req.url[-1] == '?' and ';' or '?'
Thomas Arendsen Hein
hgweb: Keep session variables (currently only style) in HTML forms, too....
r3362 for name, value in fields:
Thomas Arendsen Hein
hgweb: Apply the new method of passing session variables to links.
r3363 yield dict(name=name, value=value, separator=separator)
separator = ';'
Brendan Cully
hgweb: provide means for handling query parameters
r3270
Eric Hopper
Final stage of the hgweb split up....
r2356 self.refresh()
expand_form(req.form)
Brendan Cully
hgweb: accept NewWebInterface URLs
r3260 rewrite_request(req)
Eric Hopper
Final stage of the hgweb split up....
r2356
style = self.repo.ui.config("web", "style", "")
if req.form.has_key('style'):
style = req.form['style'][0]
Thomas Arendsen Hein
hgweb: Search templates in templatepath/style/map, too, using a common function....
r3276 mapfile = style_map(self.templatepath, style)
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 if not req.url:
port = req.env["SERVER_PORT"]
port = port != "80" and (":" + port) or ""
uri = req.env["REQUEST_URI"]
if "?" in uri:
uri = uri.split("?")[0]
req.url = "http://%s%s%s" % (req.env["SERVER_NAME"], port, uri)
Eric Hopper
Final stage of the hgweb split up....
r2356 if not self.reponame:
self.reponame = (self.repo.ui.config("web", "name")
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 or req.env.get('REPO_NAME')
or req.url.strip('/') or self.repo.root)
Eric Hopper
Final stage of the hgweb split up....
r2356
Thomas Arendsen Hein
hgweb: Search templates in templatepath/style/map, too, using a common function....
r3276 self.t = templater.templater(mapfile, templater.common_filters,
Brendan Cully
hgweb: support for generating and parsing NWI URLs
r3263 defaults={"url": req.url,
Eric Hopper
Final stage of the hgweb split up....
r2356 "repo": self.reponame,
"header": header,
"footer": footer,
Eric Hopper
Fix raw files in the web UI.
r2534 "rawfileheader": rawfileheader,
Thomas Arendsen Hein
hgweb: Apply the new method of passing session variables to links.
r3363 "sessionvars": sessionvars
Eric Hopper
Final stage of the hgweb split up....
r2356 })
if not req.form.has_key('cmd'):
req.form['cmd'] = [self.t.cache['default'],]
cmd = req.form['cmd'][0]
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436 method = getattr(self, 'do_' + cmd, None)
if method:
Brendan Cully
hgweb: trap lookup errors
r3359 try:
method(req)
except (hg.RepoError, revlog.RevlogError), inst:
req.write(self.t("error", error=str(inst)))
Eric Hopper
Final stage of the hgweb split up....
r2356 else:
Brendan Cully
Add better error message for bad commands
r3358 req.write(self.t("error", error='No such method: ' + cmd))
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436
Brendan Cully
hgweb: add methods to get contexts from request
r3226 def changectx(self, req):
if req.form.has_key('node'):
changeid = req.form['node'][0]
Brendan Cully
hgweb: globally default to tip if no revision is specified
r3333 elif req.form.has_key('manifest'):
changeid = req.form['manifest'][0]
Brendan Cully
hgweb: add methods to get contexts from request
r3226 else:
Brendan Cully
hgweb: globally default to tip if no revision is specified
r3333 changeid = self.repo.changelog.count() - 1
Brendan Cully
hgweb: add methods to get contexts from request
r3226 try:
ctx = self.repo.changectx(changeid)
except hg.RepoError:
man = self.repo.manifest
mn = man.lookup(changeid)
ctx = self.repo.changectx(man.linkrev(mn))
return ctx
def filectx(self, req):
path = self.cleanpath(req.form['file'][0])
if req.form.has_key('node'):
changeid = req.form['node'][0]
else:
changeid = req.form['filenode'][0]
try:
ctx = self.repo.changectx(changeid)
fctx = ctx.filectx(path)
except hg.RepoError:
fctx = self.repo.filectx(path, fileid=changeid)
return fctx
Frank Kingswood
hgweb: Configurable zebra stripes...
r2666 def stripes(self, parity):
"make horizontal stripes for easier reading"
if self.stripecount:
return (1 + parity / self.stripecount) & 1
else:
return 0
Brendan Cully
hgweb: accept NewWebInterface URLs
r3260 def do_log(self, req):
if req.form.has_key('file') and req.form['file'][0]:
self.do_filelog(req)
else:
self.do_changelog(req)
def do_rev(self, req):
self.do_changeset(req)
def do_file(self, req):
path = req.form.get('file', [''])[0]
if path:
try:
req.write(self.filerevision(self.filectx(req)))
return
except hg.RepoError:
pass
path = self.cleanpath(path)
req.write(self.manifest(self.changectx(req), '/' + path))
def do_diff(self, req):
self.do_filediff(req)
Brendan Cully
hgweb: add methods to get contexts from request
r3226 def do_changelog(self, req, shortlog = False):
if req.form.has_key('node'):
ctx = self.changectx(req)
Brendan Cully
hgweb: use contexts in more handlers
r3220 else:
Brendan Cully
hgweb: add methods to get contexts from request
r3226 if req.form.has_key('rev'):
hi = req.form['rev'][0]
else:
hi = self.repo.changelog.count() - 1
try:
ctx = self.repo.changectx(hi)
except hg.RepoError:
req.write(self.search(hi)) # XXX redirect to 404 page?
return
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436
Brendan Cully
hgweb: add methods to get contexts from request
r3226 req.write(self.changelog(ctx, shortlog = shortlog))
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436
Josef "Jeff" Sipek
[hgweb] Implemented shortlog (gitweb templates only)
r2684 def do_shortlog(self, req):
Brendan Cully
hgweb: add methods to get contexts from request
r3226 self.do_changelog(req, shortlog = True)
Josef "Jeff" Sipek
[hgweb] Implemented shortlog (gitweb templates only)
r2684
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436 def do_changeset(self, req):
Brendan Cully
hgweb: globally default to tip if no revision is specified
r3333 req.write(self.changeset(self.changectx(req)))
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436
def do_manifest(self, req):
Brendan Cully
hgweb: add methods to get contexts from request
r3226 req.write(self.manifest(self.changectx(req),
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436 self.cleanpath(req.form['path'][0])))
def do_tags(self, req):
req.write(self.tags())
def do_summary(self, req):
req.write(self.summary())
def do_filediff(self, req):
Brendan Cully
hgweb: add methods to get contexts from request
r3226 req.write(self.filediff(self.filectx(req)))
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436
def do_annotate(self, req):
Brendan Cully
hgweb: add methods to get contexts from request
r3226 req.write(self.fileannotate(self.filectx(req)))
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436
def do_filelog(self, req):
Brendan Cully
hgweb: add methods to get contexts from request
r3226 req.write(self.filelog(self.filectx(req)))
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436
def do_heads(self, req):
resp = " ".join(map(hex, self.repo.heads())) + "\n"
req.httphdr("application/mercurial-0.1", length=len(resp))
req.write(resp)
def do_branches(self, req):
nodes = []
if req.form.has_key('nodes'):
nodes = map(bin, req.form['nodes'][0].split(" "))
resp = cStringIO.StringIO()
for b in self.repo.branches(nodes):
resp.write(" ".join(map(hex, b)) + "\n")
resp = resp.getvalue()
req.httphdr("application/mercurial-0.1", length=len(resp))
req.write(resp)
def do_between(self, req):
if req.form.has_key('pairs'):
pairs = [map(bin, p.split("-"))
for p in req.form['pairs'][0].split(" ")]
resp = cStringIO.StringIO()
for b in self.repo.between(pairs):
resp.write(" ".join(map(hex, b)) + "\n")
resp = resp.getvalue()
req.httphdr("application/mercurial-0.1", length=len(resp))
req.write(resp)
def do_changegroup(self, req):
req.httphdr("application/mercurial-0.1")
nodes = []
if not self.allowpull:
return
if req.form.has_key('roots'):
nodes = map(bin, req.form['roots'][0].split(" "))
z = zlib.compressobj()
f = self.repo.changegroup(nodes, 'serve')
while 1:
chunk = f.read(4096)
if not chunk:
break
req.write(z.compress(chunk))
req.write(z.flush())
def do_archive(self, req):
changeset = self.repo.lookup(req.form['node'][0])
type_ = req.form['type'][0]
Thomas Arendsen Hein
Fixed [web] allow_archive for comma separated parameters by using ui.configlist....
r2500 allowed = self.repo.ui.configlist("web", "allow_archive")
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436 if (type_ in self.archives and (type_ in allowed or
self.repo.ui.configbool("web", "allow" + type_, False))):
self.archive(req, changeset, type_)
return
req.write(self.t("error"))
def do_static(self, req):
fname = req.form['file'][0]
static = self.repo.ui.config("web", "static",
os.path.join(self.templatepath,
"static"))
Eric Hopper
Really fix http headers for web UI and issue 254....
r2514 req.write(staticfile(static, fname, req)
Vadim Gelfer
hgweb: split "verbs" into methods.
r2436 or self.t("error", error="%r not found" % fname))
Vadim Gelfer
http: query server for capabilities
r2442
def do_capabilities(self, req):
Vadim Gelfer
clone: disable stream support on server side by default....
r2621 caps = ['unbundle']
Vadim Gelfer
rename stream hgrc option to compressed.
r2622 if self.repo.ui.configbool('server', 'uncompressed'):
Vadim Gelfer
clone: disable stream support on server side by default....
r2621 caps.append('stream=%d' % self.repo.revlogversion)
resp = ' '.join(caps)
Vadim Gelfer
http: query server for capabilities
r2442 req.httphdr("application/mercurial-0.1", length=len(resp))
req.write(resp)
Vadim Gelfer
push over http: server side authorization support....
r2466 def check_perm(self, req, op, default):
'''check permission for operation based on user auth.
return true if op allowed, else false.
default is policy to use if no config given.'''
user = req.env.get('REMOTE_USER')
Thomas Arendsen Hein
Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist.
r2501 deny = self.repo.ui.configlist('web', 'deny_' + op)
Vadim Gelfer
push over http: server side authorization support....
r2466 if deny and (not user or deny == ['*'] or user in deny):
return False
Thomas Arendsen Hein
Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist.
r2501 allow = self.repo.ui.configlist('web', 'allow_' + op)
Vadim Gelfer
push over http: server side authorization support....
r2466 return (allow and (allow == ['*'] or user in allow)) or default
Vadim Gelfer
push over http: server support....
r2464 def do_unbundle(self, req):
Vadim Gelfer
push over http: server side authorization support....
r2466 def bail(response, headers={}):
length = int(req.env['CONTENT_LENGTH'])
for s in util.filechunkiter(req, limit=length):
# drain incoming bundle, else client will not see
# response when run outside cgi script
pass
req.httphdr("application/mercurial-0.1", headers=headers)
req.write('0\n')
req.write(response)
# require ssl by default, auth info cannot be sniffed and
# replayed
ssl_req = self.repo.ui.configbool('web', 'push_ssl', True)
Vadim Gelfer
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks...
r2673 if ssl_req:
if not req.env.get('HTTPS'):
bail(_('ssl required\n'))
return
proto = 'https'
else:
proto = 'http'
Vadim Gelfer
push over http: server side authorization support....
r2466
# do not allow push unless explicitly allowed
if not self.check_perm(req, 'push', False):
bail(_('push not authorized\n'),
headers={'status': '401 Unauthorized'})
return
req.httphdr("application/mercurial-0.1")
Vadim Gelfer
push over http: server support....
r2464 their_heads = req.form['heads'][0].split(' ')
def check_heads():
heads = map(hex, self.repo.heads())
return their_heads == [hex('force')] or their_heads == heads
# fail early if possible
if not check_heads():
Vadim Gelfer
push over http: server side authorization support....
r2466 bail(_('unsynced changes\n'))
Vadim Gelfer
push over http: server support....
r2464 return
# do not lock repo until all changegroup data is
# streamed. save to temporary file.
fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
fp = os.fdopen(fd, 'wb+')
try:
length = int(req.env['CONTENT_LENGTH'])
for s in util.filechunkiter(req, limit=length):
fp.write(s)
lock = self.repo.lock()
try:
if not check_heads():
req.write('0\n')
req.write(_('unsynced changes\n'))
return
fp.seek(0)
# send addchangegroup output to client
old_stdout = sys.stdout
sys.stdout = cStringIO.StringIO()
try:
Vadim Gelfer
hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks...
r2673 url = 'remote:%s:%s' % (proto,
req.env.get('REMOTE_HOST', ''))
ret = self.repo.addchangegroup(fp, 'serve', url)
Vadim Gelfer
push over http: server support....
r2464 finally:
Alexis S. L. Carvalho
hgweb: fix unbundle....
r2558 val = sys.stdout.getvalue()
Vadim Gelfer
push over http: server support....
r2464 sys.stdout = old_stdout
Alexis S. L. Carvalho
hgweb: fix unbundle....
r2558 req.write('%d\n' % ret)
req.write(val)
Vadim Gelfer
push over http: server support....
r2464 finally:
lock.release()
finally:
fp.close()
os.unlink(tempname)
Vadim Gelfer
add support for streaming clone....
r2612
def do_stream_out(self, req):
req.httphdr("application/mercurial-0.1")
streamclone.stream_out(self.repo, req)