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.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 30904 invoked from network); 7 Apr 2021 21:51:38 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 7 Apr 2021 21:51:38 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1617832298; b=t5de91d3ZfxWnl5jHkdGvXyyOtU5lreBjhW3rnFiXNpUZMMFflNu1yqhKIyYNq0lgMmL3DlgBs H7+5zPVYjQOQxZpD4JSq32n0NuTH9JSQA5qXcL4WgWEl0B9JGPy7Nv3xXutJaJcavaVbkOZvYi xkPH2xJrn2ZZ02hChdAwVFSmsfxyuPvbqfb7EBHq9xZyhuch2kHV0JB/c4aOvjZHlq5mlWekOr US2IxyYZ2bLKfMROzsA8GNE82jcLRMDyIz9r8RlZMGj1q93YncuPQlBeKJxvGv7KqglBzSSRNQ 7NjD56S3dU8Qhwo/UYBdOu9bkXcXDNd06NIHzsRjvaq6Lw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (out5-smtp.messagingengine.com) smtp.remote-ip=66.111.4.29; dkim=pass header.d=daniel.shahaf.name header.s=fm3 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 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-20200801; t=1617832298; bh=P1BoKq6HS8gNZlrcRKdFC+isHWzALBGk8q96yAJIX1M=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:MIME-Version:Message-ID:Subject:To:From:Date: DKIM-Signature:DKIM-Signature:DKIM-Signature; b=uwHTj1n27gxQ/kkBqOguBUZPVw6p6EOPRZ332LHjrOWGDs4KRT7RoGlIYJrxhPD1Etg165ryes vJnXxe5/j827UfnhRzu3VEb70ko7GyIqSadiIQdr+P7VmLxJcdJe1lGHBxE+9QszTClQKKXoDr iX4OnKZc2lpZcW4SQiT1kro+ntddgBlYLQPCuiZGTIBCVywGjxERy9kccI4WRNjMbal6OfhBbs e8G28OUe8EZD58s6x04tmwqK3Ud9gYKY1TRGFrqXrm791svQjMJTuZUpW5GOH1KgyhdEuEmvjw S0PlPBVfrqWY1VFxIe1leyujynqPfvMXnA2ZDpDea5C5Ow==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:MIME-Version:Message-ID: Subject:To:From:Date:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=E1xl1s44XN2/TpdFx8Yk44h6MicjKhyCI8DYwOMTHI8=; b=X1KyZ6q5qacuGn3PfMw8sFIv1h SA6nvfk/H/QC/PC/Mro5gMW0fAgHgm30zPa99NOlDugEze84zFmD3lwiYgyTubUEfGmDL8pw6/Iyj SSveLhkVA/Lx7DT3FPVzRt+Nncfqr8CLnPArGzwPzOnXY2FSdFzwAiO/rvdhsbE59FM1hEEGDg+Kg n5Yg6HrnR940jxXw+PIk/4O7FIGceUfUfhkQAc2YINA9uQCR2Qzbqfpd49WZNPfUr6QKYHNYkFbxf ++CQgv1WsOvnJGh7gdRtD1zZszoL6y6mORJ5seKFfPsZX0w4rGt7QV9wF37GoPgbrjpLrJE6SiLZQ 4UFGT4dA==; Received: from authenticated user by zero.zsh.org with local id 1lUG5H-000MXE-4P; Wed, 07 Apr 2021 21:51:35 +0000 Authentication-Results: zsh.org; iprev=pass (out5-smtp.messagingengine.com) smtp.remote-ip=66.111.4.29; dkim=pass header.d=daniel.shahaf.name header.s=fm3 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from out5-smtp.messagingengine.com ([66.111.4.29]:59587) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1lUG2v-000Lu4-U1; Wed, 07 Apr 2021 21:49:11 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id D7C2A5C00C5; Wed, 7 Apr 2021 17:48:51 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 07 Apr 2021 17:48:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:to:subject:message-id :mime-version:content-type; s=fm3; bh=E1xl1s44XN2/TpdFx8Yk44h6Mi cjKhyCI8DYwOMTHI8=; b=WYj9UOwp6HBFFPYEzgMa2epBZ67NYNcpwhe1KZt2aw d9sz2+fZeHspBNIlzMQ2hVADf4p1FVX7e54D8XyfZ7KbOWq9CbzfR/Zhjcre5msb gLHNBmmIR7wPmvwg6ATnRlN+eCxrBv5RqHsb67n6/u0bH+9NZAfqCbWsJRfNd5rL D7t5E6JeaSx1a5EPIVfBYQ5hfPlMqAF3BRwPsmHXghc+PhcIUYDTngjTmC4qAyMe fsVfFrQQ72Rd1Kc0k7GBNnxH8azB3CRTFWnVrwLJKL9iByO83I+xaDqWvR3OVQLR w+cGf5DLo7e56X7dQaCT5k2nJ0Pg8XfhkSYejeBezQ6g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=E1xl1s44XN2/TpdFx8Yk44h6MicjK hyCI8DYwOMTHI8=; b=C2lik+KG9Af67uk24BjoM9bSzstlcLQUfLj1iUvaHp0dG DoW775KlfSyFGpuM3Q+I8hZ+LLb6zqd1het6+giuZYKmeeXv3eE7asaU/g9pjtuN cWNvk4BbTYM4xHtBVR6VZo5eOWHWchGuY6OhFU4+muE6bkyB8WzW1FiJdiLeagkn PFGHQbUTRIGv1iiztKvtXWi7zclWH1zL3BoiRvfE6EF0eE4RRTzEMB32FJwHIVPN L1BMZZpx8vP/3V9yjFMksew+LsxuqMXaV8N/q1d8AS4/R9gxw/rqMLznsInfXSdv RzcFTBpR3RvRl9Am/xMv7+4HwUdWXlLIuzfGfFliQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejkedgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgogfeguddtqddvjeculdegtddmnecujfgurhepff fhvffukfggtggufgesthdttddttdervdenucfhrhhomhepffgrnhhivghlucfuhhgrhhgr fhcuoegurdhssegurghnihgvlhdrshhhrghhrghfrdhnrghmvgeqnecuggftrfgrthhtvg hrnheptdetffdugefhvdeigefhkedugfduhffhgfdttefgieejudekvdduvefgudfgfeef necukfhppeejledrudekvddrfeeirddukedunecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepugdrshesuggrnhhivghlrdhshhgrhhgrfhdrnhgr mhgv X-ME-Proxy: Received: from tarpaulin.shahaf.local2 (bzq-79-182-36-181.red.bezeqint.net [79.182.36.181]) by mail.messagingengine.com (Postfix) with ESMTPA id 7466E1080057 for ; Wed, 7 Apr 2021 17:48:51 -0400 (EDT) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4FFyhJ1x0fzYd; Wed, 7 Apr 2021 21:48:48 +0000 (UTC) Date: Wed, 7 Apr 2021 21:48:48 +0000 From: Daniel Shahaf To: zsh-users@zsh.org Subject: [PATCH] vcs_info hg: Compute the branch name correctly when get-revision is set and check-for-changes is not Message-ID: <20210407214848.GA21212@tarpaulin.shahaf.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Seq: 26635 Archived-At: X-Loop: zsh-users@zsh.org Errors-To: zsh-users-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-users-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: --- In the following, lines 10, 12, 14 state different branch names: 1 % hg init 2 % echo foo > foo 3 % hg add foo 4 % hg commit -m add 5 % 6 % autoload vcs_info 7 % precmd() { vcs_info; print -ParC1 -- $vcs_info_msg_0_ } 8 (hg)-[default]- 9 % hg branch newbranch > /dev/null 10 (hg)-[newbranch]- 11 % zstyle \* get-revision yes 12 (hg)-[default:326db25708c0:0]- 13 % zstyle \* check-for-changes yes 14 (hg)-[newbranch:326db25708c0:0]- Seen with mercurial 4.8.2-1+deb10u1 and 5.6.1-2 (Debian stable and unstable, respectively). When get-revision is set, VCS_INFO_get_data_hg runs one of the following commands, depending on whether check-for-changes is also set: % hg id -inb 326db25708c0 0 newbranch % hg id -inbr. 326db25708c0 0 default The following patch seems to work. The branch name is then retrieved from .hg/branch (which in workers/46016 was implied to be safe to use). Reviews would be welcome. Cheers, Daniel diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg index f7e9d6f45..c3ee409d3 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg @@ -49,7 +49,7 @@ if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then # Settling for a short (but unique!) hash because getting the full # 40-char hash in addition to all the other info we want isn't # available in a single hg invocation - hgid_args=( id -i -n -b ) + hgid_args=( id -i -n ) # Looking for changes is a tad bit slower since the dirstate cache must # first be refreshed before being read @@ -58,7 +58,7 @@ if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then local HGPLAIN HGPLAIN=1 ${vcs_comm[cmd]} ${(z)hgid_args} 2> /dev/null \ - | read -r r_csetid r_lrev r_branch + | read -r r_csetid r_lrev fi fi