comparison mercurial/subrepo.py @ 31325:b589f5b953f4

subrepo: directly use repo.vfs.join The 'repo.join' method is about to be deprecated.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 08 Mar 2017 16:53:47 -0800
parents 8a0687a2be75
children 53865692a354
comparison
equal deleted inserted replaced
31324:e712a9c35fd8 31325:b589f5b953f4
676 filehash = hashlib.sha1(vfs.tryread(relname)).hexdigest() 676 filehash = hashlib.sha1(vfs.tryread(relname)).hexdigest()
677 yield '%s = %s\n' % (relname, filehash) 677 yield '%s = %s\n' % (relname, filehash)
678 678
679 @propertycache 679 @propertycache
680 def _cachestorehashvfs(self): 680 def _cachestorehashvfs(self):
681 return vfsmod.vfs(self._repo.join('cache/storehash')) 681 return vfsmod.vfs(self._repo.vfs.join('cache/storehash'))
682 682
683 def _readstorehashcache(self, remotepath): 683 def _readstorehashcache(self, remotepath):
684 '''read the store hash cache for a given remote repository''' 684 '''read the store hash cache for a given remote repository'''
685 cachefile = _getstorehashcachename(remotepath) 685 cachefile = _getstorehashcachename(remotepath)
686 return self._cachestorehashvfs.tryreadlines(cachefile, 'r') 686 return self._cachestorehashvfs.tryreadlines(cachefile, 'r')