Mercurial > hg-git
comparison hggit/__init__.py @ 1018:715cbf3fa24c
vfs: stop using repo.join/wjoin
Mercurial 4.3 has completelu dropped the join and wjoin functions. Let's use the
appropriate repo.vfs.join and repo.wvfs.join functions instead.
I ran the tests against each version of Mercurial from 2.8 to 4.2. Things
before 2.8 seem to already be broken for unrelated reasons.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Tue, 09 May 2017 14:33:28 -0700 |
| parents | 1bd9d9a0201c |
| children | f2118a7dd764 |
comparison
equal
deleted
inserted
replaced
| 1017:63d23880098d | 1018:715cbf3fa24c |
|---|---|
| 208 def reposetup(ui, repo): | 208 def reposetup(ui, repo): |
| 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, 'vfs') and |
| 214 os.path.exists(repo.vfs.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): |