--- a/hgext/evolve.py Fri Jan 04 12:43:22 2013 +0100
+++ b/hgext/evolve.py Fri Dec 07 12:14:46 2012 +0100
@@ -378,40 +378,6 @@
#####################################################################
-### Filter extinct changesets from common operations ###
-#####################################################################
-
-@eh.wrapfunction(merge, 'update')
-def wrapmergeupdate(orig, repo, node, *args, **kwargs):
- """ensure we don't automatically update on hidden changeset"""
- if node is None:
- # tip of current branch
- branch = repo[None].branch()
- node = repo.revs('last((.:: and branch(%s)) - hidden())', branch)[0]
- return orig(repo, node, *args, **kwargs)
-
-@eh.wrapfunction(localrepo.localrepository, 'branchtip')
-def obsbranchtip(orig, repo, branch):
- """ensure "stable" reference does not end on a hidden changeset"""
- if not getattr(repo, '_dofilterbranchtip', True):
- return orig(repo, branch)
- result = ()
- heads = repo.branchmap().get(branch, ())
- if heads:
- result = list(repo.set('last(heads(branch(%n) - hidden()))', heads[0]))
- if not result:
- raise error.RepoLookupError(_("unknown branch '%s'") % branch)
- return result[0].node()
-
-
-@eh.wrapfunction(mercurial.hgweb.hgweb_mod.hgweb, '__init__')
-@eh.wrapfunction(mercurial.hgweb.hgweb_mod.hgweb, 'refresh')
-def nofilter(orig, hgweb, *args, **kwargs):
- orig(hgweb, *args, **kwargs)
- hgweb.repo._dofilterbranchtip = False
-
-
-#####################################################################
### Additional Utilities ###
#####################################################################