Mercurial > public > mercurial-scm > hg
comparison mercurial/hgweb/webcommands.py @ 37403:448f7ec247e2
hgweb: fix type of {nav} keyword when linerange filter is active
Spotted by making '%' operator check the operand type more strictly. Before,
"{nav}" would be evaluated to a lazy "" (empty string) and {"" % x} would
yield one empty string.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 18 Mar 2018 21:18:57 +0900 |
| parents | 7d94fe3ea0ac |
| children | 876d54f800cf |
comparison
equal
deleted
inserted
replaced
| 37402:546dc42c3bc4 | 37403:448f7ec247e2 |
|---|---|
| 1080 linerange = None | 1080 linerange = None |
| 1081 if lrange is not None: | 1081 if lrange is not None: |
| 1082 linerange = webutil.formatlinerange(*lrange) | 1082 linerange = webutil.formatlinerange(*lrange) |
| 1083 # deactivate numeric nav links when linerange is specified as this | 1083 # deactivate numeric nav links when linerange is specified as this |
| 1084 # would required a dedicated "revnav" class | 1084 # would required a dedicated "revnav" class |
| 1085 nav = None | 1085 nav = [] |
| 1086 if descend: | 1086 if descend: |
| 1087 it = dagop.blockdescendants(fctx, *lrange) | 1087 it = dagop.blockdescendants(fctx, *lrange) |
| 1088 else: | 1088 else: |
| 1089 it = dagop.blockancestors(fctx, *lrange) | 1089 it = dagop.blockancestors(fctx, *lrange) |
| 1090 for i, (c, lr) in enumerate(it, 1): | 1090 for i, (c, lr) in enumerate(it, 1): |