зеркало из https://github.com/microsoft/git.git
git-p4: do not fail in verbose mode for missing 'fileSize' key
If deleting or moving a file, sometimes P4 doesn't report the file size. The code handles this just fine but some logging crashes. Stop this happening. There was some earlier discussion on the list about this: https://public-inbox.org/git/xmqq1sqpp1vv.fsf@gitster.mtv.corp.google.com/ Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
5a0cc8aca7
Коммит
0742b7c860
|
@ -2775,7 +2775,10 @@ class P4Sync(Command, P4UserMap):
|
|||
relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
|
||||
relPath = self.encodeWithUTF8(relPath)
|
||||
if verbose:
|
||||
size = int(self.stream_file['fileSize'])
|
||||
if 'fileSize' in self.stream_file:
|
||||
size = int(self.stream_file['fileSize'])
|
||||
else:
|
||||
size = 0 # deleted files don't get a fileSize apparently
|
||||
sys.stdout.write('\r%s --> %s (%i MB)\n' % (file['depotFile'], relPath, size/1024/1024))
|
||||
sys.stdout.flush()
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче