Mercurial > hg
changeset 28715:a7f7b7acf489
largefiles: replace invocation of os.path module by vfs in overrides.py
This commit is part of bigger effort described in 'Windows UTF-8' plan.
It is not changing all invocations but the ones where change is
obviously correct and doesn't require complicated changes.
| author | liscju <piotr.listkiewicz@gmail.com> |
|---|---|
| date | Sat, 19 Mar 2016 14:50:40 +0100 |
| parents | dac81729fea4 |
| children | 5c14af475f61 |
| files | hgext/largefiles/overrides.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Wed Mar 23 08:55:22 2016 +0100 +++ b/hgext/largefiles/overrides.py Sat Mar 19 14:50:40 2016 +0100 @@ -603,7 +603,7 @@ def makestandin(relpath): path = pathutil.canonpath(repo.root, repo.getcwd(), relpath) - return os.path.join(repo.wjoin(lfutil.standin(path))) + return repo.wvfs.join(lfutil.standin(path)) fullpats = scmutil.expandpats(pats) dest = fullpats[-1] @@ -673,7 +673,7 @@ dest.startswith(repo.wjoin(lfutil.shortname))): srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') - destlfiledir = os.path.dirname(repo.wjoin(destlfile)) or '.' + destlfiledir = repo.wvfs.dirname(repo.wjoin(destlfile)) or '.' if not os.path.isdir(destlfiledir): os.makedirs(destlfiledir) if rename: @@ -723,8 +723,8 @@ for lfile in s.modified: lfutil.updatestandin(repo, lfutil.standin(lfile)) for lfile in s.deleted: - if (os.path.exists(repo.wjoin(lfutil.standin(lfile)))): - os.unlink(repo.wjoin(lfutil.standin(lfile))) + if (repo.wvfs.exists(lfutil.standin(lfile))): + repo.wvfs.unlink(lfutil.standin(lfile)) oldstandins = lfutil.getstandinsstate(repo) @@ -1366,7 +1366,7 @@ pctx = repo['.'] for lfile in unsure + s.modified: lfileabs = repo.wvfs.join(lfile) - if not os.path.exists(lfileabs): + if not repo.wvfs.exists(lfileabs): continue lfhash = lfutil.hashrepofile(repo, lfile) standin = lfutil.standin(lfile)