diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py +++ b/mercurial/hgweb/webutil.py @@ -362,7 +362,7 @@ def commonentry(repo, ctx): 'extra': ctx.extra(), 'phase': ctx.phasestr(), 'obsolete': ctx.obsolete(), - 'instabilities': [{"name": i} for i in ctx.instabilities()], + 'instabilities': [{"instability": i} for i in ctx.instabilities()], 'branch': nodebranchnodefault(ctx), 'inbranch': nodeinbranch(repo, ctx), 'branches': nodebranchdict(repo, ctx), diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map --- a/mercurial/templates/gitweb/map +++ b/mercurial/templates/gitweb/map @@ -264,7 +264,7 @@ shortlog = shortlog.tmpl graph = graph.tmpl phasetag = '{ifeq(phase, 'public', '', '{phase|escape} ')}' obsoletetag = '{if(obsolete, 'obsolete ')}' -instabilitytag = '{name|escape} ' +instabilitytag = '{instability|escape} ' tagtag = '{name|escape} ' branchtag = '{name|escape} ' inbranchtag = '{name|escape} ' diff --git a/mercurial/templates/monoblue/map b/mercurial/templates/monoblue/map --- a/mercurial/templates/monoblue/map +++ b/mercurial/templates/monoblue/map @@ -223,7 +223,7 @@ filecompchild = ' shortlog = shortlog.tmpl phasetag = '{ifeq(phase, 'public', '', '{phase|escape} ')}' obsoletetag = '{if(obsolete, 'obsolete ')}' -instabilitytag = '{name|escape} ' +instabilitytag = '{instability|escape} ' tagtag = '{name|escape} ' branchtag = '{name|escape} ' inbranchtag = '{name|escape} ' diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map --- a/mercurial/templates/paper/map +++ b/mercurial/templates/paper/map @@ -200,7 +200,7 @@ branchentry = ' ' phasetag = '{ifeq(phase, 'public', '', '{phase|escape} ')}' obsoletetag = '{if(obsolete, 'obsolete ')}' -instabilitytag = '{name|escape} ' +instabilitytag = '{instability|escape} ' changelogtag = '{name|escape} ' changesettag = '{tag|escape} ' changesetbookmark = '{bookmark|escape} ' diff --git a/mercurial/templates/spartan/changelogentry.tmpl b/mercurial/templates/spartan/changelogentry.tmpl --- a/mercurial/templates/spartan/changelogentry.tmpl +++ b/mercurial/templates/spartan/changelogentry.tmpl @@ -28,7 +28,7 @@ ')} {ifeq(count(instabilities), '0', '', ' instabilities: - {instabilities%"{name} "|escape} + {instabilities%"{instability} "|escape} ')} files: diff --git a/mercurial/templates/spartan/changeset.tmpl b/mercurial/templates/spartan/changeset.tmpl --- a/mercurial/templates/spartan/changeset.tmpl +++ b/mercurial/templates/spartan/changeset.tmpl @@ -43,7 +43,7 @@ ')} {ifeq(count(instabilities), '0', '', ' instabilities: - {instabilities%"{name} "|escape} + {instabilities%"{instability} "|escape} ')} files: