Mercurial > hg

diff hgext/largefiles/overrides.py @ 42755:749ef8c31187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-dirstate: call rust dirstatemap from Python Since Rust-backed Python classes cannot be used as baseclasses (for rust-cpython anyway), we use composition rather than inheritance. This also allows us to keep the IO operations in the Python side, removing (for now) the need to rewrite VFS in Rust, which would be a heavy undertaking. Differential Revision: https://phab.mercurial-scm.org/D6634
author Raphaël Gomès <rgomes@octobus.net>
date Wed, 10 Jul 2019 09:57:28 +0200
parents 421fdf30c37c
children 2372284d9457
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Wed Jul 10 09:56:53 2019 +0200
+++ b/hgext/largefiles/overrides.py	Wed Jul 10 09:57:28 2019 +0200
@@ -459,7 +459,7 @@
     lfiles = set()
     for f in actions:
         splitstandin = lfutil.splitstandin(f)
-        if splitstandin in p1:
+        if splitstandin is not None and splitstandin in p1:
             lfiles.add(splitstandin)
         elif lfutil.standin(f) in p1:
             lfiles.add(f)