Mercurial > hg > hg-git
comparison hggit/__init__.py @ 1014:7835460756d4
repo: update repo.join to be repo.vfs.join
Upstream has deprecated repo.join in favor of repo.vfs.join, so let's update to
match them. Old hg should have repo.vfs.join so I don't think this breaks
backwards compatibility.
author | Durham Goode <durham@fb.com> |
---|---|
date | Wed, 15 Mar 2017 13:37:02 -0700 |
parents | a4f4f861fc5e |
children | 4842e94f36ca |
comparison
equal
deleted
inserted
replaced
1013:a4f4f861fc5e | 1014:7835460756d4 |
---|---|
209 if not isinstance(repo, gitrepo.gitrepo): | 209 if not isinstance(repo, gitrepo.gitrepo): |
210 | 210 |
211 if (getattr(dirstate, 'rootcache', False) and | 211 if (getattr(dirstate, 'rootcache', False) and |
212 (not ignoremod or getattr(ignore, 'readpats', False)) and | 212 (not ignoremod or getattr(ignore, 'readpats', False)) and |
213 hgutil.safehasattr(repo, 'join') and | 213 hgutil.safehasattr(repo, 'join') and |
214 os.path.exists(repo.join('git'))): | 214 os.path.exists(repo.vfs.join('git'))): |
215 # only install our dirstate wrapper if it has a hope of working | 215 # only install our dirstate wrapper if it has a hope of working |
216 import gitdirstate | 216 import gitdirstate |
217 if ignoremod: | 217 if ignoremod: |
218 def ignorewrap(orig, *args, **kwargs): | 218 def ignorewrap(orig, *args, **kwargs): |
219 return gitdirstate.gignore(*args, **kwargs) | 219 return gitdirstate.gignore(*args, **kwargs) |