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 7729 invoked from network); 27 Jan 2022 17:59:02 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 27 Jan 2022 17:59:02 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1643306342; b=H7gGDtOUYsVtDid0JdqRq3EeUhwAgWQJj9s8J8d3a6iUoMHGOZhUXw5vLkauEnFlbCg5HdLdHi KUKfGQkituqslK397pkATr8l4CoM7pTwrCuQPTFXTBSLXD/JeuFgsGDKZXgm/l//5VKX3oI4/C YB7VYu57itxX9OKse3rStH1NKOzTtiBUStJMQwrGc6IvM2PXBnp/HodKLwyL30EqNOJ6KbJ2BG tU2PlTnVojra20cQSQoAJSoVpiJwrlcOC9JbWuFy6wQqpDgxDvg1af30R9ygXpSPKo5qi6j6Lg elG4QIiZdeQB70AzPE3GTmzoSvRTz/NEZXBzdJ6ibRGuxw==; 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=1643306342; bh=/HZePJBEw26vzAoFLAVKDlJ4x4n5Rt2LEY7bPO27REw=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:Cc:To:From:DKIM-Signature:DKIM-Signature:DKIM-Signature; b=aTHlBAHSN9te18Nshjy9YMU5SE9gZy3cPqpR5Eoh7t4bVZCEOqKh/c9hYx369q9NZWniUl2lxY mkn5Y074jJDbYju8mYU2bzOOzNLqU3SJfzEuNh5zcGZvVZXX+Zn+JBjrIFdO3fa7hB2bFCXrZn GJaeOg4AK3Ldxyp+zN+7sqM4ocN5/UWXiqoWEBSbaU+81gsDxXJbsvqNzWKaJbYmbOG0RsqQtu c6coe7iv4R98ABUGFigrNVUzWCk5nRSutDjhK1dOUrCssa5sNVZm8QZYhAHo7nkWhqfecSCs7B 2A3AKptYCgFgb43DbFWK3ZQK1pJNhtQ9aCPxUHge3o8Z5w==; 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:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=9W8PHHME6yzpKqV3pogASdFbQ5X7bZWBeV7ny9trRUA=; b=lMvwzIITWq8U846hfv3bjkePSu Qt1tW9vaaJOMsHvcSC2Yx5XPbjrOiLp8ZEfUrxTULSYRIwoEl1rcNQwhOQ+99ywdoOOqdejcbcDDH 4BhpJmczvcJ3QZ/4+Uv6iBYguutObL2dJbrxHYFT1l1q+Lrz39z5Q/+fy+x1veAq9S1lxvYViX+xR QI+pNdp2n/pS3nflOJYdS1e8nECakSxEk69IbxtwImylJJcrLezD6izL0y3azJoTEskLvZD7u+DC1 1uyINkuNvBP9RNaHZRYoABVDVg0FdDZnVhUMmjffkWWyx1Qg3FpEthVkkPgsBlfwvy0D2DVy6sLIN TYdsyXAA==; Received: from authenticated user by zero.zsh.org with local id 1nD92y-000BGb-BT; Thu, 27 Jan 2022 17:59:00 +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]:60169) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1nD92L-000AlC-7r; Thu, 27 Jan 2022 17:58:22 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E9F995C0264; Thu, 27 Jan 2022 12:58:19 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 27 Jan 2022 12:58:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to; s=fm2; bh=9W8PHHME6yzpKqV3pogASdFbQ5X7bZ WBeV7ny9trRUA=; b=WksEq0bwKWELb6fpSWLNd5PhHDkXcueYq+5Vto4QtTML4b YghJ73i3brCFiRoaQRrM5BHZyjgVwxRofQgBcQnW9UkXFQhMs/KsVBqysprO92Mw PPUAkoelO8iCMnT0SvES8mhGv5RtZRU8YMmZNQPI2oHgOXcEGVKDd1loW8/mDbR5 S0VqjHcxqQ3vkbnY6hfWwcYYliqW359PNANXg0p9jMVOXfW+nmlcQv+kKKc6mPuE 4uCaTbeb5aeJ+siJXaWAz1ZGbDDYMfisFDlUm/EkoWwBi8m37zME5qc/sRg5/poC EcxUg73MZgxaLjgiG58MOEzNmciYWUOok73V2gDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version: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=9W8PHHME6yzpKqV3pogASdFbQ5X7b ZWBeV7ny9trRUA=; b=JxvmPmFo3dfu6hhNnh5yaUS08TUaJQCjBwHQzac3gPUZE 2oDeJp/pdRnUSFyiH5v4bRFazqkZOEE6TmTW7LTkQ/sTugYyXFGAidi4njG/nr7+ Tdlw7kN5C/YbEUdnjJYA/enlcJa2ZqMqxMhKkt/46H00rbDSnU3cq49S4rh6UueG ISumWheFHFOTkB2h+oHkLm9oRtmOEwVcACr4Wm2bEzzFtgX7f741E1wGT1uhteKK rnAMktg8D6EBV5tSlKYrr7jmV/PQrYdT7uhcxsxvb7qdCk441YweDgSxWvnVp87V LI1VkeWUo82/KD69N67D+mNT0t7ztHhMKydajK2EA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrfeefgddutdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdektddtre dttdenucfhrhhomhepffgrnhhivghlucfuhhgrhhgrfhcuoegurdhssegurghnihgvlhdr shhhrghhrghfrdhnrghmvgeqnecuggftrfgrthhtvghrnhepfffhgeettdeukeeuhfduvd ejveeftdekteejtedvhffhgeekvefgvedtleffgeefnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepugdrshesuggrnhhivghlrdhshhgrhhgrfh drnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 27 Jan 2022 12:58:19 -0500 (EST) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4Jl7c80323z4gb; Thu, 27 Jan 2022 17:58:15 +0000 (UTC) From: Daniel Shahaf To: zsh-workers@zsh.org Cc: Marc Finet Subject: [PATCH 1/2] vcs_info quilt: Refactor for readability. No functional change. Date: Thu, 27 Jan 2022 17:58:13 +0000 Message-Id: <20220127175814.10179-1-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 49722 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: --- Functions/VCS_Info/VCS_INFO_quilt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt index 06feb4cce..22212171a 100644 --- a/Functions/VCS_Info/VCS_INFO_quilt +++ b/Functions/VCS_Info/VCS_INFO_quilt @@ -92,7 +92,7 @@ function VCS_INFO_quilt-patch2subject() { emulate -L zsh setopt extendedglob local mode="$1" - local patches pc tmp qstring root + local patches pc qstring root local -i ret local context local -a applied unapplied applied_string unapplied_string quiltcommand quilt_env @@ -135,12 +135,13 @@ function VCS_INFO_quilt-patch2subject() { zstyle -s "${context}" quiltcommand quiltcommand || quiltcommand='quilt' if [ -z "$patches" ]; then zstyle -s "${context}" quilt-patch-dir patches || patches="${QUILT_PATCHES}" + : ${patches:="patches"} if [[ "${patches}" != /* ]]; then - tmp=${patches:-patches} - VCS_INFO_quilt-dirfind "${tmp}" - ret=$? patches=$REPLY - (( ret )) && return ${ret} - patches=${patches}/${tmp} + if VCS_INFO_quilt-dirfind "${patches}"; then + patches="$REPLY/${patches}" + else + return $? + fi else [[ -d ${patches} ]] || return 1 fi