mercurial/hgweb.py
changeset 568 e8fd41110dce
parent 547 4fc63e22b1fe
child 569 3e347929f5f9
equal deleted inserted replaced
567:87f37e61d0db 568:e8fd41110dce
   152             yield self.t("fileellipses")
   152             yield self.t("fileellipses")
   153 
   153 
   154     def parent(self, t1, node=nullid, rev=-1, **args):
   154     def parent(self, t1, node=nullid, rev=-1, **args):
   155         if node != hex(nullid):
   155         if node != hex(nullid):
   156             yield self.t(t1, node = node, rev = rev, **args)
   156             yield self.t(t1, node = node, rev = rev, **args)
       
   157 
       
   158     def showtag(self, t1, node=nullid, **args):
       
   159         for t in self.repo.nodetags(node):
       
   160              yield self.t(t1, tag = t, **args)
   157 
   161 
   158     def diff(self, node1, node2, files):
   162     def diff(self, node1, node2, files):
   159         def filterfiles(list, files):
   163         def filterfiles(list, files):
   160             l = [ x for x in list if x in files ]
   164             l = [ x for x in list if x in files ]
   161 
   165 
   257                     author = changes[1],
   261                     author = changes[1],
   258                     parent1 = self.parent("changelogparent",
   262                     parent1 = self.parent("changelogparent",
   259                                           hex(p1), cl.rev(p1)),
   263                                           hex(p1), cl.rev(p1)),
   260                     parent2 = self.parent("changelogparent",
   264                     parent2 = self.parent("changelogparent",
   261                                           hex(p2), cl.rev(p2)),
   265                                           hex(p2), cl.rev(p2)),
       
   266                     changelogtag = self.showtag("changelogtag",n),
   262                     p1 = hex(p1), p2 = hex(p2),
   267                     p1 = hex(p1), p2 = hex(p2),
   263                     p1rev = cl.rev(p1), p2rev = cl.rev(p2),
   268                     p1rev = cl.rev(p1), p2rev = cl.rev(p2),
   264                     manifest = hex(changes[0]),
   269                     manifest = hex(changes[0]),
   265                     desc = changes[4],
   270                     desc = changes[4],
   266                     date = t,
   271                     date = t,
   324                     author = changes[1],
   329                     author = changes[1],
   325                     parent1 = self.parent("changelogparent",
   330                     parent1 = self.parent("changelogparent",
   326                                           hex(p1), cl.rev(p1)),
   331                                           hex(p1), cl.rev(p1)),
   327                     parent2 = self.parent("changelogparent",
   332                     parent2 = self.parent("changelogparent",
   328                                           hex(p2), cl.rev(p2)),
   333                                           hex(p2), cl.rev(p2)),
       
   334                     changelogtag = self.showtag("changelogtag",n),
   329                     p1 = hex(p1), p2 = hex(p2),
   335                     p1 = hex(p1), p2 = hex(p2),
   330                     p1rev = cl.rev(p1), p2rev = cl.rev(p2),
   336                     p1rev = cl.rev(p1), p2rev = cl.rev(p2),
   331                     manifest = hex(changes[0]),
   337                     manifest = hex(changes[0]),
   332                     desc = changes[4],
   338                     desc = changes[4],
   333                     date = t,
   339                     date = t,
   374                      node = nodeid,
   380                      node = nodeid,
   375                      parent1 = self.parent("changesetparent",
   381                      parent1 = self.parent("changesetparent",
   376                                            hex(p1), cl.rev(p1)),
   382                                            hex(p1), cl.rev(p1)),
   377                      parent2 = self.parent("changesetparent",
   383                      parent2 = self.parent("changesetparent",
   378                                            hex(p2), cl.rev(p2)),
   384                                            hex(p2), cl.rev(p2)),
       
   385                      changesettag = self.showtag("changesettag",n),
   379                      p1 = hex(p1), p2 = hex(p2),
   386                      p1 = hex(p1), p2 = hex(p2),
   380                      p1rev = cl.rev(p1), p2rev = cl.rev(p2),
   387                      p1rev = cl.rev(p1), p2rev = cl.rev(p2),
   381                      manifest = hex(changes[0]),
   388                      manifest = hex(changes[0]),
   382                      author = changes[1],
   389                      author = changes[1],
   383                      desc = changes[4],
   390                      desc = changes[4],