Patchwork [3,of,8] largefiles: port revset registration to exthelper

login
register
mail settings
Submitter Matt Harbison
Date Dec. 28, 2018, 6:47 a.m.
Message ID <60d298e4ddb59bee8047.1545979637@Envy>
Download mbox | patch
Permalink /patch/37372/
State Accepted
Headers show

Comments

Matt Harbison - Dec. 28, 2018, 6:47 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@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.

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()
-
-@revsetpredicate('pulled()')
+@eh.revsetpredicate('pulled()')
 def pulledrevsetsymbol(repo, subset, x):
     """Changesets that just has been pulled.