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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 17951 invoked from network); 29 Mar 2021 09:31:27 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 29 Mar 2021 09:31:27 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1617010287; b=JySdzrAZV847+OWtI4ELI3km6OSPNfvtDAKrcM2Wz6F93jCaMPuAhO6EulCpyZwMZMuVjIfTVV /mpP+qhg27vw+ayV7stCdGauTLtMt69OXuL/7je5jWY+IiC233aLUqRf53x13ZOLNW5yfLAphe nzCZ3C5qwdCAZIVw76n1sVGt4kZjJjtpRZKTiJHYw942KSWXaV7e+riRpxusPtqQclamLNocd1 5SB8P6oow8/Y2kJFH4ofwzsbY1v5AFug9JdtjAWoOiJu56rcsFu6GyNRYG+yCPSskM82CTwo0I Z1aREnEVQp344a/kAntvUnq/fG1DJ4WdUsF3x3IjSyB3EQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-pl1-f170.google.com) smtp.remote-ip=209.85.214.170; dkim=pass header.d=gmail.com header.s=20161025 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20200801; t=1617010287; bh=zctk7Ki99hpnjRwBVpM3RmGWDz0hV3kH2Idp7WNtEfk=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:DKIM-Signature:DKIM-Signature; b=Jcm402nZ4XMc9mCtTQ3QVt6mj6sCdWBkyHcgL78ZXuA9vrwm/affaIWhJxxLMj/VWxkYcqeiJi 6m7kz6f9ilOGhN7VoycuqpC6oXVVRKOO3UtNbS0ydUC6J1W9FSswEp7WrU8GdjZV+2w3Lk/5gl ZHZlCn3bgyoO2Sf0i9HDFpUlrHxXFdMSYcCmueREsr4q4RoPhx/yzUm4AScjPr8MncD/pa8Myy VwfxnaZwprzcBTS/gRYOvcg0KrG4/5XIzVGDwVzcH+IPwYYwZZJj4nO45U84mNasT4s1incnj4 qXnZ3hA+p46UTvFpLiH9nbzR3SkSj9tD9DUQF1PAPqRnLQ==; 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:In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=KO/N4Rr7tqj++zijLEnEDiU772642SrlFttB0UQXscM=; b=y65VrNmOzFajidIeaTXBqZCOtv RnTNG0YmN2XEmyHGU00yZ9VKK2z60YyJFFfyCzFHvYk86lxwML6OU+HKIKb6wdEhLBGVFcKVv6SBK xLpJp4HshEhwKa2W4NWnnWcoU+huItJwFLYa27leRn+zh99+1bxJXXMwnHVvA3gMEKuoboXWfiYe8 6RkO4hPM2Z1SJpVX5jsP7Yj0G/MFilKONwTgu84w8vKYG72c83lI9xqCzuqKRfOgGlw8ElGWBcYEA WKbFPAvjX+iF79P5PPQoTtTDpxG4o9YgWDJkAF6/Htt1hD3pB7Xic7UgWCcHnK61oWetjzlNAE4j0 rFiVgzoQ==; Received: from authenticated user by zero.zsh.org with local id 1lQoF2-000MVd-Fk; Mon, 29 Mar 2021 09:31:24 +0000 Authentication-Results: zsh.org; iprev=pass (mail-pl1-f170.google.com) smtp.remote-ip=209.85.214.170; dkim=pass header.d=gmail.com header.s=20161025 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-pl1-f170.google.com ([209.85.214.170]:38634) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1lQoEh-000MLw-0r; Mon, 29 Mar 2021 09:31:04 +0000 Received: by mail-pl1-f170.google.com with SMTP id y2so4113409plg.5 for ; Mon, 29 Mar 2021 02:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=KO/N4Rr7tqj++zijLEnEDiU772642SrlFttB0UQXscM=; b=DqSOZGbSlJdCo1E5D0idO++szkPiQeu7t+QveNLrC9mn7l2SzdF2Tx3KS+eXHeg7Lw 0mZmQOk88FJXNpfC8WbWtHe4EgJB+8WOkzGV40d6vKjLB9ZtNUHYpGnMYZqhCHBP3P+T pqP6rGkdO3r864dBJ9dbK7EcHkV3gH56BmF7ahxiYpdeEwdG7GEiOD17FYztLfqFqHel YFogmA71oNyoiwfnuvKs1aFsN6t/WzLUrfziITg5JvAa+rNGc/wjej/L+L4y6gOwfwFN WsTUyFKcleLpp+XIF/v/EvAYoli45QdpLgylFCB4HxwXHGlqa81N5WZuSI6C5kesrmxW PIcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=KO/N4Rr7tqj++zijLEnEDiU772642SrlFttB0UQXscM=; b=ov+cciQKnalRBwd6rKr/5xpQM9A0p949s6jDS/mFCVcFhyAiqLxRR9tIS0ARvjGJuc qdOkQMejKoFzlQiFKgNlS204gQGtlRdpSzebwA+NI6Lq8nZ9WpZiUVIkWyPUPmzz83+p NmECIEPqCzJdEcFa9By/eUnI5kefWD69kIOho/XnkzpRxmYXINyqckaqKclQ5bCnq6xX tT7CwQG1k4T8eSPGFw9hxPQgknAoUg933IG0rveJyqEsQ5J10jbwEnrpgWxw5QdBBJpR hu7Kf3on/uPRpJUdIzML95s+ogO7eSoXSSUKs1mwn2ex/pxHcFlGEnvvZ8A/aMV0845j PA7A== X-Gm-Message-State: AOAM532WIkQXpyjfP1CirXeXNEzoldo7Fwu6moL6WAC2eTCwaAfkQ8dj NssQf7eyExNd93UTReXoIy/quvTubeE= X-Google-Smtp-Source: ABdhPJxTp3QxTM1suXb48w//kRsoDDZEbYkmOQPMmzruVJayff2ECGcY1Tt+zv51qD6Kf9+nRELQDQ== X-Received: by 2002:a17:902:7d8d:b029:e6:4061:b767 with SMTP id a13-20020a1709027d8db02900e64061b767mr27682735plm.32.1617010261531; Mon, 29 Mar 2021 02:31:01 -0700 (PDT) Received: from home-guest ([61.6.235.67]) by smtp.gmail.com with ESMTPSA id d6sm16393372pfq.109.2021.03.29.02.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 02:31:00 -0700 (PDT) Date: Mon, 29 Mar 2021 17:30:56 +0800 From: Tim Lee To: Daniel Shahaf Cc: zsh-workers@zsh.org Subject: Re: [PATCH] Improve vcs_info example for ahead/behind git commits Message-ID: <20210329093056.fegqam75id4yfkiq@home-guest> References: <20210328213628.7rwz62bq5p2isd6b@home-guest> <20210329070611.GM18178@tarpaulin.shahaf.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210329070611.GM18178@tarpaulin.shahaf.local2> X-Seq: 48311 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: Archived-At: > > * Remove unnecessary use of `${hook_com[branch]}` because `@{upstream}` > > defaults to the current branch when no branch name is provided. > > `@{upstream}` was introduced in git 1.7.0 > > (https://github.com/git/git/commit/28fb84382b0eb728534dbe2972bbfec3f3d83dd9) > > I'm not sure that's unnecessary, for two reasons: > > 1. hook_com[branch], as opposed to hook_com[branch_orig], may have been > changed by a previous hook. > > 2. There may be educational value to demonstrating a use of > hook_com[branch], even if it's implied. > > WDYT? Okay. I was not aware of these reasons. I am still very much a beginner (both to zsh and to mailing lists ...). > > diff --git a/Misc/vcs_info-examples b/Misc/vcs_info-examples > > index 94b8a7b5e..36d4d3bf8 100644 > > --- a/Misc/vcs_info-examples > > +++ b/Misc/vcs_info-examples > > @@ -179,14 +179,18 @@ function +vi-git-st() { > > local ahead behind > > local -a gitstatus > > > > - # for git prior to 1.7 > > + # for git prior to 1.7.0 > > # ahead=$(git rev-list origin/${hook_com[branch]}..HEAD | wc -l) > > - ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l) > > + # for git 1.7.0 and 1.7.1 > > + # ahead=$(git rev-list @{upstream}..HEAD 2>/dev/null | wc -l) > > + ahead=$(git rev-list --count @{upstream}..HEAD 2>/dev/null) > > (( $ahead )) && gitstatus+=( "+${ahead}" ) > > The version of this function in my zshrc starts like this: > . > git rev-parse @{upstream} >/dev/null 2>&1 || return 0 > local -a x=( $(git rev-list --left-right --count HEAD...@{upstream} ) ) The snippet below displays N/M. How would you make it display +N/-M instead? git rev-parse @{upstream} >/dev/null 2>&1 || return 0 local -a x=( $(git rev-list --left-right --count HEAD...@{upstream} ) ) hook_com[misc]="${(j:/:)x}" > The first line is to handle a detached HEAD, I think, and should > presumably be added? Why not do this instead: local -a x=( $(git rev-list --left-right --count HEAD...@{upstream} 2>/dev/null ) ) --- Note: when replying to my email, please ensure that my email address is included in the 'To:' field, since I am not subscribed to the mailing list.