##// END OF EJS Templates
bundlerepo: restore close() method
Matt Mackall -
r12347:6277a946 default
parent child Browse files
Show More
@@ -600,6 +600,7 b' def transplant(ui, repo, *revs, **opts):'
600 tp.apply(repo, source, revmap, merges, opts)
600 tp.apply(repo, source, revmap, merges, opts)
601 finally:
601 finally:
602 if bundle:
602 if bundle:
603 source.close()
603 os.unlink(bundle)
604 os.unlink(bundle)
604
605
605 cmdtable = {
606 cmdtable = {
@@ -177,7 +177,6 b' class bundlerepository(localrepo.localre'
177 f = open(bundlename, "rb")
177 f = open(bundlename, "rb")
178 self.bundle = changegroup.readbundle(f, bundlename)
178 self.bundle = changegroup.readbundle(f, bundlename)
179 if self.bundle.compressed():
179 if self.bundle.compressed():
180 # we need a seekable, decompressed bundle
181 fdtemp, temp = tempfile.mkstemp(prefix="hg-bundle-",
180 fdtemp, temp = tempfile.mkstemp(prefix="hg-bundle-",
182 suffix=".hg10un", dir=self.path)
181 suffix=".hg10un", dir=self.path)
183 self.tempfile = temp
182 self.tempfile = temp
@@ -247,6 +246,10 b' class bundlerepository(localrepo.localre'
247 else:
246 else:
248 return filelog.filelog(self.sopener, f)
247 return filelog.filelog(self.sopener, f)
249
248
249 def close(self):
250 """Close assigned bundle file immediately."""
251 self.bundle.close()
252
250 def __del__(self):
253 def __del__(self):
251 del self.bundle
254 del self.bundle
252 if tempfile is not None:
255 if tempfile is not None:
@@ -143,6 +143,8 b' class unbundle10(object):'
143 return self._stream.seek(pos)
143 return self._stream.seek(pos)
144 def tell(self):
144 def tell(self):
145 return self._stream.tell()
145 return self._stream.tell()
146 def close(self):
147 return self._stream.close()
146
148
147 def chunklength(self):
149 def chunklength(self):
148 d = self.read(4)
150 d = self.read(4)
General Comments 0
You need to be logged in to leave comments. Login now