comparison mercurial/hgweb.py @ 156:32ce2c5d4d25

Fix some broken parent links in hgweb
author mpm@selenic.com
date Wed, 25 May 2005 09:04:38 -0800
parents 083c38bdfa64
children 2653740d8118
comparison
equal deleted inserted replaced
155:083c38bdfa64 156:32ce2c5d4d25
120 for f in files[:self.maxfiles]: 120 for f in files[:self.maxfiles]:
121 yield self.t("filedifflink", node = hex(changeset), file = f) 121 yield self.t("filedifflink", node = hex(changeset), file = f)
122 if len(files) > self.maxfiles: 122 if len(files) > self.maxfiles:
123 yield self.t("fileellipses") 123 yield self.t("fileellipses")
124 124
125 def parent(self, t1, node, rev): 125 def parent(self, t1, node=nullid, rev=-1, **args):
126 if node != hex(nullid): 126 if node != hex(nullid):
127 yield self.t(t1, node = node, rev = rev) 127 yield self.t(t1, node = node, rev = rev, **args)
128 128
129 def diff(self, node1, node2, files): 129 def diff(self, node1, node2, files):
130 def filterfiles(list, files): 130 def filterfiles(list, files):
131 l = [ x for x in list if x in files ] 131 l = [ x for x in list if x in files ]
132 132
357 author = obfuscate(cs[1]), 357 author = obfuscate(cs[1]),
358 age = age(t), 358 age = age(t),
359 date = time.asctime(time.gmtime(t)), 359 date = time.asctime(time.gmtime(t)),
360 shortdesc = cgi.escape(cs[4].splitlines()[0]), 360 shortdesc = cgi.escape(cs[4].splitlines()[0]),
361 parent1 = self.parent("filerevparent", 361 parent1 = self.parent("filerevparent",
362 hex(p1), fl.rev(p1)), 362 hex(p1), fl.rev(p1), file=f),
363 parent2 = self.parent("filerevparent", 363 parent2 = self.parent("filerevparent",
364 hex(p2), fl.rev(p2)), 364 hex(p2), fl.rev(p2), file=f),
365 p1 = hex(p1), p2 = hex(p2), 365 p1 = hex(p1), p2 = hex(p2),
366 p1rev = fl.rev(p1), p2rev = fl.rev(p2)) 366 p1rev = fl.rev(p1), p2rev = fl.rev(p2))
367 367
368 368
369 def fileannotate(self, f, node): 369 def fileannotate(self, f, node):
424 manifest = hex(mfn), 424 manifest = hex(mfn),
425 author = obfuscate(cs[1]), 425 author = obfuscate(cs[1]),
426 age = age(t), 426 age = age(t),
427 date = time.asctime(time.gmtime(t)), 427 date = time.asctime(time.gmtime(t)),
428 shortdesc = cgi.escape(cs[4].splitlines()[0]), 428 shortdesc = cgi.escape(cs[4].splitlines()[0]),
429 parent1 = self.parent("filerevparent", 429 parent1 = self.parent("fileannotateparent",
430 hex(p1), fl.rev(p1)), 430 hex(p1), fl.rev(p1), file=f),
431 parent2 = self.parent("filerevparent", 431 parent2 = self.parent("fileannotateparent",
432 hex(p2), fl.rev(p2)), 432 hex(p2), fl.rev(p2), file=f),
433 p1 = hex(p1), p2 = hex(p2), 433 p1 = hex(p1), p2 = hex(p2),
434 p1rev = fl.rev(p1), p2rev = fl.rev(p2)) 434 p1rev = fl.rev(p1), p2rev = fl.rev(p2))
435 435
436 def manifest(self, mnode, path): 436 def manifest(self, mnode, path):
437 mf = self.repo.manifest.read(bin(mnode)) 437 mf = self.repo.manifest.read(bin(mnode))