Mercurial > hg
view tests/test-ui-verbosity.py.out @ 42193:14589f1989e9 stable
context: check file exists before getting data from _wrappedctx
overlayworkingctx class is used to do in-memory merging. The data() function of
that class has logic to look for data() in the wrappedctx if the file data in
cache is empty and if the file is dirty. This assumes that if a file is dirty
and cache has empty data for it, it will exists in the _wrappedctx.
However this assumption can be False in case when we are merging a file which is
empty in destination. In these cases, the backup file 'foo.orig' created by our
internal merge algorithms will be empty, however it won't be present in
_wrappedctx. This case will lead us to error like the one this patch is fixing.
Let's only fallback to getting data from wrappedctx if cache has 'None' as data.
Differential Revision: https://phab.mercurial-scm.org/D6308
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Wed, 24 Apr 2019 19:42:43 +0300 |
| parents | 807f3f5c60e9 |
| children |
line wrap: on
line source
hgrc settings command line options final result quiet verbo debug quiet verbo debug quiet verbo debug 0 False False False False False False -> False False False 1 True False False False False False -> True False False 2 False True False False False False -> False True False 3 True True False False False False -> False False False 4 False False True False False False -> False True True 5 True False True False False False -> False True True 6 False True True False False False -> False True True 7 True True True False False False -> False True True 8 False False False True False False -> True False False 9 True False False True False False -> True False False 10 False True False True False False -> True False False 11 True True False True False False -> True False False 12 False False True True False False -> True False False 13 True False True True False False -> True False False 14 False True True True False False -> True False False 15 True True True True False False -> True False False 16 False False False False True False -> False True False 17 True False False False True False -> False True False 18 False True False False True False -> False True False 19 True True False False True False -> False True False 20 False False True False True False -> False True False 21 True False True False True False -> False True False 22 False True True False True False -> False True False 23 True True True False True False -> False True False 24 False False False True True False -> False False False 25 True False False True True False -> False False False 26 False True False True True False -> False False False 27 True True False True True False -> False False False 28 False False True True True False -> False False False 29 True False True True True False -> False False False 30 False True True True True False -> False False False 31 True True True True True False -> False False False 32 False False False False False True -> False True True 33 True False False False False True -> False True True 34 False True False False False True -> False True True 35 True True False False False True -> False True True 36 False False True False False True -> False True True 37 True False True False False True -> False True True 38 False True True False False True -> False True True 39 True True True False False True -> False True True 40 False False False True False True -> False True True 41 True False False True False True -> False True True 42 False True False True False True -> False True True 43 True True False True False True -> False True True 44 False False True True False True -> False True True 45 True False True True False True -> False True True 46 False True True True False True -> False True True 47 True True True True False True -> False True True 48 False False False False True True -> False True True 49 True False False False True True -> False True True 50 False True False False True True -> False True True 51 True True False False True True -> False True True 52 False False True False True True -> False True True 53 True False True False True True -> False True True 54 False True True False True True -> False True True 55 True True True False True True -> False True True 56 False False False True True True -> False True True 57 True False False True True True -> False True True 58 False True False True True True -> False True True 59 True True False True True True -> False True True 60 False False True True True True -> False True True 61 True False True True True True -> False True True 62 False True True True True True -> False True True 63 True True True True True True -> False True True