# HG changeset patch # User FUJIWARA Katsunori # Date 1381765864 -32400 # Node ID 37c0d93fb16657010df512b0bee84c74cd65020e # Parent df91e2df6ba3824c3dba13c7d1a54646adfcc0e6 bookmarks: use "vfs.unlink()" instead of "util.unlink()" diff -r df91e2df6ba3 -r 37c0d93fb166 mercurial/bookmarks.py --- a/mercurial/bookmarks.py Thu Oct 03 18:01:21 2013 +0200 +++ b/mercurial/bookmarks.py Tue Oct 15 00:51:04 2013 +0900 @@ -126,7 +126,7 @@ wlock = repo.wlock() try: try: - util.unlink(repo.join('bookmarks.current')) + repo.vfs.unlink('bookmarks.current') repo._bookmarkcurrent = None except OSError, inst: if inst.errno != errno.ENOENT: diff -r df91e2df6ba3 -r 37c0d93fb166 mercurial/scmutil.py --- a/mercurial/scmutil.py Thu Oct 03 18:01:21 2013 +0200 +++ b/mercurial/scmutil.py Tue Oct 15 00:51:04 2013 +0900 @@ -271,6 +271,9 @@ def stat(self, path=None): return os.stat(self.join(path)) + def unlink(self, path=None): + return util.unlink(self.join(path)) + class vfs(abstractvfs): '''Operate files relative to a base directory