[PATCH 17 of 17 V2] largefiles: rename match_ to matchmod import in storeutil

liscju piotr.listkiewicz at gmail.com
Thu May 12 06:20:39 EDT 2016


# HG changeset patch
# User liscju <piotr.listkiewicz at gmail.com>
# Date 1463047302 -7200
#      Thu May 12 12:01:42 2016 +0200
# Node ID aa532acef6ed77ee85d57d20486770a43f60cc91
# Parent  0d6fa0f79ae3df88f3a429e82647bacbab77d09a
largefiles: rename match_ to matchmod import in storeutil

diff -r 0d6fa0f79ae3 -r aa532acef6ed hgext/largefiles/storeutil.py
--- a/hgext/largefiles/storeutil.py	Thu May 12 11:49:23 2016 +0200
+++ b/hgext/largefiles/storeutil.py	Thu May 12 12:01:42 2016 +0200
@@ -20,7 +20,7 @@ from mercurial import (
     dirstate,
     error,
     httpconnection,
-    match as match_,
+    match as matchmod,
     node,
     scmutil,
     util,
@@ -160,7 +160,7 @@ def openlfdirstate(ui, repo, create=True
 
 def lfdirstatestatus(lfdirstate, repo):
     wctx = repo['.']
-    match = match_.always(repo.root, repo.getcwd())
+    match = matchmod.always(repo.root, repo.getcwd())
     unsure, s = lfdirstate.status(match, [], False, False, False)
     modified, clean = s.modified, s.clean
     for lfile in unsure:
@@ -540,7 +540,7 @@ def updatestandinsbymatch(repo, match):
         # otherwise to update all standins if the largefiles are
         # large.
         lfdirstate = openlfdirstate(ui, repo)
-        dirtymatch = match_.always(repo.root, repo.getcwd())
+        dirtymatch = matchmod.always(repo.root, repo.getcwd())
         unsure, s = lfdirstate.status(dirtymatch, [], False, False,
                                       False)
         modifiedfiles = unsure + s.modified + s.added + s.removed


More information about the Mercurial-devel mailing list