mercurial-crew-with-dirclash: comparison mercurial/hgweb.py

equal deleted inserted replaced

-:5a15df632e6a
+:5f277e73778f
 # of the GNU General Public License, incorporated herein by reference.
 import os, cgi, sys
 from demandload import demandload
 demandload(globals(), "mdiff time re socket zlib errno ui hg ConfigParser")
-demandload(globals(), "zipfile tempfile StringIO tarfile BaseHTTPServer")
+demandload(globals(), "zipfile tempfile StringIO tarfile BaseHTTPServer util")
 from node import *
 def templatepath():
 for f in "templates", "../templates":
 p = os.path.join(os.path.dirname(__file__), f)
 if os.path.isdir(p):
 return p
-def age(t):
+def age(x):
 def plural(t, c):
 if c == 1:
 return t
 return t + "s"
 def fmt(t, c):
 return "%d %s" % (c, plural(t, c))
 now = time.time()
-delta = max(1, int(now - t))
+then = int(x[2].split(' ')[0])
+delta = max(1, int(now - then))
 scales = [["second", 1],
 ["minute", 60],
 ["hour", 3600],
 ["day", 3600 * 24],
 tmpl = tmpl[m.end(0):]
 else:
 yield tmpl
 return
-def rfc822date(x):
-return time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime(x))
 common_filters = {
 "escape": cgi.escape,
 "age": age,
-"date": (lambda x: time.asctime(time.gmtime(x))),
+"date": util.datestr,
 "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--"),
-"rfc822date": rfc822date,
+"rfc822date": lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S"),
 }
 class hgweb:
 def __init__(self, repo, name=None):
 if type(repo) == type(""):
 self.repo = hg.repository(ui.ui(), repo)
 self.maxchanges = int(self.repo.ui.config("web", "maxchanges", 10))
 self.maxfiles = int(self.repo.ui.config("web", "maxfiles", 10))
 self.allowpull = self.repo.ui.configbool("web", "allowpull", True)
 def date(self, cs):
-return time.asctime(time.gmtime(float(cs[2].split(' ')[0])))
+return util.datestr(cs)
 def listfiles(self, files, mf):
 for f in files[:self.maxfiles]:
 yield self.t("filenodelink", node=hex(mf[f]), file=f)
 if len(files) > self.maxfiles:
 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 = float(changes[2].split(' ')[0])
 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],
-"date": t,
+"date": changes,
 "files": self.listfilediffs(changes[3], n),
 "rev": i,
 "node": hn})
 parity = 1 - parity
 if miss:
 continue
 count += 1
 hn = hex(n)
-t = float(changes[2].split(' ')[0])
 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],
-date=t,
+date=changes,
 files=self.listfilediffs(changes[3], n),
 rev=i,
 node=hn)
 if count >= self.maxchanges:
 def changeset(self, nodeid):
 n = bin(nodeid)
 cl = self.repo.changelog
 changes = cl.read(n)
 p1 = cl.parents(n)[0]
-t = float(changes[2].split(' ')[0])
 files = []
 mf = self.repo.manifest.read(changes[0])
 for f in changes[3]:
 files.append(self.t("filenodelink",
 cl.parents(n), cl.rev),
 changesettag=self.showtag("changesettag",n),
 manifest=hex(changes[0]),
 author=changes[1],
 desc=changes[4],
-date=t,
+date=changes,
 files=files,
 archives=archivelist())
 def filelog(self, f, filenode):
 cl = self.repo.changelog
 for i in range(count):
 n = fl.node(i)
 lr = fl.linkrev(n)
 cn = cl.node(lr)
 cs = cl.read(cl.node(lr))
-t = float(cs[2].split(' ')[0])
 l.insert(0, {"parity": parity,
 "filenode": hex(n),
 "filerev": i,
 "file": f,
 "node": hex(cn),
 "author": cs[1],
-"date": t,
+"date": cs,
 "parent": self.parents("filelogparent",
 fl.parents(n),
 fl.rev, file=f),
 "desc": cs[4]})
 parity = 1 - parity
 text = fl.read(n)
 changerev = fl.linkrev(n)
 cl = self.repo.changelog
 cn = cl.node(changerev)
 cs = cl.read(cn)
-t = float(cs[2].split(' ')[0])
 mfn = cs[0]
 def lines():
 for l, t in enumerate(text.splitlines(1)):
 yield {"line": t,
 text=lines(),
 rev=changerev,
 node=hex(cn),
 manifest=hex(mfn),
 author=cs[1],
-date=t,
+date=cs,
 parent=self.parents("filerevparent",
 fl.parents(n), fl.rev, file=f),
 permissions=self.repo.manifest.readflags(mfn)[f])
 def fileannotate(self, f, node):
 changerev = fl.linkrev(n)
 cl = self.repo.changelog
 cn = cl.node(changerev)
 cs = cl.read(cn)
-t = float(cs[2].split(' ')[0])
 mfn = cs[0]
 def annotate(**map):
 parity = 1
 last = None
 path=up(f),
 rev=changerev,
 node=hex(cn),
 manifest=hex(mfn),
 author=cs[1],
-date=t,
+date=cs,
 parent=self.parents("fileannotateparent",
 fl.parents(n), fl.rev, file=f),
 permissions=self.repo.manifest.readflags(mfn)[f])
 def manifest(self, mnode, path):

changeset 1320	5f277e73778f
parent 1308	2073e5a71008
child 1321	b47f96a178a3