Mercurial > hg-stable
changeset 41070:f2601cbce209
largefiles: port revset registration to exthelper
This tests the merge code that wasn't tested in the previous patch.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 27 Dec 2018 21:27:43 -0500 |
| parents | 0358cca1dccf |
| children | 28a4fb793ba1 |
| files | hgext/largefiles/__init__.py hgext/largefiles/overrides.py |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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.