From patchwork Thu Feb 26 20:00:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1944 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1772136120; bh=V9sNu3tF6V2ZCTKDcYnqn1u3MqJM53OeDH/+kwS+cHI=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=PEX4+c8l+hGfJfrvPkAC33FDcTsZAyUVI3R/5snk+dqLZUNAddaEQJ68NxMmquz48 vpZIJDunvkV1UEZceOYuJWZm5jwZOMk7Ydcf7Xhezg1AKiQoShumpGTO2V8f/G5sRz 9YJJmHGlYQzl1OBUnG4o2UEq7QbBh+q2tQyYdkuiDG9X6UIngQUDkbHu3MN4joSEMV tMFsZdHBT6EpjQZpuFASmKqvyfrY9kwRVzrz0AuKdl6DFKEb25P7gS23nNAyHRPenL xQYoHzrRhkEHFQ3s4VdtPX/mYE83znT1iHJ2NRyN/oo3pB7MKDEBl4j3k89qaSmRmy G4QLGXn2WM6DQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 8AE1869E36 for ; Thu, 26 Feb 2026 13:02:00 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id pPBAqWyETaZo for ; Thu, 26 Feb 2026 13:02:00 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1772136120; bh=V9sNu3tF6V2ZCTKDcYnqn1u3MqJM53OeDH/+kwS+cHI=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=PEX4+c8l+hGfJfrvPkAC33FDcTsZAyUVI3R/5snk+dqLZUNAddaEQJ68NxMmquz48 vpZIJDunvkV1UEZceOYuJWZm5jwZOMk7Ydcf7Xhezg1AKiQoShumpGTO2V8f/G5sRz 9YJJmHGlYQzl1OBUnG4o2UEq7QbBh+q2tQyYdkuiDG9X6UIngQUDkbHu3MN4joSEMV tMFsZdHBT6EpjQZpuFASmKqvyfrY9kwRVzrz0AuKdl6DFKEb25P7gS23nNAyHRPenL xQYoHzrRhkEHFQ3s4VdtPX/mYE83znT1iHJ2NRyN/oo3pB7MKDEBl4j3k89qaSmRmy G4QLGXn2WM6DQ== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 7920A69DAB for ; Thu, 26 Feb 2026 13:02:00 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1772136118; bh=XRuqjsOt1YL8Fs0J2w5pFiui23Ex0D5ZG1NTWq8UEv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H3rsfbOBzbpXmmF7m65dWo69AEll7NDRFQXEPDZ9EG8vC0ozoqteqld7EFuWzuA9m CjTEsZ6iXyT21LOGgqvSCeLPqgmDEyT6VKBcS70Ln1NgvTQXyPKO4PzHXJ9URnwRjY gShwfEtr0p07odMO1lJY+NnE0Ycb1UIawCyCGIqDKAL9quSwouyaQO58nD2j6hcSzz ggOOq0hSB1B1qEkfGFY3g6a1GkV+wc69qZZkCbG0HP/F9HO4IoGJbi7AJZeo2cvQZl 2Ew1ubnVazPM4tKUfG0jHQyI/timygjJD4IySK6GfhfooK4vEwsIdfsnWKz+voVMhp h4dIvMn8qHJhQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 7E3FE69D79; Thu, 26 Feb 2026 13:01:58 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id nT7mVA-UqvKE; Thu, 26 Feb 2026 13:01:58 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1772136114; bh=PTK5c1lodgRJUSgDWgjy3ksGO+TqOTVJonQCmXx5ERE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vX1lG6DTCErGcsfPKgjE03dyCdD6Fm0AGFO1Si4ATv5ibT1LNUFqhyzfmg2d3+vYn Oouz2kN7W2nbMjTyyuFJPYHM+BkntrPvcfbtOg4A7nB9+LudpdlaYs0rhOLfkDaj+7 TWkPCC4RbltqjMuiCQBhITfaDdI3CzkqpUh7MEj4zCS7bj4+EJ188Y29mDOEhDFkMb VVaY6KeXh45GVjrwhWir3D9fmz4iDfuqLwQNZ2/d8t4m0UqF+FwNjWrLzWPvKMTsCB Xp4xY1WW4eLcSzMLCmYwLkorR/w9OatH1U70KEA5I6bxjOIob8Bd3eylV3FEZwehYP rPZKx8rXg3sRg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 14FDB69D4A; Thu, 26 Feb 2026 13:01:54 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Thu, 26 Feb 2026 13:00:13 -0700 Message-ID: <20260226200106.1727176-8-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260226200106.1727176-1-sjg@u-boot.org> References: <20260226200106.1727176-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: KZZZROMV2ZDBWRB6MDMF5MOHQ42EC5AE X-Message-ID-Hash: KZZZROMV2ZDBWRB6MDMF5MOHQ42EC5AE X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 07/32] patman: Show upstream in series list List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Update 'series ls' to display a two-character upstream abbreviation before the version column, making it easy to see which remote each series targets. Signed-off-by: Simon Glass --- tools/patman/cseries.py | 8 +++++--- tools/patman/test_cseries.py | 14 +++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/patman/cseries.py b/tools/patman/cseries.py index c90020b7eb6..6c918185387 100644 --- a/tools/patman/cseries.py +++ b/tools/patman/cseries.py @@ -408,18 +408,20 @@ class Cseries(cser_helper.CseriesHelper): include_archived (bool): True to include archived series also """ sdict = self.db.series_get_dict(include_archived) - print(f"{'Name':15} {'Description':40} Accepted Versions") - border = f"{'-' * 15} {'-' * 40} -------- {'-' * 15}" + print(f"{'Name':15} {'Description':40} Accepted Us Versions") + border = f"{'-' * 15} {'-' * 40} -------- -- {'-' * 15}" print(border) for name in sorted(sdict): ser = sdict[name] versions = self._get_version_list(ser.idnum) stat = self._series_get_version_stats( ser.idnum, self._series_max_version(ser.idnum))[0] + ups = (ser.upstream or '')[:2] vlist = ' '.join([str(ver) for ver in sorted(versions)]) - print(f'{name:16.16} {ser.desc:41.41} {stat.rjust(8)} {vlist}') + print(f'{name:16.16} {ser.desc:41.41} {stat.rjust(8)} ' + f'{ups:2} {vlist}') print(border) def list_patches(self, series, version, show_commit=False, diff --git a/tools/patman/test_cseries.py b/tools/patman/test_cseries.py index 23527cfa8f0..e529d9fe61b 100644 --- a/tools/patman/test_cseries.py +++ b/tools/patman/test_cseries.py @@ -759,14 +759,14 @@ Tested-by: Mary Smith # yak self.assertEqual(5, len(lines)) self.assertEqual( 'Name Description ' - 'Accepted Versions', lines[0]) + 'Accepted Us Versions', lines[0]) self.assertTrue(lines[1].startswith('--')) self.assertEqual( 'first ' - ' -/2 1', lines[2]) + ' -/2 1', lines[2]) self.assertEqual( 'second Series for my board ' - ' 1/3 1 2', lines[3]) + ' 1/3 1 2', lines[3]) self.assertTrue(lines[4].startswith('--')) def test_series_list_archived(self): @@ -780,7 +780,7 @@ Tested-by: Mary Smith # yak self.assertEqual(4, len(lines)) self.assertEqual( 'second Series for my board ' - ' 1/3 1 2', lines[2]) + ' 1/3 1 2', lines[2]) # Now list including archived series with terminal.capture() as (out, _): @@ -789,10 +789,10 @@ Tested-by: Mary Smith # yak self.assertEqual(5, len(lines)) self.assertEqual( 'first ' - ' -/2 1', lines[2]) + ' -/2 1', lines[2]) self.assertEqual( 'second Series for my board ' - ' 1/3 1 2', lines[3]) + ' 1/3 1 2', lines[3]) def test_do_series_add(self): """Add a new cseries""" @@ -821,7 +821,7 @@ Tested-by: Mary Smith # yak self.assertTrue(lines[1].startswith('--')) self.assertEqual( 'first my-description ' - '-/2 1', lines[2]) + '-/2 1', lines[2]) def test_do_series_add_cmdline(self): """Add a new cseries using the cmdline"""