Mercurial > public > mercurial-scm > hg
comparison mercurial/unionrepo.py @ 23878:37a92908a382
localrepo: remove all external users of localrepo.sopener
This change touches every module in which repository.sopener was being used, and
changes it for the equivalent repository.svfs.
It should now be possible to remove localrepo.sopener.
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Sun, 11 Jan 2015 00:25:54 +0100 |
| parents | 49f2d5644f04 |
| children | b95a5bb58653 |
comparison
equal
deleted
inserted
replaced
| 23877:7cc77030c557 | 23878:37a92908a382 |
|---|---|
| 176 util.expandpath(path2)) | 176 util.expandpath(path2)) |
| 177 self.repo2 = localrepo.localrepository(ui, path2) | 177 self.repo2 = localrepo.localrepository(ui, path2) |
| 178 | 178 |
| 179 @localrepo.unfilteredpropertycache | 179 @localrepo.unfilteredpropertycache |
| 180 def changelog(self): | 180 def changelog(self): |
| 181 return unionchangelog(self.sopener, self.repo2.sopener) | 181 return unionchangelog(self.svfs, self.repo2.svfs) |
| 182 | 182 |
| 183 def _clrev(self, rev2): | 183 def _clrev(self, rev2): |
| 184 """map from repo2 changelog rev to temporary rev in self.changelog""" | 184 """map from repo2 changelog rev to temporary rev in self.changelog""" |
| 185 node = self.repo2.changelog.node(rev2) | 185 node = self.repo2.changelog.node(rev2) |
| 186 return self.changelog.rev(node) | 186 return self.changelog.rev(node) |
| 187 | 187 |
| 188 @localrepo.unfilteredpropertycache | 188 @localrepo.unfilteredpropertycache |
| 189 def manifest(self): | 189 def manifest(self): |
| 190 return unionmanifest(self.sopener, self.repo2.sopener, | 190 return unionmanifest(self.svfs, self.repo2.svfs, |
| 191 self._clrev) | 191 self._clrev) |
| 192 | 192 |
| 193 def url(self): | 193 def url(self): |
| 194 return self._url | 194 return self._url |
| 195 | 195 |
| 196 def file(self, f): | 196 def file(self, f): |
| 197 return unionfilelog(self.sopener, f, self.repo2.sopener, | 197 return unionfilelog(self.svfs, f, self.repo2.svfs, |
| 198 self._clrev, self) | 198 self._clrev, self) |
| 199 | 199 |
| 200 def close(self): | 200 def close(self): |
| 201 self.repo2.close() | 201 self.repo2.close() |
| 202 | 202 |