--- a/mercurial/hgweb/webutil.py Mon Apr 19 20:38:52 2021 -0400
+++ b/mercurial/hgweb/webutil.py Mon Mar 29 01:52:06 2021 +0200
@@ -14,7 +14,7 @@
import re
from ..i18n import _
-from ..node import hex, nullid, short
+from ..node import hex, short
from ..pycompat import setattr
from .common import (
@@ -220,7 +220,7 @@
def _siblings(siblings=None, hiderev=None):
if siblings is None:
siblings = []
- siblings = [s for s in siblings if s.node() != nullid]
+ siblings = [s for s in siblings if s.node() != s.repo().nullid]
if len(siblings) == 1 and siblings[0].rev() == hiderev:
siblings = []
return templateutil.mappinggenerator(_ctxsgen, args=(siblings,))
@@ -316,12 +316,16 @@
yield {name: t}
-def showtag(repo, t1, node=nullid):
+def showtag(repo, t1, node=None):
+ if node is None:
+ node = repo.nullid
args = (repo.nodetags, node, b'tag')
return templateutil.mappinggenerator(_nodenamesgen, args=args, name=t1)
-def showbookmark(repo, t1, node=nullid):
+def showbookmark(repo, t1, node=None):
+ if node is None:
+ node = repo.nullid
args = (repo.nodebookmarks, node, b'bookmark')
return templateutil.mappinggenerator(_nodenamesgen, args=args, name=t1)