--- a/hgext/largefiles/lfutil.py Thu May 12 11:49:23 2016 +0200
+++ b/hgext/largefiles/lfutil.py Fri May 20 01:42:04 2016 +0200
@@ -20,7 +20,7 @@
dirstate,
error,
httpconnection,
- match as match_,
+ match as matchmod,
node,
scmutil,
util,
@@ -161,7 +161,7 @@
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:
@@ -542,7 +542,7 @@
# 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