Mercurial > hg-stable
changeset 18269:9454e40e047b
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).
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Tue, 04 Dec 2012 14:58:19 +0100 |
| parents | ed25fe3a7e2f |
| children | 48deb483a8f8 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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"