comparison hgext/fsmonitor/__init__.py @ 45557:2c86b9587740

merge: make low-level update() private (API)

We have very few callers left that call the low-level `merge.update()`
function. I think it's time to make it private. I'll remove the
remaining callers in coming patches, except for one call from the
`rebase` module. I hope to eventually fix that too, but it's more
complex because it requires teaching `merge.graft()` to work with a
dirty working copy.

Differential Revision: https://phab.mercurial-scm.org/D9065

45556:03726f5b6092

    )
    if pycompat.isdarwin:
        # An assist for avoiding the dangling-symlink fsevents bug
        extensions.wrapfunction(os, b'symlink', wrapsymlink)

    extensions.wrapfunction(merge, b'update', wrapupdate)


def wrapsymlink(orig, source, link_name):
    ''' if we create a dangling symlink, also touch the parent dir
    to encourage fsevents notifications to work more correctly '''

45557:2c86b9587740

    )
    if pycompat.isdarwin:
        # An assist for avoiding the dangling-symlink fsevents bug
        extensions.wrapfunction(os, b'symlink', wrapsymlink)

    extensions.wrapfunction(merge, b'_update', wrapupdate)


def wrapsymlink(orig, source, link_name):
    ''' if we create a dangling symlink, also touch the parent dir
    to encourage fsevents notifications to work more correctly '''