Skip to content

git-p4: auto-delete named temporary file #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

git-p4: auto-delete named temporary file #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions git-p4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,13 +1160,11 @@ def exceedsLargeFileThreshold(self, relPath, contents):
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
Expand Down Expand Up @@ -3514,8 +3512,9 @@ def importHeadRevision(self, revision):
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):
Expand Down