# HG changeset patch # User Mads Kiilerich <mad...@unity3d.com> # Date 1421194526 -3600 # Wed Jan 14 01:15:26 2015 +0100 # Node ID 0f13797e5d6e08f75267b6e9c77a62d49fd0f69b # Parent 1325d609f2ea114ecd8c6600a0071570bdb76dcd merge: use repo.wvfs.unlinkpath
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1060,8 +1060,7 @@ def batchremove(repo, actions): yields tuples for progress updates """ verbose = repo.ui.verbose - unlink = util.unlinkpath - wjoin = repo.wjoin + unlinkpath = repo.wvfs.unlinkpath audit = repo.wvfs.audit try: cwd = pycompat.getcwd() @@ -1076,7 +1075,7 @@ def batchremove(repo, actions): repo.ui.note(_("removing %s\n") % f) audit(f) try: - unlink(wjoin(f), ignoremissing=True) + unlinkpath(f, ignoremissing=True) except OSError as inst: repo.ui.warn(_("update failed to remove %s: %s!\n") % (f, inst.strerror)) _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel