Luke, Thank you for reviewing and acking my patch! By the way, did you see Thandesha's proposed patch [1] to print a warning in case of the missing "fileSize" attribute? Should we go that route instead? Or should we try harder to get the size by running `p4 -G sizes`? [1] https://public-inbox.org/git/CAJJpmi-pLb4Qcka5aLKXA8B1VOZFFF+OAQ0fgUq9YviobRpYGg@xxxxxxxxxxxxxx/t/#m6053d2031020e08edd24ada6c9eb49721ebc4e27 Thank you, Andrey From: Luke Diamand <luke@xxxxxxxxxxx> > On Tue, 17 Apr 2018, 09:22 Andrey Mazo, <amazo@xxxxxxxxxxxxxx> wrote: >> Perforce server 2007.2 (and maybe others) doesn't return "fileSize" >> attribute in its reply to `p4 -G print` command. >> This causes the following traceback when running `git p4 sync --verbose`: >> """ >> Traceback (most recent call last): >> File "/usr/libexec/git-core/git-p4", line 3839, in <module> >> main() >> File "/usr/libexec/git-core/git-p4", line 3833, in main >> if not cmd.run(args): >> File "/usr/libexec/git-core/git-p4", line 3567, in run >> self.importChanges(changes) >> File "/usr/libexec/git-core/git-p4", line 3233, in importChanges >> self.commit(description, filesForCommit, branch, parent) >> File "/usr/libexec/git-core/git-p4", line 2855, in commit >> self.streamP4Files(files) >> File "/usr/libexec/git-core/git-p4", line 2747, in streamP4Files >> cb=streamP4FilesCbSelf) >> File "/usr/libexec/git-core/git-p4", line 552, in p4CmdList >> cb(entry) >> File "/usr/libexec/git-core/git-p4", line 2741, in streamP4FilesCbSelf >> self.streamP4FilesCb(entry) >> File "/usr/libexec/git-core/git-p4", line 2689, in streamP4FilesCb >> self.streamOneP4File(self.stream_file, self.stream_contents) >> File "/usr/libexec/git-core/git-p4", line 2566, in streamOneP4File >> size = int(self.stream_file['fileSize']) >> KeyError: 'fileSize' >> """ >> >> Fix this by omitting the file size information from the verbose print out. >> Also, don't use "self.stream_file" directly, >> but rather use passed in "file" argument. >> (which point to the same "self.stream_file" for all existing callers) >> >> Signed-off-by: Andrey Mazo <amazo@xxxxxxxxxxxxxx> >> --- >> git -p4.py | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/git-p4.py b/git-p4.py >> index 7bb9cadc6..6f05f915a 100755 >> --- a/git-p4.py >> +++ b/git-p4.py >> @@ -2566,8 +2566,12 @@ class P4Sync(Command, P4UserMap): >> relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes) >> relPath = self.encodeWithUTF8(relPath) >> if verbose: >> - size = int(self.stream_file['fileSize']) >> - sys.stdout.write('\r%s --> %s (%i MB)\n' % (file['depotFile'], relPath, size/1024/1024)) >> + size = file.get('fileSize', None) >> + if size is None: >> + sizeStr = '' >> + else: >> + sizeStr = ' (%i MB)' % (int(size)/1024/1024) >> + sys.stdout.write('\r%s --> %s%s\n' % (file['depotFile'], relPath, sizeStr)) >> sys.stdout.flush() >> >> (type_base, type_mods) = split_p4_type(file["type"]) >> -- >> 2.16.1 >> > Thanks, that looks like a good fix to me. Ack.
