[PATCH] largefiles: overridematch() should replace the file path instead of extending (issue3934)

elson.wei at gmail.com elson.wei at gmail.com
Wed Jul 24 05:21:45 UTC 2013


# HG changeset patch
# User Wei, Elson <elson.wei at gmail.com>
# Date 1374643244 -28800
#      Wed Jul 24 13:20:44 2013 +0800
# Branch stable
# Node ID a7892246452452f5736814e4a17a549d582ab0b2
# Parent  bf6bc468138342ebc6eb6f2f8d9519148372b18c
largefiles: overridematch() should replace the file path instead of extending (issue3934)

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -250,8 +250,10 @@
         """
         match = oldmatch(ctx, pats, opts, globbed, default)
         m = copy.copy(match)
-        standins = [lfutil.standin(f) for f in m._files]
-        m._files.extend(standins)
+        for i in range(0, len(m._files)):
+            standin = lfutil.standin(m._files[i])
+            if standin in repo[ctx.node()]:
+                m._files[i] = standin
         m._fmap = set(m._files)
         m._always = False
         origmatchfn = m.matchfn
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 2013-07-24_13-13-50_r19469+.diff
Type: text/x-patch
Size: 969 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20130724/a9c326b6/attachment-0002.bin>


More information about the Mercurial-devel mailing list