# HG changeset patch # User Pierre-Yves David # Date 1354629499 -3600 # Node ID 9454e40e047ba8bf42b3c59030a345656f995875 # Parent ed25fe3a7e2f1be18e04abedd65bf266e81c2dcb 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). diff -r ed25fe3a7e2f -r 9454e40e047b hgext/rebase.py --- a/hgext/rebase.py Tue Jan 08 20:02:53 2013 +0100 +++ b/hgext/rebase.py Tue Dec 04 14:58:19 2012 +0100 @@ -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"