Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/hgweb_mod.py @ 6168:2ab54f48dbe8
hgweb: fix parameter mixup (issue1001)
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Sat, 23 Feb 2008 11:19:59 +0100 |
parents | c050548307a4 |
children | 3a75fcc96dac |
comparison
equal
deleted
inserted
replaced
6167:f53b9a383476 | 6168:2ab54f48dbe8 |
---|---|
442 cl = self.repo.changelog | 442 cl = self.repo.changelog |
443 l = [] # build a list in forward order for efficiency | 443 l = [] # build a list in forward order for efficiency |
444 for i in xrange(start, end): | 444 for i in xrange(start, end): |
445 ctx = self.repo.changectx(i) | 445 ctx = self.repo.changectx(i) |
446 n = ctx.node() | 446 n = ctx.node() |
447 showtags = self.showtag(tmpl, 'changelogtag', n) | |
447 | 448 |
448 l.insert(0, {"parity": parity.next(), | 449 l.insert(0, {"parity": parity.next(), |
449 "author": ctx.user(), | 450 "author": ctx.user(), |
450 "parent": self.siblings(ctx.parents(), i - 1), | 451 "parent": self.siblings(ctx.parents(), i - 1), |
451 "child": self.siblings(ctx.children(), i + 1), | 452 "child": self.siblings(ctx.children(), i + 1), |
452 "changelogtag": self.showtag("changelogtag",n), | 453 "changelogtag": showtags, |
453 "desc": ctx.description(), | 454 "desc": ctx.description(), |
454 "date": ctx.date(), | 455 "date": ctx.date(), |
455 "files": self.listfilediffs(tmpl, ctx.files(), n), | 456 "files": self.listfilediffs(tmpl, ctx.files(), n), |
456 "rev": i, | 457 "rev": i, |
457 "node": hex(n), | 458 "node": hex(n), |
511 if miss: | 512 if miss: |
512 continue | 513 continue |
513 | 514 |
514 count += 1 | 515 count += 1 |
515 n = ctx.node() | 516 n = ctx.node() |
517 showtags = self.showtag(tmpl, 'changelogtag', n) | |
516 | 518 |
517 yield tmpl('searchentry', | 519 yield tmpl('searchentry', |
518 parity=parity.next(), | 520 parity=parity.next(), |
519 author=ctx.user(), | 521 author=ctx.user(), |
520 parent=self.siblings(ctx.parents()), | 522 parent=self.siblings(ctx.parents()), |
521 child=self.siblings(ctx.children()), | 523 child=self.siblings(ctx.children()), |
522 changelogtag=self.showtag("changelogtag",n), | 524 changelogtag=showtags, |
523 desc=ctx.description(), | 525 desc=ctx.description(), |
524 date=ctx.date(), | 526 date=ctx.date(), |
525 files=self.listfilediffs(tmpl, ctx.files(), n), | 527 files=self.listfilediffs(tmpl, ctx.files(), n), |
526 rev=ctx.rev(), | 528 rev=ctx.rev(), |
527 node=hex(n), | 529 node=hex(n), |
540 entries=changelist, | 542 entries=changelist, |
541 archives=self.archivelist("tip")) | 543 archives=self.archivelist("tip")) |
542 | 544 |
543 def changeset(self, tmpl, ctx): | 545 def changeset(self, tmpl, ctx): |
544 n = ctx.node() | 546 n = ctx.node() |
547 showtags = self.showtag(tmpl, 'changesettag', n) | |
545 parents = ctx.parents() | 548 parents = ctx.parents() |
546 p1 = parents[0].node() | 549 p1 = parents[0].node() |
547 | 550 |
548 files = [] | 551 files = [] |
549 parity = paritygen(self.stripecount) | 552 parity = paritygen(self.stripecount) |
559 diff=diff, | 562 diff=diff, |
560 rev=ctx.rev(), | 563 rev=ctx.rev(), |
561 node=hex(n), | 564 node=hex(n), |
562 parent=self.siblings(parents), | 565 parent=self.siblings(parents), |
563 child=self.siblings(ctx.children()), | 566 child=self.siblings(ctx.children()), |
564 changesettag=self.showtag("changesettag",n), | 567 changesettag=showtags, |
565 author=ctx.user(), | 568 author=ctx.user(), |
566 desc=ctx.description(), | 569 desc=ctx.description(), |
567 date=ctx.date(), | 570 date=ctx.date(), |
568 files=files, | 571 files=files, |
569 archives=self.archivelist(hex(n)), | 572 archives=self.archivelist(hex(n)), |