# HG changeset patch # User Alexis S. L. Carvalho # Date 1148150059 10800 # Node ID f789602ba840aa826e26f8063168bff13d3728ec # Parent 185cb7fffbebf33b569b41558bad37c88ec14cbd hgweb.manifest: revno of manifest and changelog aren't always the same In the v4l-dvb repo, the manifest revno and the changelog revno are not in sync. This happened because the same patch was applied to the same revision in two different branches, resulting in the same manifest text, with the same parents and so the first revision was reused. Since hgweb.manifest was assuming the revnos of the manifest and of the changelog were always the same, clicking on manifest -> bz2 in the v4l-dvb site would download the wrong revision. Use the linkrev to go from manifest revision to changelog revision. This still won't be perfect since the page will still talk about "manifest for changeset XYZ", where XYZ was the first changeset to have this manifest, which is not necessarily the same changeset that the user clicked to get to this page - but at least the contents will be the same. diff --git a/mercurial/hgweb/__init__.py b/mercurial/hgweb/__init__.py --- a/mercurial/hgweb/__init__.py +++ b/mercurial/hgweb/__init__.py @@ -519,7 +519,8 @@ class hgweb(object): mnode = hex(mn) mf = man.read(mn) rev = man.rev(mn) - node = self.repo.changelog.node(rev) + changerev = man.linkrev(mn) + node = self.repo.changelog.node(changerev) mff = man.readflags(mn) files = {}