From patchwork Fri May 1 11:00:21 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2272 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=1777633344; bh=v8f+33RfcQqK3/S/7OVOLNiTtUj1umIohTO6Gi0M5Xc=; 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=Vod3sKcUaiU4SAT7DyUUwBZEweik6uQMpSec8wA2Eh4wtacIKdPRmA1aPOrmmxzFJ RgVD6gRBNCErDnGcy1/f7gp1QJZp22UpNiLBn+9SkPSHgMs+YkgS1qX4no8k1owEDd 7F6yEl5zLvDYPN3Do1a3ljD166aok0rf6hgfuWQ8= Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 5C7A06A7AF for ; Fri, 1 May 2026 05:02:24 -0600 (MDT) 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 wFpzPmqcWFXn for ; Fri, 1 May 2026 05:02:24 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1777633344; bh=v8f+33RfcQqK3/S/7OVOLNiTtUj1umIohTO6Gi0M5Xc=; 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=Vod3sKcUaiU4SAT7DyUUwBZEweik6uQMpSec8wA2Eh4wtacIKdPRmA1aPOrmmxzFJ RgVD6gRBNCErDnGcy1/f7gp1QJZp22UpNiLBn+9SkPSHgMs+YkgS1qX4no8k1owEDd 7F6yEl5zLvDYPN3Do1a3ljD166aok0rf6hgfuWQ8= Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4CCC16A82E for ; Fri, 1 May 2026 05:02:24 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1777633342; bh=Z6oFIyCaJSvr7l6+C0igVFvikyiY/bnk7ZeozO+wQXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qv/N0khG4kWQvEbXKGFdkMZUy5jWmroPddv1jZyUaLDgFygoP8n6P5DTIt09TUuqH e1lNyTq9aYtrRY4yw0XKNkynxDfiWvYSO2DUvv7bngA0g/sF9tWiO3dEBpY5cPOiDy NMhD7lP3vPmVh8xr9GP5plpHPW+cxAcv8rRe+wy8= Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D962E6A7AF; Fri, 1 May 2026 05:02:22 -0600 (MDT) 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 hCno_usOx3nx; Fri, 1 May 2026 05:02:22 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1777633338; bh=+XBs/CoCFyg+uFw2i1dHwBnG4iwUIs+6yQxCIFarOis=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TjqvT9IQkRKIT7+D/0FJjBVq2TbvOD7GIOZ7oH5LETNU92msVzUcwhGjqVAVTuCJu 46sp+5KKtjgH5/SkBJyBPDMIlNgAHuyWkyvA6aSkcHt22hU0Q5IGEotE8z2aCM83eN AnSg/QAB1UifMQ9GlcHj1YSK5Gcgq11rxrvvTJ6k= Received: from u-boot.org (unknown [174.51.25.52]) by mail.u-boot.org (Postfix) with ESMTPSA id 482806A834; Fri, 1 May 2026 05:02:18 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Fri, 1 May 2026 05:00:21 -0600 Message-ID: <20260501110040.1874719-30-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260501110040.1874719-1-sjg@u-boot.org> References: <20260501110040.1874719-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: D2RWEJDNWT3DTOXZPQM45XSLOSG74R6I X-Message-ID-Hash: D2RWEJDNWT3DTOXZPQM45XSLOSG74R6I 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 29/29] patman: Document review behaviours added in this series 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 Several review-related improvements have landed without corresponding documentation: - 'series info' is now colour-coded by patchwork state, and its '-r' flag accepts an optional list of patch numbers to limit the review text it prints. - 'series gather' (and 'gather-all') print a notice when every patch in the gathered version has reached state 'accepted', confirming upstream landing without a separate query. - The review apply step stashes the working tree -- including untracked files -- before checking out the review branch and restores it on exit, so build artefacts from the current branch don't leak in. - A partial or interrupted apply aborts with a clear message and rolls back the database row, rather than letting the review run against an incomplete series. Add short paragraphs covering each of these in the right place (``series info`` description, ``How the review works`` apply step, and the ``series gather`` walk-through). Signed-off-by: Simon Glass --- tools/patman/patman.rst | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst index aba6d8905fb..39fc04deec8 100644 --- a/tools/patman/patman.rst +++ b/tools/patman/patman.rst @@ -759,7 +759,10 @@ Here is a short overview of the available subcommands: info Show detailed information about a series, including each version's link, description, patches and any stored reviews. - Use ``-r`` to include review text. + The output is colour-coded by patchwork state (e.g. ``new``, + ``accepted``). Use ``-r`` to include review text; pass a list + of patch numbers (``-r 1 3``) to limit the review text to those + patches. ls Lists the series in the database. Use ``-r`` to show only @@ -895,6 +898,10 @@ To gather tags (Reviewed-by ...) for your series from patchwork:: patman series gather +If every patch in the gathered version has reached state ``accepted``, +patman prints a notice that the series has been applied upstream. The +same check runs for ``patman series gather-all``. + Now you can check your progress:: patman series progress @@ -1339,6 +1346,21 @@ excluded from refinement to preserve their quoted commit messages. A mechanical cleanup step also runs to remove backticks and fix function quoting style (e.g. ``malloc()`` not ```malloc```). +Apply step +~~~~~~~~~~ + +Before checking out the review branch, patman stashes any uncommitted +changes -- including untracked files -- so build artefacts on the +current branch don't leak into the review. The original branch and +stash are restored at the end of the run, including on failure. + +If the apply agent finishes but the resulting branch holds fewer +commits than the series cover letter advertises, patman aborts with a +message of the form ``Only N of M patches applied to ; +aborting. Fix the conflicts manually and retry.`` The database row +for the new version is rolled back so a retry starts from a clean +state. + Patchwork subcommands ---------------------