[PATCH 3 of 4 V2-SeriesB] clfilter: drop unnecessary explicit filtering on rebase
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Tue Jan 8 14:10:44 CST 2013
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1354629499 -3600
# Node ID 48fa5ab19802141756e3166c54ad76f18e684aa1
# Parent 6b0c3211fff2cd120d6c5837882b7978ba5b5e2c
clfilter: drop unnecessary explicit filtering on rebase
Hidden changeset filtered is now done a repo level. The rebaseset computation
will not include any (unless you add --hidden) of course.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -182,22 +182,20 @@ def rebase(ui, repo, **opts):
else:
base = scmutil.revrange(repo, [basef or '.'])
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:
root = None
if not rebaseset:
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"
" unrebased descendants"),
hint=_('use --keep to keep original changesets'))
More information about the Mercurial-devel
mailing list