# HG changeset patch # User Pierre-Yves David # Date 1326189558 -3600 # Node ID 6bcbf7f6ceed50d60d277cfe9a2e8c89f9320cc1 # Parent 7e113963f2c8a377f15b8beb2ec3501d8497202f obsolete: remove outgoing filtering as it is taken care but forcing obsolete to be secret diff -r 7e113963f2c8 -r 6bcbf7f6ceed hgext/obsolete.py --- a/hgext/obsolete.py Mon Jan 09 20:25:48 2012 +0100 +++ b/hgext/obsolete.py Tue Jan 10 10:59:18 2012 +0100 @@ -136,37 +136,11 @@ return orig(repo, ui, *args, **kwargs) -### Filter obsolet changeset -############################ - -def filterobsoleteout(orig, repo, remote, *args,**kwargs): - """wrapper for findcommonoutgoing that remove obsolete changeset - - This behaviour is temporary""" - common, heads = orig(repo, remote, *args, **kwargs) - - # filter obsolete - heads = set(map(repo.changelog.rev, heads)) - obsoletes = set() - for obj in repo._obsobjrels: - try: - obsoletes.add(repo.changelog.rev(obj)) - except error.LookupError: - pass # we don't have this node locally - - outgoing = set(repo.changelog.ancestors(*heads)) - outgoing.update(heads) - - selected = outgoing - obsoletes - heads = sorted(map(repo.changelog.node, selected)) - - return common, heads def extsetup(ui): revset.symbols["obsolete"] = revsetobsolete - extensions.wrapfunction(discovery, 'findcommonoutgoing', filterobsoleteout) try: rebase = extensions.find('rebase')