Skip to content
Snippets Groups Projects
Commit 9454e40e047b authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

clfilter: drop unnecessary explicit filtering on rebase

Hidden changeset filtering is now done at repo level. The rebaseset
computation will not include any (unless you add --hidden).
parent ed25fe3a7e2f
No related branches found
No related tags found
No related merge requests found
......@@ -184,8 +184,6 @@
rebaseset = repo.revs(
'(children(ancestor(%ld, %d)) and ::(%ld))::',
base, dest, base)
# temporary top level filtering of extinct revisions
rebaseset = repo.revs('%ld - hidden()', rebaseset)
if rebaseset:
root = min(rebaseset)
else:
......@@ -195,7 +193,7 @@
repo.ui.debug('base is ancestor of destination\n')
result = None
elif (not (keepf or obsolete._enabled)
and repo.revs('first(children(%ld) - %ld)-hidden()',
and repo.revs('first(children(%ld) - %ld)',
rebaseset, rebaseset)):
raise util.Abort(
_("can't remove original changesets with"
......
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