Mercurial > hg
comparison mercurial/hgweb/webutil.py @ 24136:46d6cdfce4bf
hgweb: use introrev() for finding parents (issue4506)
The issue is titled "filtered revision 'XXX' (not in 'served' subset)" and that
is the error message you sometimes get when trying to look at a file (/file or
/annotate) in hgweb. For example:
http://hg.intevation.org/mercurial/crew/file/90cf454edd70/mercurial/cmdutil.py
This happens when a parent revision for a file is hidden, thus it is
not 'served' and isn't accessible in hgweb by default. When hgweb tries to
access such changeset, it produces the error and HTTP status code 404.
Another detail is that the parents() function, that is used in multiple places
in hgweb, sometimes returned changesets that were obsoleted by the current
changeset for the file. For example, when using rebase with evolve and rebasing
a divergent changeset that introduces a file on top of current branch. Or
grafting a change and making the new grafted changeset obsolete the source
(shown in the test case). The result is the same - the obsoleted changeset was
mistakingly returned from parents(), even though it's not a parent and the only
link to the new changeset is an obsoletion marker (and rebase/graft metadata?
not sure it matters).
The problem is fixed by using introrev() instead of linkrev() for finding
parents. This prevents parents() function from returning unrelated obsolete
changesets.
The test case prepares a separate repo because (afaict) all other test cases
never reuse file names, so there are no files that were changed in multiple
changesets. So no previously available files have obsolete changesets in their
history.
author | Anton Shestakov <engored@ya.ru> |
---|---|
date | Thu, 19 Feb 2015 19:32:06 +0800 |
parents | 513d47905114 |
children | f53b7174facf |
comparison
equal
deleted
inserted
replaced
24135:27b6d41aa029 | 24136:46d6cdfce4bf |
---|---|
136 if util.safehasattr(s, 'path'): | 136 if util.safehasattr(s, 'path'): |
137 d['file'] = s.path() | 137 d['file'] = s.path() |
138 yield d | 138 yield d |
139 | 139 |
140 def parents(ctx, hide=None): | 140 def parents(ctx, hide=None): |
141 if (isinstance(ctx, context.basefilectx) and | 141 if isinstance(ctx, context.basefilectx): |
142 ctx.changectx().rev() != ctx.linkrev()): | 142 introrev = ctx.introrev() |
143 return _siblings([ctx._repo[ctx.linkrev()]], hide) | 143 if ctx.changectx().rev() != introrev: |
144 return _siblings([ctx._repo[introrev]], hide) | |
144 return _siblings(ctx.parents(), hide) | 145 return _siblings(ctx.parents(), hide) |
145 | 146 |
146 def children(ctx, hide=None): | 147 def children(ctx, hide=None): |
147 return _siblings(ctx.children(), hide) | 148 return _siblings(ctx.children(), hide) |
148 | 149 |