Mercurial > hg
view hgext/git/TODO.md @ 49862:b1147450c55c
sparse: fix a py2 based usage of `map()`
In a local pytype run, this fixes:
File "/mnt/c/Users/Matt/hg/hgext/sparse.py", line 386, in debugsparse:
unsupported operand type(s) for item retrieval: 'fcounts: Iterator[int]' and '0: int' [unsupported-operands]
No attribute '__getitem__' on 'fcounts: Iterator[int]'
File "/mnt/c/Users/Matt/hg/hgext/sparse.py", line 387, in debugsparse:
unsupported operand type(s) for item retrieval: 'fcounts: Iterator[int]' and '1: int' [unsupported-operands]
No attribute '__getitem__' on 'fcounts: Iterator[int]'
File "/mnt/c/Users/Matt/hg/hgext/sparse.py", line 388, in debugsparse:
unsupported operand type(s) for item retrieval: 'fcounts: Iterator[int]' and '2: int' [unsupported-operands]
No attribute '__getitem__' on 'fcounts: Iterator[int]'
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 05 Jan 2023 19:47:35 -0500 |
parents | c5653cf2811d |
children |
line wrap: on
line source
Octopus Merge Support ===================== This will be moderately complicated, as we'll need to synthesize phony changeset entries to explode the octopus into "revisions" that only have two parents each. For today, we can probably just do something like aaaaaaaaaaaaaaaaaaXX{20 bytes of exploded node's hex sha} where XX is a counter (so we could have as many as 255 parents in a git commit - more than I think we'd ever see.) That means that we can install some check in this extension to disallow checking out or otherwise interacting with the `aaaaaaaaaaaaaaaaaa` revisions. Interface Creation ==================== We at least need an interface definition for `changelog` in core that this extension can satisfy, and again for `basicstore`. Reason About Locking ==================== We should spend some time thinking hard about locking, especially on .git/index etc. We're probably adequately locking the _git_ repository, but may not have enough locking correctness in places where hg does locking that git isn't aware of (notably the working copy, which I believe Git does not lock.)