# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1432066101 25200
# Node ID ab618e52788a6dc09202d812b454327404aa13ef
# Parent  31d543cd7062fa1fdc6b4f4c71496a7e16f0cca9
largefiles: avoid match.files() in conditions

See 9789b4a7c595 (match: introduce boolean prefix() method,
2014-10-28) for reasons to avoid match.files() in conditions.

diff -r 31d543cd7062 -r ab618e52788a hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py	Tue May 26 11:06:43 2015 -0700
+++ b/hgext/largefiles/lfutil.py	Tue May 19 13:08:21 2015 -0700
@@ -241,13 +241,15 @@
 def getstandinmatcher(repo, rmatcher=None):
     '''Return a match object that applies rmatcher to the standin directory'''
     standindir = repo.wjoin(shortname)
-    if rmatcher and rmatcher.files():
+    if rmatcher and not rmatcher.always():
         pats = [os.path.join(standindir, pat) for pat in rmatcher.files()]
+        match = scmutil.match(repo[None], pats)
+        # if pats is empty, it would incorrectly always match, so clear _always
+        match._always = False
     else:
         # no patterns: relative to repo root
-        pats = [standindir]
+        match = scmutil.match(repo[None], [standindir])
     # no warnings about missing files or directories
-    match = scmutil.match(repo[None], pats)
     match.bad = lambda f, msg: None
     return match