From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SGdlJ2RfQWVNUQEA9RJhRA:P1 (envelope-from ) for ; Tue, 31 Oct 2023 21:11:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SGdlJ2RfQWVNUQEA9RJhRA (envelope-from ) for ; Tue, 31 Oct 2023 21:11:16 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 803695F7C1 for ; Tue, 31 Oct 2023 21:11:16 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=planete-kraus.eu header.s=albinoniB header.b=i4zo9heB; dmarc=pass (policy=reject) header.from=planete-kraus.eu; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1698783076; a=rsa-sha256; cv=none; b=EdkdSUD1T3tvRGPG51+aNlwTYs1Qg/bf86Cqdi5O4WIR+lj7zi4n7bYPx6qkcacMJLlzIk lRtCB9iqlyT+Y4eo7RCVVL9oSsxTz6s62JBbk4ag2wGpYo1N9UIyQGyrH5a3p4MRXaEbbS XhRjoRPXPZ9DWNJuHYFF0WusMFzQAMtSgQYO+V3v9zToRMPgyrNuefV+NF2p0qzStuGVy8 0cGMjFjgb7K70KDJKAx6u02VpJ/pL5s/rcX7+3xsEc/nhnL/PiAfFy0D+d00FHX3+odBFH UlzMw0g4xWMWf1kpoa9NBE8phXtiFhfX+iYsVV97T/N3wR9/vR5Qixe1QAeTPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698783076; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:list-id: list-help:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=oPqKmK5GEkNxBbbxM/YzvOW5mtR1qjhWCFPUVAVD760=; b=NJBu9JvzTrx7V6ZvQGB7Wk2PUyQWF2IySdDd50O/aM/sPrG5C/BHvsfWVlo8+wDK6zVfOu 846Df3hxGjrdmbfI2mpuxgJSzMWruq5L4F8ckY/aIOinKNTX0Hs3cxzyb7D5CMy+77GQL5 RfltIznH3uRfogGVwwro4mAiTHhKY7xGBFQ77aPrje5WvB8fFblZH2fIFkVIZLOQdl2b1q ixu8qOpPRBrir9DjhwDgBdLaf3grdVaJ4Vt/SFvhqA+vC+nlQVM9VGHBW11se7B64O1JJg l1QS5D6wq1d9tc0agNLyfOPzRZZYvbub8t86y27gw9HPJBemIlouvSELhKtzbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=planete-kraus.eu header.s=albinoniB header.b=i4zo9heB; dmarc=pass (policy=reject) header.from=planete-kraus.eu; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxv4L-0005RC-Te; Tue, 31 Oct 2023 16:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxv4K-0005KG-KS for guix-devel@gnu.org; Tue, 31 Oct 2023 16:10:32 -0400 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1qxv4I-00029y-Lf for guix-devel@gnu.org; Tue, 31 Oct 2023 16:10:31 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 756f3c60; Tue, 31 Oct 2023 20:10:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:cc:mime-version; s=albinoniB; bh=xoO2LDhc7Y5UbKyXNHu+6VwJu1k=; b=i4zo9heBrm59mEukKZACRf/5PESL /TGJTyg6XUBkelbXFqftYo6QdGlXIZJSzqXLR3Jq/6UNG0WJV/jRHKoiUi/lP9Jt WI22G0LxhTuwtXaZXoioMmBkvahRWp5j1thcRBsvBvzrRagEtKNZRyA2y1mEUOPF I0P65098bOA4Vp5BzYnok3vIOSiDT5zgLI5a4luRPwxENb6bhUrOJRg8ubwHjhLS bE47QpkS2lOekiYrSwiXGPzbWYDrmjRX/WCqEyLSKeFueTiEFQqG0TypOf/Ec0St ha1WAycaVczGrMYYmcauJMRNPrG8ACNE3T3sQT/Zbf7d1Z+J1YxYbrm7yA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 50d36ae4 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 31 Oct 2023 20:10:24 +0000 (UTC) Message-ID: <560ddb89da85b85c75362739f42c39a215ea47a4.1698782989.git.vivien@planete-kraus.eu> From: Vivien Kraus Date: Tue, 31 Oct 2023 21:01:10 +0100 Subject: [PATCH qa-frontpage] Sort the patches before applying them to the git branch. To: guix-devel@gnu.org Cc: Christopher Baines MIME-Version: 1.0 User-Agent: Evolution 3.46.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -8.06 X-Migadu-Queue-Id: 803695F7C1 X-Migadu-Spam-Score: -8.06 X-TUID: 3xlsb0hE8V+T By default, the patches are not ordered. Because of the unreliability of e-mail delivery, they can be received completely out of order. Patchwork may also re-order them, and they may get ordered by commit author date (or, equivalently, e-mail Date header). Both possibilities lead to failure to apply patches if the order is incorrect for two patches that do not commute. The patch name contains a header: [bug#xxx,v12,i/n] where "i" is the variable part and indicates the patch number. Git pads "i" with zeros if needed. The string order of the names is thus the true commit order. * guix-qa-frontpage/manage-patch-branches.scm (create-branch-for-issue): Sort patches according to their "name". --- guix-qa-frontpage/manage-patch-branches.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix-qa-frontpage/manage-patch-branches.scm b/guix-qa-frontpage/manage-patch-branches.scm index a42f3a0..74d7b8b 100644 --- a/guix-qa-frontpage/manage-patch-branches.scm +++ b/guix-qa-frontpage/manage-patch-branches.scm @@ -243,8 +243,13 @@ (invoke-read-line "git" "show-ref" "--hash" base-tag))) (let loop ((patch-data - (vector->list - (assoc-ref patchwork-series "patches"))) + (stable-sort + (vector->list + (assoc-ref patchwork-series "patches")) + (lambda (patch-a patch-b) + (let ((name-a (assoc-ref patch-a "name")) + (name-b (assoc-ref patch-b "name"))) + (string