From patchwork Thu Feb 26 20:00:18 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1949 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=1772136141; bh=55ABauCDpo0+545aggdEEqX4keObUX0ezNtd5QIgenQ=; 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=sI/2wAGWLYqSvbN2S0RV92e6k2cmQ5+c5AOm50gSWkCDTrWGGUrzdLmFPjdF8okJM jtwD7Qw9H5v+g9JXxjQZsKpj2hohhp3zN8CQU7QCc4ixj4nCtnFuI0d7agxpOq0R/H yCJaFqq75WL89v6S8/1/S8QYxY2K1Jbk9rlkbOVTVCb1ONHzbjSByqwWvuZutpwdCd WQL65fJgwx6e+lS+oIGBA6lLc3zVyjl4ItgFr7/z6FRNXrWYKElvERopIOMw2OLMkL pbpzyJcReyrgZYyEh3jRlLRHVECtAxeVZvs3Z80wfoMjkGQVs/YKJ4HLFo01yP+m6q vF3h6fRXCumkw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 1CB5E69E3A for ; Thu, 26 Feb 2026 13:02:21 -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 F5apme657EB3 for ; Thu, 26 Feb 2026 13:02:21 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1772136141; bh=55ABauCDpo0+545aggdEEqX4keObUX0ezNtd5QIgenQ=; 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=sI/2wAGWLYqSvbN2S0RV92e6k2cmQ5+c5AOm50gSWkCDTrWGGUrzdLmFPjdF8okJM jtwD7Qw9H5v+g9JXxjQZsKpj2hohhp3zN8CQU7QCc4ixj4nCtnFuI0d7agxpOq0R/H yCJaFqq75WL89v6S8/1/S8QYxY2K1Jbk9rlkbOVTVCb1ONHzbjSByqwWvuZutpwdCd WQL65fJgwx6e+lS+oIGBA6lLc3zVyjl4ItgFr7/z6FRNXrWYKElvERopIOMw2OLMkL pbpzyJcReyrgZYyEh3jRlLRHVECtAxeVZvs3Z80wfoMjkGQVs/YKJ4HLFo01yP+m6q vF3h6fRXCumkw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 0CF6069DAB for ; Thu, 26 Feb 2026 13:02:21 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1772136139; bh=Fz8PA4aZRLqGBicd1PhYZqcskaRuELpbzXiZSi3JvfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YVzL4w7aSMdX/u2LVOSDuRa3qmNP+yeNIHFwJvjlmCUoTQX/hDsEN7yZplb2N2NXv XazmiSiG0wYNlLvh3xU/d0hp844rwEslh8xtkX7kY8KKpDomcrBrpvtJdV9iVJi88e fPQ2xrdTEZuU0J57gjbD4JBTXzcnt60Oshd6YiD5x0XWMQfRtZNzajd0NkUQw4MRvK QVkLqDt2upUAIdykd05BIvSf9/3GQNvy/oByFnvpz06JFM5A/8TALMG5mE9o8CDNzW w0Kk0da3GSbGPCQ2TMhBDizNE8Z1Eg+7ShArcy+vfU5bB9KRQsXP/VYHnQXek8TE9C 10qwEBMSa+z+Q== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 485F269D79; Thu, 26 Feb 2026 13:02:19 -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 zS56lnb2ZDig; Thu, 26 Feb 2026 13:02:19 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1772136133; bh=19vFT/55GzuzZhgn6fa2PkGxh4no79wUCm88KH8kaCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XCEBD/ht0oUw+Lb6mOrH3uAdDW2KAOuGL95xzZd4zuWgf6emUh2pM3bvh1kvlnLgp +ST9v1zFSl3Ppwl8t3Wr8u2su/ChoYI1WliPOPnWMmwU4aSn0gUMeJ68inm3qIkP9K FVygf801HoSGPPyqdKQDmLj+jNJPm8CrmHWN+rLb5ayv4jXsx3Sh/wz8OivJr39Ryx XldbHqkTYAcSoukOt0UXrZCSZ4san5snTBywwxeMTryxiPfJ9lcaf9UsbuotSrWPxP k7vn8JaD3g3n71xHYFOWMNFihJnrnJ3HTvIDlC2L1BRaB7vXkgs/Ns6teZS8oEgrao mzddin71F3ntQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 37F5469DAB; Thu, 26 Feb 2026 13:02:13 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Thu, 26 Feb 2026 13:00:18 -0700 Message-ID: <20260226200106.1727176-13-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: WHRUGCBXWD4DIKGUZ3J2CMES7ZMB2ALL X-Message-ID-Hash: WHRUGCBXWD4DIKGUZ3J2CMES7ZMB2ALL 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 12/32] patman: Wire up per-upstream patchwork project in commands 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 Add -u/--upstream-name to set-project and get-project so the user can specify which upstream a project belongs to. In do_series(), look up the series' upstream and use it to find the matching patchwork project, falling back to any configured project if there is no upstream-specific one. Signed-off-by: Simon Glass --- tools/patman/cmdline.py | 8 +++++++- tools/patman/control.py | 26 +++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/tools/patman/cmdline.py b/tools/patman/cmdline.py index 65b9dfab4bb..74571fd7220 100644 --- a/tools/patman/cmdline.py +++ b/tools/patman/cmdline.py @@ -159,10 +159,16 @@ def add_patchwork_subparser(subparsers): ['set-project', 'U-Boot'], ] patchwork_subparsers = patchwork.add_subparsers(dest='subcmd') - patchwork_subparsers.add_parser('get-project') + gproj = patchwork_subparsers.add_parser('get-project') + gproj.add_argument( + '-u', '--upstream-name', + help='Upstream to get the project for') uset = patchwork_subparsers.add_parser('set-project') uset.add_argument( 'project_name', help="Patchwork project name, e.g. 'U-Boot'") + uset.add_argument( + '-u', '--upstream-name', + help='Upstream to associate this project with') return patchwork diff --git a/tools/patman/control.py b/tools/patman/control.py index 1a65dfc2cc6..191cfc134d3 100644 --- a/tools/patman/control.py +++ b/tools/patman/control.py @@ -135,11 +135,15 @@ def do_series(args, test_db=None, pwork=None, cser=None): if args.subcmd in needs_patchwork: if not pwork: pwork = Patchwork(args.patchwork_url) - proj = cser.project_get() + ups = cser.get_series_upstream(args.series) + proj = cser.project_get(ups) + if not proj: + proj = cser.project_get() if not proj: raise ValueError( - "Please set project ID with 'patman patchwork set-project'") - _, proj_id, link_name = cser.project_get() + "Please set project ID with " + "'patman patchwork set-project'") + _, proj_id, link_name = proj pwork.project_set(proj_id, link_name) elif pwork and pwork is not True: raise ValueError( @@ -270,13 +274,21 @@ def patchwork(args, test_db=None, pwork=None): if args.subcmd == 'set-project': if not pwork: pwork = Patchwork(args.patchwork_url) - cser.project_set(pwork, args.project_name) + cser.project_set(pwork, args.project_name, + ups=args.upstream_name) elif args.subcmd == 'get-project': - info = cser.project_get() + ups = args.upstream_name + info = cser.project_get(ups) if not info: - raise ValueError("Project has not been set; use 'patman patchwork set-project'") + raise ValueError( + "Project has not been set; use " + "'patman patchwork set-project'") name, pwid, link_name = info - print(f"Project '{name}' patchwork-ID {pwid} link-name '{link_name}'") + msg = (f"Project '{name}' patchwork-ID {pwid} " + f"link-name '{link_name}'") + if ups: + msg += f" upstream '{ups}'" + print(msg) else: raise ValueError(f"Unknown patchwork subcommand '{args.subcmd}'") finally: