Mercurial > hg
comparison hgext/largefiles/overrides.py @ 42755:749ef8c31187
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 |
comparison
equal
deleted
inserted
replaced
42754:4e8f504424f3 | 42755:749ef8c31187 |
---|---|
457 | 457 |
458 # Convert to dictionary with filename as key and action as value. | 458 # Convert to dictionary with filename as key and action as value. |
459 lfiles = set() | 459 lfiles = set() |
460 for f in actions: | 460 for f in actions: |
461 splitstandin = lfutil.splitstandin(f) | 461 splitstandin = lfutil.splitstandin(f) |
462 if splitstandin in p1: | 462 if splitstandin is not None and splitstandin in p1: |
463 lfiles.add(splitstandin) | 463 lfiles.add(splitstandin) |
464 elif lfutil.standin(f) in p1: | 464 elif lfutil.standin(f) in p1: |
465 lfiles.add(f) | 465 lfiles.add(f) |
466 | 466 |
467 for lfile in sorted(lfiles): | 467 for lfile in sorted(lfiles): |