diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-10-09 14:01:00 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-10-09 14:01:00 +0900 |
commit | 2e956f7fb3fc21fb43b788fa4c6a02712b33ee26 (patch) | |
tree | 8b0e5ad17bec336cae38cb725bd46e12cf1fd644 | |
parent | Merge branch 'rs/convert-fix-utf-without-dash' (diff) | |
parent | git-p4: auto-delete named temporary file (diff) | |
download | tgif-2e956f7fb3fc21fb43b788fa4c6a02712b33ee26.tar.xz |
Merge branch 'pm/p4-auto-delete-named-temporary'
* pm/p4-auto-delete-named-temporary:
git-p4: auto-delete named temporary file
-rwxr-xr-x | git-p4.py | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -1160,13 +1160,11 @@ class LargeFileSystem(object): if contentsSize <= gitConfigInt('git-p4.largeFileCompressedThreshold'): return False contentTempFile = self.generateTempFile(contents) - compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False) - zf = zipfile.ZipFile(compressedContentFile.name, mode='w') - zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED) - zf.close() - compressedContentsSize = zf.infolist()[0].compress_size + compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=True) + with zipfile.ZipFile(compressedContentFile, mode='w') as zf: + zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED) + compressedContentsSize = zf.infolist()[0].compress_size os.remove(contentTempFile) - os.remove(compressedContentFile.name) if compressedContentsSize > gitConfigInt('git-p4.largeFileCompressedThreshold'): return True return False @@ -3525,8 +3523,9 @@ class P4Sync(Command, P4UserMap): self.updateOptionDict(details) try: self.commit(details, self.extractFilesFromCommit(details), self.branch) - except IOError: + except IOError as err: print("IO error with git fast-import. Is your git version recent enough?") + print("IO error details: {}".format(err)) print(self.gitError.read()) def openStreams(self): |