# HG changeset patch # User Matt Harbison # Date 1545964063 18000 # Node ID f2601cbce20985b91db64665d96397b5b81f0303 # Parent 0358cca1dccf26e770a3c1da387f75b62ddaf646 largefiles: port revset registration to exthelper This tests the merge code that wasn't tested in the previous patch. diff -r 0358cca1dccf -r f2601cbce209 hgext/largefiles/__init__.py --- a/hgext/largefiles/__init__.py Thu Dec 27 21:26:17 2018 -0500 +++ b/hgext/largefiles/__init__.py Thu Dec 27 21:27:43 2018 -0500 @@ -192,4 +192,4 @@ extensions.wrapfunction(module, 'rebase', overrides.overriderebase) -revsetpredicate = overrides.revsetpredicate +revsetpredicate = eh.revsetpredicate diff -r 0358cca1dccf -r f2601cbce209 hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py Thu Dec 27 21:26:17 2018 -0500 +++ b/hgext/largefiles/overrides.py Thu Dec 27 21:27:43 2018 -0500 @@ -32,7 +32,6 @@ merge, pathutil, pycompat, - registrar, scmutil, smartset, subrepo, @@ -888,9 +887,7 @@ pushop.lfrevs = lfrevs return pushop -revsetpredicate = registrar.revsetpredicate() - -@revsetpredicate('pulled()') +@eh.revsetpredicate('pulled()') def pulledrevsetsymbol(repo, subset, x): """Changesets that just has been pulled.