[obsolete] Move extension compat code
diff --git a/hgext/obsolete.py b/hgext/obsolete.py --- a/hgext/obsolete.py +++ b/hgext/obsolete.py @@ -119,6 +119,17 @@ def revsetobsolete(repo, subset, x): args = revset.getargs(x, 0, 0, 'publicheads takes no arguments') return [r for r in subset if repo[r].obsolete()] # XXX slow +### Other Extension compat +############################ + +def concludenode(orig, repo, rev, *args, **kwargs): + newrev = orig(repo, rev, *args, **kwargs) + oldnode = repo[rev].node() + newnode = repo[newrev].node() + repo.addobsolete(newnode, oldnode) + return newrev + + def extsetup(ui): revset.symbols["obsolete"] = revsetobsolete @@ -179,7 +190,7 @@ def listobsolete(repo): pushkey.register('obsolete', pushobsolete, listobsolete) -# New commands +### New commands ############################# @@ -356,14 +367,3 @@ def reposetup(ui, repo): repo.__class__ = obsoletingrepo - -### Other Extension compat -############################ - -def concludenode(orig, repo, rev, *args, **kwargs): - newrev = orig(repo, rev, *args, **kwargs) - oldnode = repo[rev].node() - newnode = repo[newrev].node() - repo.addobsolete(newnode, oldnode) - return newrev -