From patchwork Mon Aug 25 15:58:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 382770 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 A852A14007B for ; Tue, 26 Aug 2014 02:00:00 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1E680A741B; Mon, 25 Aug 2014 17:59:54 +0200 (CEST) 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 9CYv-aSstt2n; Mon, 25 Aug 2014 17:59:53 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E25FB4B372; Mon, 25 Aug 2014 17:59:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E854BA73E5 for ; Mon, 25 Aug 2014 17:59:02 +0200 (CEST) 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 C7Df1h4JuPiv for ; Mon, 25 Aug 2014 17:59:01 +0200 (CEST) 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-oa0-f73.google.com (mail-oa0-f73.google.com [209.85.219.73]) by theia.denx.de (Postfix) with ESMTPS id 75C8E4A04E for ; Mon, 25 Aug 2014 17:58:50 +0200 (CEST) Received: by mail-oa0-f73.google.com with SMTP id g18so2685069oah.0 for ; Mon, 25 Aug 2014 08:58:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=smhz/LUpYh5ukCPDT9g3b0gnNZ4gLUxnPjmptgEAHRg=; b=LaZVtKl4af3uLmViKqZ34EiOMy4I6b483hQCT3NwSeNKvSPvMqWxNq7B2hAxEcaclI hcQKRGO6Mh/DpmgqBayzP3XcGW/E/KBjxHQ4uUsjysyfdSld7oC5f8UxRRjkk1HM7YLX atusQVA9pNAEEGaXfSr3sefbtH3oDNYQiOJ9oOO09WN+sZO9eA962n/xVkE5Su0hUm4j +FLKbpPHD8qdafPeUusEwUnDMwbIu7gpRj9Af6yw+sGWFOq4LcxOh1EZOslQUGYbW+KE yKepjokuVbaQ5vLJ1RRwwD04n/LSk8KcGGH7vGkTMbVEO6hiWQeHcFpj3j6RKr1NpBSR JaCA== X-Gm-Message-State: ALoCoQnzyMkTMUk3OlbCKO89aE4ynhOPaezRRHVD2VzEsOkdWVeNkssf4iZ9+ffK9g0gS7uWJg7k X-Received: by 10.182.213.105 with SMTP id nr9mr15052969obc.36.1408982329759; Mon, 25 Aug 2014 08:58:49 -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 j25si19601yhb.0.2014.08.25.08.58.49 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Aug 2014 08:58:49 -0700 (PDT) Received: from kaki.bld.corp.google.com (kaki.bld.corp.google.com [172.29.216.32]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 84E4E5A43BB; Mon, 25 Aug 2014 08:58:49 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 174A1220545; Mon, 25 Aug 2014 09:58:49 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 25 Aug 2014 09:58:27 -0600 Message-Id: <1408982315-18610-7-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1408982315-18610-1-git-send-email-sjg@chromium.org> References: <1408982315-18610-1-git-send-email-sjg@chromium.org> Cc: Tom Rini , u-boot-review@google.com, York Sun Subject: [U-Boot] [PATCH v9 06/14] patman: Avoid changing the order of tags 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 patman collects tags that it sees in the commit and places them nicely sorted at the end of the patch. However, this is not really necessary and in fact is apparently not desirable. Suggested-by: Masahiro Yamada Signed-off-by: Simon Glass --- Changes in v9: - Add new patch to avoid changing the order of tags Changes in v8: None Changes in v7: None Changes in v6: None Changes in v5: None tools/patman/patchstream.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 322374c..b0b8153 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -72,7 +72,6 @@ class PatchStream: self.in_change = 0 # Non-zero if we are in a change list self.blank_count = 0 # Number of blank lines stored up self.state = STATE_MSG_HEADER # What state are we in? - self.tags = [] # Tags collected, like Tested-by... self.signoff = [] # Contents of signoff line self.commit = None # Current commit @@ -113,16 +112,6 @@ class PatchStream: self.series.AddCommit(self.commit) self.commit = None - def FormatTags(self, tags): - out_list = [] - for tag in sorted(tags): - if tag.startswith('Cc:'): - tag_list = tag[4:].split(',') - out_list += gitutil.BuildEmailList(tag_list, 'Cc:') - else: - out_list.append(tag) - return out_list - def ProcessLine(self, line): """Process a single line of a patch file or commit log @@ -271,7 +260,7 @@ class PatchStream: elif tag_match.group(1) == 'Patch-cc': self.commit.AddCc(tag_match.group(2).split(',')) else: - self.tags.append(line); + out = [line] # Suppress duplicate signoffs elif signoff_match: @@ -311,7 +300,6 @@ class PatchStream: # Output the tags (signeoff first), then change list out = [] log = self.series.MakeChangeLog(self.commit) - out += self.FormatTags(self.tags) out += [line] if self.commit: out += self.commit.notes