largefiles: pay attention to dropped standin files when updating largefiles Previously, the largefile for a dropped standin would be deleted here, and then restored from the cache. This had the effect of clobbering uncommitted changes if a revert caused the file to be forgotten, which is not what happens with a normal file. Now the removal and update is skipped for dropped largefiles, and the corresponding standin is deleted from disk. This was noticed when working on issue5738 because the forgotten standin files were left behind, and that changes the behavior of the next rename to that directory. My first attempt was to cleanup the standins before calling this. That failed, because this function deletes the largefile if the corresponding standin is missing. This function is called by the revert command, merge (and therefore update), and patch, via the scmutil.marktouched() override. So it should be pretty narrow in scope. I didn't mark issue5738 as fixed because the move related issues can still happen if the main tree and the .hglf subtree get out of sync somehow. I don't see an easy fix for that, but that should be an edge case. If whoever queues this thinks it is good enough to close out the bug and can cram it into the summary, go for it.

     1

from __future__ import absolute_import

     2

     3

from mercurial.i18n import _

     4

from mercurial import (

     5

        changegroup,

     6

        error,

     7

        extensions

     8

    )

     9

    10

def abort(orig, *args, **kwargs):

    11

    raise error.Abort(_('this is an exercise'))

    12

    13

def uisetup(ui):

    14

    extensions.wrapfunction(changegroup, 'getbundler', abort)