Mercurial > hg-stable
changeset 31320:f59b6cf663a9
vfs: use repo.vfs.unlinkpath
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sat, 11 Mar 2017 11:02:25 -0800 |
| parents | 431d4f73249e |
| children | 7eb53603744b |
| files | hgext/rebase.py hgext/shelve.py mercurial/commands.py mercurial/hg.py |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Jan 14 01:15:26 2015 +0100 +++ b/hgext/rebase.py Sat Mar 11 11:02:25 2017 -0800 @@ -1099,7 +1099,7 @@ def clearcollapsemsg(repo): 'Remove collapse message file' - util.unlinkpath(repo.join("last-message.txt"), ignoremissing=True) + repo.vfs.unlinkpath("last-message.txt", ignoremissing=True) def restorecollapsemsg(repo, isabort): 'Restore previously stored collapse message' @@ -1120,7 +1120,7 @@ def clearstatus(repo): 'Remove the status files' _clearrebasesetvisibiliy(repo) - util.unlinkpath(repo.join("rebasestate"), ignoremissing=True) + repo.vfs.unlinkpath("rebasestate", ignoremissing=True) def needupdate(repo, state): '''check whether we should `update --clean` away from a merge, or if
--- a/hgext/shelve.py Wed Jan 14 01:15:26 2015 +0100 +++ b/hgext/shelve.py Sat Mar 11 11:02:25 2017 -0800 @@ -218,7 +218,7 @@ @classmethod def clear(cls, repo): - util.unlinkpath(repo.join(cls._filename), ignoremissing=True) + repo.vfs.unlinkpath(cls._filename, ignoremissing=True) def cleanupoldbackups(repo): vfs = vfsmod.vfs(repo.join(backupdir))
--- a/mercurial/commands.py Wed Jan 14 01:15:26 2015 +0100 +++ b/mercurial/commands.py Sat Mar 11 11:02:25 2017 -0800 @@ -2383,7 +2383,7 @@ # remove state when we complete successfully if not opts.get('dry_run'): - util.unlinkpath(repo.join('graftstate'), ignoremissing=True) + repo.vfs.unlinkpath('graftstate', ignoremissing=True) return 0
--- a/mercurial/hg.py Wed Jan 14 01:15:26 2015 +0100 +++ b/mercurial/hg.py Sat Mar 11 11:02:25 2017 -0800 @@ -716,7 +716,7 @@ def clean(repo, node, show_stats=True, quietempty=False): """forcibly switch the working directory to node, clobbering changes""" stats = updaterepo(repo, node, True) - util.unlinkpath(repo.join('graftstate'), ignoremissing=True) + repo.vfs.unlinkpath('graftstate', ignoremissing=True) if show_stats: _showstats(repo, stats, quietempty) return stats[3] > 0