From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 15367 invoked from network); 29 Jan 2022 16:24:31 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 29 Jan 2022 16:24:31 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1643473471; b=Tnz7QERM7Nr2jey0CrVrY524l5eqVQh5hI0ZLsUf9xzsLItJBldyRAVzrEhzu0Xf4Bz5eKOS7C NVOs0QNOoyaEQJiD/CGXu/Gf3zR9mOvDLSk6Uq9s9/YWLHx5UilTG9jrXJ0dbDkneBrCsIkxLv ukvj1BMOCd1Q5FNHgTMoFvru34KPdcFzd6mrc20Iyw0FCmFElC5zMmAH2kUQBHVkJTgA66hIJt IapYC+X+8J6FCnhjkhRIG2lA4e8oBLSYIO9xwPXHeeWdr8r7UwqdY7dIc2Jpe7G8NWjpkFoAWL 4dS/MIdyua5NcDQ2PFC4+Z5fbeoPgfArJErhMIly1f/bAA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (out2-smtp.messagingengine.com) smtp.remote-ip=66.111.4.26; dkim=pass header.d=daniel.shahaf.name header.s=fm2 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm1 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1643473471; bh=cUemBP5JBLMdiQVvx9UCFkWqMZmEkvItnLFBEMBt1QQ=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:DKIM-Signature:DKIM-Signature: DKIM-Signature; b=H5+fm72Bcab3pUoH9loxj2YFAqsefc2COcNJRBbdLp6Xgylr7tiDiM5khfGOZ8c7QKNzFJFluI 7WWJNpf2SJlmfZsx973e8fr6rn08W1jv+Y1OsyD/+HRyxLd48pmDOZBGuetSkh7FPS5hqQYktR c7V74mXCpX6SKKFPm1P0xaZL81nlWAhUe2Jlr7jkZGbu3acJ0apH7hxp2gOCmtjq09kqN03i53 vMZ51bpX8YlgoDxr3jU/09Yt7uSeFTc8AzLFiZH2Fa+b4xarb16C+y2maEUAK+getYjVl8shwk LiGhcVmbSvBIad6szQgd+DMxNgaXoMb0KbRTMfVjC3wxfg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=fz5Q+Hlcaxa5wN7bgHQCRr45zaiNIh6845nykQLna04=; b=oOfB0XFjQlDjlIMiNuvYGeb9ej 2iQY92sKA5BRHTlYFFk4T26O/z/BBfCJaN3jBf+io3AveT/LNsURK/8XO9smyJ+r4AxEprNI5g0Mw 2xy4WYNZtpprU0DZcTPhrcCfD0veyLhOPYQhpeo1hPt3Q2bTeBPQp1fscxUBpptEZaBxMlF3eJgNZ FfAqYTzH1CWspNP0ABt/V7G1EMNH0DWyFZ97D+UvqHi3D+TO6FGvI2buaizqKhJmBGVxCyOKihLQv 5RFZgktko2Py14FGkPQuJ2Yy+gXMM++rnHUV996Tq5bIixh05/sNAZItFX6IM0/iIPKMDlLomCFDr 1dWBMqTg==; Received: from authenticated user by zero.zsh.org with local id 1nDqWd-00069F-Mh; Sat, 29 Jan 2022 16:24:31 +0000 Authentication-Results: zsh.org; iprev=pass (out2-smtp.messagingengine.com) smtp.remote-ip=66.111.4.26; dkim=pass header.d=daniel.shahaf.name header.s=fm2 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm1 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from out2-smtp.messagingengine.com ([66.111.4.26]:60917) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1nDqNx-0004XY-2c; Sat, 29 Jan 2022 16:15:34 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 089EC5C0194; Sat, 29 Jan 2022 11:15:32 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 29 Jan 2022 11:15:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; bh=fz5 Q+Hlcaxa5wN7bgHQCRr45zaiNIh6845nykQLna04=; b=kJuZgRs9eyO0r6Wok3q Bsi42EJG0g9H2PCVVoo3ZFiIjj7Z3xJBL/Nx86Xfm37bjMHdyhUsD25UkVTfnpUW k0FSk690m9ChVxkN8azHQngjmB3jfJ9YkrZZ6fSjfQcWjWfLvi1A8OTdufMiw0pY TywW98hnMUTHlSgZH6egkVLzYYfdWp/JD6s1ct96UtiSunRthpNNL0vsjh/oPjPU MvZx++m4i3CyeeQz8lCVZGVrRKxmBSBkIIiTfJQ67Fg4wIWfNjRwqGhb4Q0mggpj 36lK+Tavva04jzvFiRQVaJDylZRBlfK2ScJLATd/2Sv4tLsCmC+JF5MgLCSk0teY 44w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=fz5Q+H lcaxa5wN7bgHQCRr45zaiNIh6845nykQLna04=; b=byz/kzX2KBRB/nXGRnWNPl x1mGpGUCkJs8mgnLkem0eV920N3DwZgQTjCsBgGxHgYZQ8asUo65JsghB2+QPDBu AeWK5mILP0Y4H88l/Hav0t/ays/C7xMRZDOGq82vO+GRUesOKuYb3GaHXDxhsN0i pWSkBdkEkZf0H9F8HhzEdJ0NY2SLVgtbQNjJMSDeTzD2yOELEK+0kMrSrPtgiUwL Yc0jSodEF4H0hI6xO7sWmra5jV/NEhOcuws8DFpRovFc6m7VhNlDXqzswYh6EhxQ Bjlr3dSEH7Taf7AsmRHEIPDy9tmCJBHGR7KIW3T7jtl4uhQ7BjpoMBBJlZYw9egw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrfeejgdekjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkedttd ertddtnecuhfhrohhmpeffrghnihgvlhcuufhhrghhrghfuceougdrshesuggrnhhivghl rdhshhgrhhgrfhdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetgffggfefueejgffgje ejjeelueejvefhveegledvgeeigeevuefgffejfeelteenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegurdhssegurghnihgvlhdrshhhrghhrg hfrdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 29 Jan 2022 11:15:31 -0500 (EST) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4JmKDd3QRGz4fZ; Sat, 29 Jan 2022 16:15:29 +0000 (UTC) From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 2/3] vcs_info hg mq: Don't include applied patches in the unapplied patches Date: Sat, 29 Jan 2022 16:15:26 +0000 Message-Id: <20220129161527.17303-2-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220129161527.17303-1-danielsh@tarpaulin.shahaf.local2> References: <20220129161527.17303-1-danielsh@tarpaulin.shahaf.local2> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 49728 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: For instance, with 4 applied patches, 5 unapplied patches, and no guards involved, the patch-format style would indicate 9 (= 4+5) unapplied patches and 4 applied patches. --- Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg index 0041a153c..d789d662a 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg @@ -183,6 +183,9 @@ if zstyle -T ":vcs_info:${vcs}:${usercontext}:${rrn}" get-mq \ # Skip commented lines [[ ${i_patch} == [[:space:]]#"#"* ]] && continue + # Skip applied patches + (( ${+mqpatches[(re)${i_patch}]} )) && continue + # Separate negative and positive guards to more easily find the # intersection of active guards with patch guards i_patchguards=( ${(s: :)i_patchguards} )