Mercurial > hg
view tests/test-close-head.t @ 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 | 12a72729678e |
children | c51b103220c7 |
line wrap: on
line source
$ hg init test-content $ cd test-content $ hg debugbuilddag '+2*2*3*4+7' $ hg bookmark -r 1 @ $ hg log -G --template '{rev}:{node|short}' o 11:1d876b1f862c | o 10:ea5f71948eb8 | o 9:f1b0356d867a | o 8:e8d1253fb0d7 | o 7:d423bbba4459 | o 6:a2f58e9c1e56 | o 5:3a367db1fabc | o 4:e7bd5218ca15 | | o 3:6100d3090acf |/ | o 2:fa942426a6fd |/ | o 1:66f7d451a68b |/ o 0:1ea73414a91b $ hg --config extensions.closehead= close-head -m 'Not a head' 0 1 abort: revision is not an open head: 0 [255] $ hg --config extensions.closehead= close-head -m 'Not a head' -r 0 1 abort: revision is not an open head: 0 [255] $ hg --config extensions.closehead= close-head -m 'Close old heads' -r 1 2 $ hg bookmark @ 1:66f7d451a68b $ hg heads changeset: 11:1d876b1f862c user: debugbuilddag date: Thu Jan 01 00:00:11 1970 +0000 summary: r11 changeset: 3:6100d3090acf parent: 0:1ea73414a91b user: debugbuilddag date: Thu Jan 01 00:00:03 1970 +0000 summary: r3 $ hg --config extensions.closehead= close-head -m 'Close more old heads' -r 11 $ hg heads changeset: 3:6100d3090acf parent: 0:1ea73414a91b user: debugbuilddag date: Thu Jan 01 00:00:03 1970 +0000 summary: r3 $ hg --config extensions.closehead= close-head -m 'Not a head' 0 abort: revision is not an open head: 0 [255] $ hg --config extensions.closehead= close-head -m 'Already closed head' 1 abort: revision is not an open head: 1 [255] $ hg init ../test-empty $ cd ../test-empty $ hg debugbuilddag '+1' $ hg log -G --template '{rev}:{node|short}' o 0:1ea73414a91b $ hg --config extensions.closehead= close-head -m 'Close initial revision' 0 $ hg heads [1]