From patchwork Tue Mar 26 23:09:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 231570 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 68C2A2C007A for ; Wed, 27 Mar 2013 10:10:48 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B6F9C4A025; Wed, 27 Mar 2013 00:10:46 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ci0FhOJmil2t; Wed, 27 Mar 2013 00:10:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 90C294A028; Wed, 27 Mar 2013 00:10:45 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 817C04A041 for ; Wed, 27 Mar 2013 00:10:32 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IeZUUwgrSTa2 for ; Wed, 27 Mar 2013 00:10:30 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-vb0-f74.google.com (mail-vb0-f74.google.com [209.85.212.74]) by theia.denx.de (Postfix) with ESMTPS id 3DF6F4A02A for ; Wed, 27 Mar 2013 00:10:27 +0100 (CET) Received: by mail-vb0-f74.google.com with SMTP id r6so777122vbi.3 for ; Tue, 26 Mar 2013 16:10:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=lGxcIkblprq9X63intzBrlW+uTmaB2GIoIUmfcfarGU=; b=aOwz9F7/Vcd0cqo67TdalJBM7rRQkCy9CgQlIY3MPH1nSnlJRpDXM5FQoERdT98NdR 1QKTjAos9AhcEowESoJzOaKgCEZNjInJwIjLdu16ou3IFp76Ua3UKOudsYaPpa61xUlC imCVam7BhwXCLtMoqqIq9U1osTABzBg22UL1QpokmTcd/BCK49MI1peuAvRV01qXmNpT ku9JgbomugQDVQojwhOQa+pbCunRuB7qObP3HQA+nxZ0/rbEtnE9a9qmUtwEcOFTYGcq 6bYukXxooMoo56anCub3Nfaxbi30RhOLZXMiRbBeBW1QPErwejcpJGChBi8PHFmgDWfF RfIA== X-Received: by 10.224.110.68 with SMTP id m4mr10173488qap.2.1364339425405; Tue, 26 Mar 2013 16:10:25 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id x1si2219962qci.2.2013.03.26.16.10.25 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 26 Mar 2013 16:10:25 -0700 (PDT) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.83.1]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 2F1655A409A; Tue, 26 Mar 2013 16:10:25 -0700 (PDT) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id D5E6A160A1E; Tue, 26 Mar 2013 16:10:24 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 26 Mar 2013 16:09:43 -0700 Message-Id: <1364339385-10035-6-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1364339385-10035-1-git-send-email-sjg@chromium.org> References: <1364339385-10035-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQliMLQ0HGYjBBQrWVTYnWjoVxR1QKD6TFEk71WwmnXe5JnB7pJtfC1beB9SJBg+ZqfTNm1hukxVC2rZLtZH1bw0f1ij+pziSgjWZ70LEhrkccJwd7wHfuWcCrrZ/30feW5LQyCiTxozQcyCrxGFZTCXL51jNvvQ7EXB38igkMpxOSRQeIQn/kdYVXIM2T2VmeiCk2TL Cc: Tom Rini Subject: [U-Boot] [PATCH v2 5/7] patman: Add -a option to refrain from test-applying the patches X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Especially with the Linux kernel, it takes a long time (a minute or more) to test-apply the patches, so patman becomes significantly less useful. The only real problem that is found with this apply step is trailing spaces. Provide a -a option to skip this step, for those working with clean patches. Signed-off-by: Simon Glass Reviewed-by: Doug Anderson --- Changes in v2: None tools/patman/patman.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/patman/patman.py b/tools/patman/patman.py index 023dceb..7a86b43 100755 --- a/tools/patman/patman.py +++ b/tools/patman/patman.py @@ -41,6 +41,9 @@ import test parser = OptionParser() +parser.add_option('-a', '--no-apply', action='store_false', + dest='apply_patches', default=True, + help="Don't test-apply patches with git am") parser.add_option('-H', '--full-help', action='store_true', dest='full_help', default=False, help='Display the README file') parser.add_option('-c', '--count', dest='count', type='int', @@ -157,9 +160,10 @@ else: ok = checkpatch.CheckPatches(options.verbose, args) else: ok = True - if not gitutil.ApplyPatches(options.verbose, args, - options.count + options.start): - ok = False + if options.apply_patches: + if not gitutil.ApplyPatches(options.verbose, args, + options.count + options.start): + ok = False cc_file = series.MakeCcFile(options.process_tags, cover_fname, not options.ignore_bad_tags)