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

equal deleted inserted replaced

-:5f471a75d607
+:529bf610092e
 for f in files[:self.maxfiles]:
 yield self.t("filedifflink", node = hex(changeset), file = f)
 if len(files) > self.maxfiles:
 yield self.t("fileellipses")
+def parent(self, t1, node, rev):
+if node != hex(nullid):
+yield self.t(t1, node = node, rev = rev)
 def diff(self, node1, node2, files):
 def filterfiles(list, files):
 l = [ x for x in list if x in files ]
 for f in files:
 for f in d:
 to = r.file(f).read(mmap1[f])
 tn = ""
 yield prettyprint(mdiff.unidiff(to, date1, tn, date2, f))
+def header(self):
+yield self.t("header", repo = self.reponame)
+def footer(self):
+yield self.t("footer", repo = self.reponame)
 def changelog(self, pos=None):
 def changenav():
 def seq(factor = 1):
 yield 1 * factor
 yield 2 * factor
 yield self.t("naventry", rev = s)
 yield self.t("naventry", rev = count - 1)
 def changelist():
+parity = (start - end) & 1
 cl = self.repo.changelog
 l = [] # build a list in forward order for efficiency
 for i in range(start, end + 1):
 n = cl.node(i)
 changes = cl.read(n)
 p1, p2 = cl.parents(n)
 t = float(changes[2].split(' ')[0])
 l.insert(0, self.t(
 'changelogentry',
+parity = parity,
 author = obfuscate(changes[1]),
 shortdesc = cgi.escape(changes[4].splitlines()[0]),
 age = age(t),
+parent1 = self.parent("changelogparent",
+hex(p1), cl.rev(p1)),
+parent2 = self.parent("changelogparent",
+hex(p2), cl.rev(p2)),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = cl.rev(p1), p2rev = cl.rev(p2),
 manifest = hex(changes[0]),
 desc = nl2br(cgi.escape(changes[4])),
 date = time.asctime(time.gmtime(t)),
 files = self.listfilediffs(changes[3], n),
 rev = i,
 node = hn))
+parity = 1 - parity
 yield l
 count = self.repo.changelog.count()
 pos = pos or count - 1
 end = min(pos, count - 1)
 start = max(0, pos - self.maxchanges)
 end = min(count - 1, start + self.maxchanges)
-yield self.t('changelog', repo = self.reponame, changenav = changenav,
+yield self.t('changelog',
-rev = pos, changesets = count, changelist = changelist)
+header = self.header(),
+footer = self.footer(),
+repo = self.reponame,
+changenav = changenav,
+rev = pos, changesets = count, entries = changelist)
 def changeset(self, nodeid):
 n = bin(nodeid)
 cl = self.repo.changelog
 changes = cl.read(n)
 def diff():
 yield self.diff(p1, n, changes[3])
 yield self.t('changeset',
+header = self.header(),
+footer = self.footer(),
+repo = self.reponame,
 diff = diff,
 rev = cl.rev(n),
 node = nodeid,
 shortdesc = cgi.escape(changes[4].splitlines()[0]),
+parent1 = self.parent("changesetparent",
+hex(p1), cl.rev(p1)),
+parent2 = self.parent("changesetparent",
+hex(p2), cl.rev(p2)),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = cl.rev(p1), p2rev = cl.rev(p2),
 manifest = hex(changes[0]),
 author = obfuscate(changes[1]),
 desc = nl2br(cgi.escape(changes[4])),
 fl = self.repo.file(f)
 count = fl.count()
 def entries():
 l = []
+parity = (count - 1) & 1
 for i in range(count):
 n = fl.node(i)
 lr = fl.linkrev(n)
 cn = cl.node(lr)
 cs = cl.read(cl.node(lr))
 p1, p2 = fl.parents(n)
 t = float(cs[2].split(' ')[0])
 l.insert(0, self.t("filelogentry",
+parity = parity,
 filenode = hex(n),
 filerev = i,
 file = f,
 node = hex(cn),
 author = obfuscate(cs[1]),
 age = age(t),
 date = time.asctime(time.gmtime(t)),
 shortdesc = cgi.escape(cs[4].splitlines()[0]),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = fl.rev(p1), p2rev = fl.rev(p2)))
+parity = 1 - parity
 yield l
 yield self.t("filelog",
+header = self.header(),
+footer = self.footer(),
+repo = self.reponame,
 file = f,
 filenode = filenode,
 entries = entries)
 def filerevision(self, f, node):
 cn = cl.node(changerev)
 cs = cl.read(cn)
 p1, p2 = fl.parents(n)
 t = float(cs[2].split(' ')[0])
 mfn = cs[0]
+def lines():
+for l, t in enumerate(text.splitlines(1)):
+yield self.t("fileline",
+line = t,
+linenumber = "% 6d" % (l + 1),
+parity = l & 1)
 yield self.t("filerevision", file = f,
+header = self.header(),
+footer = self.footer(),
+repo = self.reponame,
 filenode = node,
 path = up(f),
-text = text,
+text = lines(),
 rev = changerev,
 node = hex(cn),
 manifest = hex(mfn),
 author = obfuscate(cs[1]),
 age = age(t),
 date = time.asctime(time.gmtime(t)),
 shortdesc = cgi.escape(cs[4].splitlines()[0]),
+parent1 = self.parent("filerevparent",
+hex(p1), fl.rev(p1)),
+parent2 = self.parent("filerevparent",
+hex(p2), fl.rev(p2)),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = fl.rev(p1), p2rev = fl.rev(p2))
 def fileannotate(self, f, node):
 p1, p2 = fl.parents(n)
 t = float(cs[2].split(' ')[0])
 mfn = cs[0]
 def annotate():
+parity = 1
+last = None
 for r, l in fl.annotate(n):
 try:
 cnode = ncache[r]
 except KeyError:
 cnode = ncache[r] = self.repo.changelog.node(r)
 f = name.find('@')
 if f >= 0:
 name = name[:f]
 bcache[r] = name
+if last != cnode:
+parity = 1 - parity
+last = cnode
 yield self.t("annotateline",
+parity = parity,
 node = hex(cnode),
 rev = r,
 author = name,
 file = f,
 line = cgi.escape(l))
 yield self.t("fileannotate",
+header = self.header(),
+footer = self.footer(),
+repo = self.reponame,
 file = f,
 filenode = node,
 annotate = annotate,
 path = up(f),
 rev = changerev,
 manifest = hex(mfn),
 author = obfuscate(cs[1]),
 age = age(t),
 date = time.asctime(time.gmtime(t)),
 shortdesc = cgi.escape(cs[4].splitlines()[0]),
+parent1 = self.parent("filerevparent",
+hex(p1), fl.rev(p1)),
+parent2 = self.parent("filerevparent",
+hex(p2), fl.rev(p2)),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = fl.rev(p1), p2rev = fl.rev(p2))
 def manifest(self, mnode, path):
 mf = self.repo.manifest.read(bin(mnode))
 rev = self.repo.manifest.rev(bin(mnode))
 node = self.repo.changelog.node(rev)
-dirs = {}
 files = {}
-short = {}
 p = path[1:]
 l = len(p)
 for f,n in mf.items():
 if f[:l] != p:
 continue
 remain = f[l:]
 if "/" in remain:
 short = remain[:remain.find("/") + 1] # bleah
-dirs[short] = 1
+files[short] = (f, None)
 else:
 short = os.path.basename(remain)
 files[short] = (f, n)
-def dirlist():
-dl = dirs.keys()
-dl.sort()
-for d in dl:
-yield self.t("manifestdirentry",
-path = os.path.join(path, d),
-manifest = mnode, basename = d[:-1])
 def filelist():
+parity = 0
 fl = files.keys()
 fl.sort()
 for f in fl:
 full, fnode = files[f]
-yield self.t("manifestfileentry",
+if fnode:
-file = full, manifest = mnode, filenode = hex(fnode),
+yield self.t("manifestfileentry",
-basename = f)
+file = full,
+manifest = mnode,
+filenode = hex(fnode),
+parity = parity,
+basename = f)
+else:
+yield self.t("manifestdirentry",
+parity = parity,
+path = os.path.join(path, f),
+manifest = mnode, basename = f[:-1])
+parity = 1 - parity
 yield self.t("manifest",
+header = self.header(),
+footer = self.footer(),
+repo = self.reponame,
 manifest = mnode,
 rev = rev,
 node = hex(node),
 path = path,
 up = up(path),
-dirs = dirlist,
+entries = filelist)
-files = filelist)
 def filediff(self, file, changeset):
 n = bin(changeset)
 cl = self.repo.changelog
 p1 = cl.parents(n)[0]
 def diff():
 yield self.diff(p1, n, file)
 yield self.t("filediff",
+header = self.header(),
+footer = self.footer(),
+repo = self.reponame,
 file = file,
 filenode = hex(mf[file]),
 node = changeset,
 rev = self.repo.changelog.rev(n),
 p1 = hex(p1),
 p1rev = self.repo.changelog.rev(p1),
 diff = diff)
-# header and footer, css
 # add tags to things
-# show parents
-# diff between rev and parent in changeset and file
-# manifest links
-# browse at top
 # tags -> list of changesets corresponding to tags
 # find tag, changeset, file
 def run(self):
 args = cgi.parse()

changeset 142	529bf610092e
parent 138	c77a679e9cfa
child 153	e8a360cd5a9f
child 155	083c38bdfa64