Skip to content
Snippets Groups Projects
  • Pulkit Goyal's avatar
    9db85644
    sparse: add local files to temporaryfiles if they exist out of sparse · 9db85644
    Pulkit Goyal authored
    We get the f1 from args if it's merge and check that whether that exists in
    sparse checkout or not. If that does not, we add that for merging.
    
    The error comes from very low-level where we try to read data of a
    working-filectx which does not exists in the working directory. It will be
    extremely ugly to plug in logic to update sparse copy with new file at such a
    low level.
    
    We already have logic related to updating the checkout with required files in
    calculateupdates() and let's handle this case there only. calculateupdates()
    call sparse.filterupdatesactions() and the logic is added into the latter
    function.
    
    To get the exact traceback, this patch can be backed out and
    test-sparse-merges.t can be run with ui.traceback=True.
    
    Differential Revision: https://phab.mercurial-scm.org/D4341
    9db85644
    History
    sparse: add local files to temporaryfiles if they exist out of sparse
    Pulkit Goyal authored
    We get the f1 from args if it's merge and check that whether that exists in
    sparse checkout or not. If that does not, we add that for merging.
    
    The error comes from very low-level where we try to read data of a
    working-filectx which does not exists in the working directory. It will be
    extremely ugly to plug in logic to update sparse copy with new file at such a
    low level.
    
    We already have logic related to updating the checkout with required files in
    calculateupdates() and let's handle this case there only. calculateupdates()
    call sparse.filterupdatesactions() and the logic is added into the latter
    function.
    
    To get the exact traceback, this patch can be backed out and
    test-sparse-merges.t can be run with ui.traceback=True.
    
    Differential Revision: https://phab.mercurial-scm.org/D4341