Skip to content
Snippets Groups Projects
Commit 1680ef94ad2b authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

repoview: fix the filter created by `extrafilter`

The `name` variable was updated in each interaction of the loop, making all new
filters inheriting from the same base (the last one iterated), leading to
terrible terrible misbehavior.
parent d24573181003
No related branches found
No related tags found
2 merge requests!647branching: merge stable into default,!636repoview: fix the filter created by `extrafilter`
......@@ -209,5 +209,5 @@
subsettable = repoviewutil.subsettable
if combine(b'base') not in filtertable:
for name in _basefiltername:
for base_name in _basefiltername:
......@@ -213,6 +213,6 @@
def extrafilteredrevs(repo, *args, **kwargs):
def extrafilteredrevs(repo, *args, name=base_name, **kwargs):
baserevs = filtertable[name](repo, *args, **kwargs)
extrarevs = frozenset(repo.revs(frevs))
return baserevs | extrarevs
......@@ -215,10 +215,12 @@
baserevs = filtertable[name](repo, *args, **kwargs)
extrarevs = frozenset(repo.revs(frevs))
return baserevs | extrarevs
filtertable[combine(name)] = extrafilteredrevs
if name in subsettable:
subsettable[combine(name)] = combine(subsettable[name])
filtertable[combine(base_name)] = extrafilteredrevs
if base_name in subsettable:
subsettable[combine(base_name)] = combine(
subsettable[base_name]
)
return fid
......
......@@ -108,11 +108,11 @@
r3
r4
r5
r6 (missing-correct-output !)
r7 (missing-correct-output !)
r8 (missing-correct-output !)
r11 (missing-correct-output !)
r12 (missing-correct-output !)
r6
r7
r8
r11
r12
cleanups
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment