Mercurial > hg > hg-git
comparison hggit/git_handler.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 | 715cbf3fa24c |
comparison
equal
deleted
inserted
replaced
1013:a4f4f861fc5e | 1014:7835460756d4 |
---|---|
106 self.ui = ui | 106 self.ui = ui |
107 | 107 |
108 if ui.configbool('git', 'intree'): | 108 if ui.configbool('git', 'intree'): |
109 self.gitdir = self.repo.wjoin('.git') | 109 self.gitdir = self.repo.wjoin('.git') |
110 else: | 110 else: |
111 self.gitdir = self.repo.join('git') | 111 self.gitdir = self.repo.vfs.join('git') |
112 | 112 |
113 self.init_author_file() | 113 self.init_author_file() |
114 | 114 |
115 self.paths = ui.configitems('paths') | 115 self.paths = ui.configitems('paths') |
116 | 116 |
180 return self._map_hg.get(hgsha) | 180 return self._map_hg.get(hgsha) |
181 | 181 |
182 def load_map(self): | 182 def load_map(self): |
183 map_git_real = {} | 183 map_git_real = {} |
184 map_hg_real = {} | 184 map_hg_real = {} |
185 if os.path.exists(self.repo.join(self.map_file)): | 185 if os.path.exists(self.repo.vfs.join(self.map_file)): |
186 for line in self.repo.vfs(self.map_file): | 186 for line in self.repo.vfs(self.map_file): |
187 # format is <40 hex digits> <40 hex digits>\n | 187 # format is <40 hex digits> <40 hex digits>\n |
188 if len(line) != 82: | 188 if len(line) != 82: |
189 raise ValueError( | 189 raise ValueError( |
190 _('corrupt mapfile: incorrect line length %d') % | 190 _('corrupt mapfile: incorrect line length %d') % |
208 # If this complains, atomictempfile no longer has close | 208 # If this complains, atomictempfile no longer has close |
209 file.close() | 209 file.close() |
210 | 210 |
211 def load_tags(self): | 211 def load_tags(self): |
212 self.tags = {} | 212 self.tags = {} |
213 if os.path.exists(self.repo.join(self.tags_file)): | 213 if os.path.exists(self.repo.vfs.join(self.tags_file)): |
214 for line in self.repo.vfs(self.tags_file): | 214 for line in self.repo.vfs(self.tags_file): |
215 sha, name = line.strip().split(' ', 1) | 215 sha, name = line.strip().split(' ', 1) |
216 self.tags[name] = sha | 216 self.tags[name] = sha |
217 | 217 |
218 def save_tags(self): | 218 def save_tags(self): |
400 else: | 400 else: |
401 ret = 1 | 401 ret = 1 |
402 return ret | 402 return ret |
403 | 403 |
404 def clear(self): | 404 def clear(self): |
405 mapfile = self.repo.join(self.map_file) | 405 mapfile = self.repo.vfs.join(self.map_file) |
406 if os.path.exists(self.gitdir): | 406 if os.path.exists(self.gitdir): |
407 for root, dirs, files in os.walk(self.gitdir, topdown=False): | 407 for root, dirs, files in os.walk(self.gitdir, topdown=False): |
408 for name in files: | 408 for name in files: |
409 os.remove(os.path.join(root, name)) | 409 os.remove(os.path.join(root, name)) |
410 for name in dirs: | 410 for name in dirs: |