diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py +++ b/mercurial/hgweb/webutil.py @@ -353,7 +353,10 @@ def formatlinerange(fromline, toline): return '%d:%d' % (fromline + 1, toline) def succsandmarkers(repo, ctx): - return templatekw.showsuccsandmarkers(repo, ctx) + for item in templatekw.showsuccsandmarkers(repo, ctx): + item['successors'] = _siblings(repo[successor] + for successor in item['successors']) + yield item def commonentry(repo, ctx): node = ctx.node() diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map --- a/mercurial/templates/gitweb/map +++ b/mercurial/templates/gitweb/map @@ -271,7 +271,8 @@ branchtag = '{name|escape} ' bookmarktag = '{name|escape} ' alltags = '{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}' -obsfatesuccessors = '{if(successors, ' as ')}{join(successors, ', ')}' +successorlink = '{node|short} ' +obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}' obsfateverb = '{obsfateverb(successors, markers)}' obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}' obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}' diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map --- a/mercurial/templates/paper/map +++ b/mercurial/templates/paper/map @@ -209,7 +209,8 @@ changelogbranchhead = '{name|escape} ' alltags = '{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}' -obsfatesuccessors = '{if(successors, ' as ')}{join(successors, ', ')}' +successorlink = '{node|short} ' +obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}' obsfateverb = '{obsfateverb(successors, markers)}' obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}' obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}' diff --git a/mercurial/templates/spartan/map b/mercurial/templates/spartan/map --- a/mercurial/templates/spartan/map +++ b/mercurial/templates/spartan/map @@ -166,7 +166,8 @@ branchentry = ' diffblock = '
{lines}
' changelogtag = 'tag:{tag|escape}' changesettag = 'tag:{tag|escape}' -obsfatesuccessors = '{if(successors, ' as ')}{join(successors, ', ')}' +successorlink = '{node|short} ' +obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}' obsfateverb = '{obsfateverb(successors, markers)}' obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}' obsfateentry = '{obsfateverb}{obsfateoperations}{obsfatesuccessors}' diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -1036,15 +1036,15 @@ check obsolete changeset check an obsolete changeset that has been rewritten $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=paper' | grep rewritten - rewritten as 6:3de5eca88c00 + rewritten as 3de5eca88c00 $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=coal' | grep rewritten - rewritten as 6:3de5eca88c00 + rewritten as 3de5eca88c00 $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=gitweb' | grep rewritten - obsoleterewritten as 6:3de5eca88c00 + obsoleterewritten as 3de5eca88c00 $ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=monoblue' | grep rewritten -
obsolete
rewritten as 6:3de5eca88c00
+
obsolete
rewritten as 3de5eca88c00
$ get-with-headers.py localhost:$HGPORT 'rev/cda648ca50f5?style=spartan' | grep rewritten - rewritten as 6:3de5eca88c00 + rewritten as 3de5eca88c00 check changeset with instabilities