Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 31818:8fa516b264c9
localrepo: fix deprecation version for 'repo.join'
The patch lingered for a while and nobody noticed when it was resubmitted.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 04 Apr 2017 16:48:58 +0200 |
parents | c34c170b25f3 |
children | 95a67508fd72 |
comparison
equal
deleted
inserted
replaced
31817:07edd8c2f59a | 31818:8fa516b264c9 |
---|---|
840 if self.sharedpath != self.path: | 840 if self.sharedpath != self.path: |
841 return 'store' | 841 return 'store' |
842 return None | 842 return None |
843 | 843 |
844 def join(self, f, *insidef): | 844 def join(self, f, *insidef): |
845 self.ui.deprecwarn("use 'repo.vfs.join' instead of 'repo.join'", '4.0') | 845 self.ui.deprecwarn("use 'repo.vfs.join' instead of 'repo.join'", '4.2') |
846 return self.vfs.join(os.path.join(f, *insidef)) | 846 return self.vfs.join(os.path.join(f, *insidef)) |
847 | 847 |
848 def wjoin(self, f, *insidef): | 848 def wjoin(self, f, *insidef): |
849 return self.vfs.reljoin(self.root, f, *insidef) | 849 return self.vfs.reljoin(self.root, f, *insidef) |
850 | 850 |