facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

merge: use repo.wvfs.unlinkpath

Browse Source
This commit is contained in:
Mads Kiilerich 2015-01-14 01:15:26 +01:00
parent a936a7f3a7
commit 01ac38526d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/merge.py
View File

@ -1060,8 +1060,7 @@ def batchremove(repo, actions):
yields tuples for progress updates yields tuples for progress updates
""" """
verbose = repo.ui.verbose verbose = repo.ui.verbose
unlink = util.unlinkpath unlinkpath = repo.wvfs.unlinkpath
wjoin = repo.wjoin
audit = repo.wvfs.audit audit = repo.wvfs.audit
try: try:
cwd = pycompat.getcwd() cwd = pycompat.getcwd()
@ -1076,7 +1075,7 @@ def batchremove(repo, actions):
repo.ui.note(_("removing %s\n") % f) repo.ui.note(_("removing %s\n") % f)
audit(f) audit(f)
try: try:
unlink(wjoin(f), ignoremissing=True) unlinkpath(f, ignoremissing=True)
except OSError as inst: except OSError as inst:
repo.ui.warn(_("update failed to remove %s: %s!\n") % repo.ui.warn(_("update failed to remove %s: %s!\n") %
(f, inst.strerror)) (f, inst.strerror))