[PATCH 3 of 8] largefiles: port revset registration to exthelper
Matt Harbison
mharbison72 at gmail.com
Fri Dec 28 01:47:17 EST 2018
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1545964063 18000
# Thu Dec 27 21:27:43 2018 -0500
# Node ID 60d298e4ddb59bee804766c9fd95a552bfd8d56a
# Parent fed98646d0421021268ea0b4f91e0d1870bc4bde
largefiles: port revset registration to exthelper
This tests the merge code that wasn't tested in the previous patch.
diff --git a/hgext/largefiles/__init__.py b/hgext/largefiles/__init__.py
--- a/hgext/largefiles/__init__.py
+++ b/hgext/largefiles/__init__.py
@@ -192,4 +192,4 @@ def _uisetup(ui):
extensions.wrapfunction(module, 'rebase',
overrides.overriderebase)
-revsetpredicate = overrides.revsetpredicate
+revsetpredicate = eh.revsetpredicate
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -32,7 +32,6 @@ from mercurial import (
merge,
pathutil,
pycompat,
- registrar,
scmutil,
smartset,
subrepo,
@@ -888,9 +887,7 @@ def exchangepushoperation(orig, *args, *
pushop.lfrevs = lfrevs
return pushop
-revsetpredicate = registrar.revsetpredicate()
-
- at revsetpredicate('pulled()')
+ at eh.revsetpredicate('pulled()')
def pulledrevsetsymbol(repo, subset, x):
"""Changesets that just has been pulled.
More information about the Mercurial-devel
mailing list