Mercurial > evolve
changeset 2070:9105c3c54045
cleanup: stop using 'repo.join' methods
These repository method might get deprecated soon. In addition, accessing the
vfs-s is not that hard.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Thu, 09 Mar 2017 13:11:20 -0800 |
| parents | 7d15775d8585 |
| children | 8fbf75ca8a08 |
| files | hgext3rd/evolve/__init__.py hgext3rd/evolve/hack/drophack.py hgext3rd/evolve/legacy.py |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py Thu Mar 09 10:42:50 2017 -0800 +++ b/hgext3rd/evolve/__init__.py Thu Mar 09 13:11:20 2017 -0800 @@ -1507,7 +1507,7 @@ _evolvestatedelete(repo) return ret finally: - util.unlinkpath(repo.join('graftstate'), ignoremissing=True) + util.unlinkpath(repo.vfs.join('graftstate'), ignoremissing=True) finally: lock.release() cmdutil.bailifchanged(repo) @@ -3181,7 +3181,7 @@ @eh.wrapfunction(hg, 'clean') def clean(orig, repo, *args, **kwargs): ret = orig(repo, *args, **kwargs) - util.unlinkpath(repo.join('evolvestate'), ignoremissing=True) + util.unlinkpath(repo.vfs.join('evolvestate'), ignoremissing=True) return ret def _evolvestatewrite(repo, state): @@ -3246,7 +3246,7 @@ f.close() def _evolvestatedelete(repo): - util.unlinkpath(repo.join('evolvestate'), ignoremissing=True) + util.unlinkpath(repo.vfs.join('evolvestate'), ignoremissing=True) def _evolvemerge(repo, orig, dest, pctx, keepbranch): """Used by the evolve function to merge dest on top of pctx.
--- a/hgext3rd/evolve/hack/drophack.py Thu Mar 09 10:42:50 2017 -0800 +++ b/hgext3rd/evolve/hack/drophack.py Thu Mar 09 13:11:20 2017 -0800 @@ -66,8 +66,8 @@ repo = repo.unfiltered() repo.destroying() oldmarkers = list(repo.obsstore._all) - util.rename(repo.sjoin('obsstore'), - repo.join('obsstore.prestrip')) + util.rename(repo.svfs.join('obsstore'), + repo.vfs.join('obsstore.prestrip')) del repo.obsstore # drop the cache newstore = repo.obsstore assert not newstore # should be empty after rename
--- a/hgext3rd/evolve/legacy.py Thu Mar 09 10:42:50 2017 -0800 +++ b/hgext3rd/evolve/legacy.py Thu Mar 09 13:11:20 2017 -0800 @@ -111,7 +111,7 @@ err += 1 finally: f.close() - unlink.append(repo.join('obsolete-relations')) + unlink.append(repo.vfs.join('obsolete-relations')) except IOError: pass ### second (json) format @@ -149,7 +149,7 @@ msg %= (oldobject, oldsubjects) repo.ui.write_err(msg) err += 1 - unlink.append(repo.sjoin('obsoletemarkers')) + unlink.append(repo.svfs.join('obsoletemarkers')) tr.close() for path in unlink: util.unlink(path)