D6308: context: check file exists before getting data from _wrappedctx

This revision was automatically updated to reflect the committed changes. Closed by commit rHG2f3eae30719a: context: check file exists before getting data from _wrappedctx (authored by pulkit, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D

D6308: context: check file exists before getting data from _wrappedctx

pulkit updated this revision to Diff 14913. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6308?vs=14911&id=14913 REVISION DETAIL https://phab.mercurial-scm.org/D6308 AFFECTED FILES mercurial/context.py tests/test-rebase-inmemory.t CHANGE DETAILS

D6308: context: check file exists before getting data from _wrappedctx

pulkit updated this revision to Diff 14911. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6308?vs=14910&id=14911 REVISION DETAIL https://phab.mercurial-scm.org/D6308 AFFECTED FILES mercurial/context.py tests/test-rebase-inmemory.t CHANGE DETAILS

D6308: context: check file exists before getting data from _wrappedctx

pulkit updated this revision to Diff 14910. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6308?vs=14907&id=14910 REVISION DETAIL https://phab.mercurial-scm.org/D6308 AFFECTED FILES mercurial/context.py tests/test-rebase-inmemory.t CHANGE DETAILS

D6308: context: check file exists before getting data from _wrappedctx

martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in context.py:1827 > Does `str?` means that it can be a str or a None? That would be my interpretation REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6308 To: pulkit, #hg-reviewers Cc: martinvonz, m

D6308: context: check file exists before getting data from _wrappedctx

pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in context.py:1827 > `_markdirty()` without a specified `data` argument seems to do that. The > documentation also seems to say that it can be `None` (line 1804 in this > version) Does `str?` means that it can be a str or a None?

D6308: context: check file exists before getting data from _wrappedctx

martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in context.py:1827 > I was unable to find some code which can set this to `None`. If you look at > write() below in line 1993, it makes sure data is not None. > > I am not sure I understand what this if does. Do you have ideas? `

D6308: context: check file exists before getting data from _wrappedctx

pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in context.py:1827 > I would have expected the only change to be to add ` is not None` to this > line. Isn't that enough? I was unable to find some code which can set this to `None`. If you look at write() below in line 1993, it

D6308: context: check file exists before getting data from _wrappedctx

martinvonz added inline comments. INLINE COMMENTS > context.py:1827 > if self._cache[path]['exists']: > if self._cache[path]['data']: > return self._cache[path]['data'] I would have expected the only change to be to add ` is not None` to this li

D6308: context: check file exists before getting data from _wrappedctx

pulkit created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY 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 cac