From patchwork Mon Oct 15 11:14:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luke Diamand X-Patchwork-Id: 10641557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D8B2925 for ; Mon, 15 Oct 2018 11:14:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E8A629235 for ; Mon, 15 Oct 2018 11:14:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12A3529477; Mon, 15 Oct 2018 11:14:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05F4E29235 for ; Mon, 15 Oct 2018 11:14:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726526AbeJOS7N (ORCPT ); Mon, 15 Oct 2018 14:59:13 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:37659 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726319AbeJOS7N (ORCPT ); Mon, 15 Oct 2018 14:59:13 -0400 Received: by mail-pf1-f193.google.com with SMTP id j23-v6so9513484pfi.4 for ; Mon, 15 Oct 2018 04:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=diamand.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ffdq98kySWVmKhM7VB6+p5/IbsOlzT1X5C/f8NIg+6o=; b=MAGo/h+VA6qTNT1ibKFaGE2nrHAgz1YTOWA8pJdWNUfv8jvmqnaKPjvV5ce2gZYQFZ WuCCCnpQi56EszVqwDIRQagJ7oQUN5bv9F8Cvvlz7vbkFNHBnxtGSA55jJZJTrN0LIO/ n1ck5yl/Dpa3ZGJxqW0rynqlZqSP4eC9foYW8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ffdq98kySWVmKhM7VB6+p5/IbsOlzT1X5C/f8NIg+6o=; b=iEKZObKrnEMRkV/jHRPVEHtEctsKLsE1jkAp/A0fs8SM3AaEmjEXJxmdXHW8IlsOhF 5F/Fuh/YpFp2SNrPvAT2XaQhzUL7b0C+JH1srIC7EPOBBd5RFPWD8BIkGB15QFHIZF64 UN0tcvy+TAUYb/vuEB4UrDUhi511uPxRLfl1YZ+2PNtNTq4j6YXe4maQ27jxKd3hPrwU qQRGFT7117Qydy4d8ziolHEAORM1q4whLXPO5w8W7bSjFdLp6dO+lIaV9taUJwNc0Jru Rwt8fyuSaISyUwRhvkEnfV6sGnyEfaHkD5SnXvwH8XO6QSpPZkJA0pA+mPV8gjuSBRPG IppA== X-Gm-Message-State: ABuFfogr877znAptuLIwGiZ7g2qGyEvsieiFWM8395uBqdlGx/rJmSsL rk3WsDqlEK7iLtozqtetZxALvoF6zdqXtihv X-Google-Smtp-Source: ACcGV63C0KTEKxoJMRxK9z1/UMl7tgHBIJhCLEqoR8HNZxYvYloEzoa2UgJNMQX073gEnlxhBBaAPg== X-Received: by 2002:a63:8c0b:: with SMTP id m11-v6mr15785653pgd.422.1539602065481; Mon, 15 Oct 2018 04:14:25 -0700 (PDT) Received: from lgd-kipper.hsd1.ca.comcast.net ([2601:646:8581:1fcf:8286:f2ff:fe24:931b]) by smtp.gmail.com with ESMTPSA id e22-v6sm11352461pfi.61.2018.10.15.04.14.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 04:14:24 -0700 (PDT) From: Luke Diamand To: git@vger.kernel.org Cc: =?utf-8?q?SZEDER_G=C3=A1bor?= , Chen Bin , Miguel Torroja , George Vanburgh , Merland Romain , Vinicius Kursancew , larsxschneider@gmail.com, Lex Spoon , Johannes Schindelin , Luke Diamand Subject: [PATCHv2 1/3] git-p4: do not fail in verbose mode for missing 'fileSize' key Date: Mon, 15 Oct 2018 12:14:06 +0100 Message-Id: <20181015111408.17618-2-luke@diamand.org> X-Mailer: git-send-email 2.19.1.331.gae0ed827e6 In-Reply-To: <20181015111408.17618-1-luke@diamand.org> References: <20181015111408.17618-1-luke@diamand.org> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- git-p4.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index 7fab255584..5701bad06a 100755 --- a/git-p4.py +++ b/git-p4.py @@ -2775,7 +2775,10 @@ def streamOneP4File(self, file, contents): 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()