##// END OF EJS Templates
write_bundle: close the file before removing it in case of failure
Benoit Boissinot -
r1969:6d17d420 default
parent child Browse files
Show More
@@ -297,8 +297,10 def write_bundle(cg, filename, compress=
297 fh.write(z.compress(chunk))
297 fh.write(z.compress(chunk))
298 fh.write(z.flush())
298 fh.write(z.flush())
299 except:
299 except:
300 fh.close()
300 os.unlink(filename)
301 os.unlink(filename)
301 raise
302 raise
303 fh.close()
302
304
303 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
305 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
304 changes=None, text=False, opts={}):
306 changes=None, text=False, opts={}):
@@ -1790,7 +1792,6 def incoming(ui, repo, source="default",
1790
1792
1791 cg = other.changegroup(incoming, "incoming")
1793 cg = other.changegroup(incoming, "incoming")
1792 write_bundle(cg, fname, compress=other.local(), fh=f)
1794 write_bundle(cg, fname, compress=other.local(), fh=f)
1793 f.close()
1794 if not other.local():
1795 if not other.local():
1795 # use a bundlerepo
1796 # use a bundlerepo
1796 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1797 other = bundlerepo.bundlerepository(ui, repo.root, fname)
General Comments 0
You need to be logged in to leave comments. Login now