From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?K=C3=A9vin?= Le Gouguec Newsgroups: gmane.emacs.bugs Subject: bug#68183: 28.3; vc-dir fails when I have a certain branch checked out Date: Wed, 21 Aug 2024 09:05:50 +0200 Message-ID: <86wmkaqrsh.fsf@kevinlegouguec.net> References: <8734vici68.fsf@tromey.com> <83y1da17zw.fsf@gnu.org> <87y1dab03x.fsf@tromey.com> <87h6jun400.fsf@gmail.com> <878r3q2jfx.fsf@gmail.com> <877cj6izv7.fsf@gmail.com> <87zfuyrrfz.fsf@gmail.com> <283baeb9-d427-45a3-92d5-5e6c095b87ad@gutov.dev> <87ttl43f2x.fsf@gmail.com> <06a946b4-b06a-4e10-93d5-b6d6b8bd9fcf@gutov.dev> <87h6bwqujo.fsf@gmail.com> <9446a412-5221-4466-b7e8-937957fd82f2@gutov.dev> <877ccbhg8m.fsf@gmail.com> <87msl6tzyz.fsf@melete.silentflame.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6201"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Cc: Dmitry Gutov , Eli Zaretskii , 68183@debbugs.gnu.org, Tom Tromey , Juri Linkov To: Sean Whitton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Aug 21 09:08:46 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sgfSX-0001RC-30 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 21 Aug 2024 09:08:45 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgfSE-0007Un-NI; Wed, 21 Aug 2024 03:08:27 -0400 Original-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 1sgfS6-0007UT-JG for bug-gnu-emacs@gnu.org; Wed, 21 Aug 2024 03:08:19 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sgfS6-0001IW-5t for bug-gnu-emacs@gnu.org; Wed, 21 Aug 2024 03:08:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:In-Reply-To:Date:References:From:To:Subject; bh=uUfAH+qkuwG1EG7KgVBu/w5hrAb6Bxa0jOuiptRV0yA=; b=jdxSwkPHKfaqbu6AcKNohOJOSslxOxjMBFMdtv8SJU9AYBdIgFYQBceEJO5AcuWrHEFJvZ1rcodOBVrBrNb6Vbwn3v2U/NMRDv/gFSJkj6x65/QO9vVKb/ZSVyWPC/HAAOOXUrlmJMslpPJdkvk64YMURJiLwGzS6Y+AJkoJ+M5pL7W92PPU8tPd2HSsWmGq0oVMECVvlYWHeOYw8HLeSSyl111lKqa+lNyGjdRQQ2oiu3vEa59zOTUZyJRyJl2fIKdIYFd01uj2DFdkCsB3a8yaqNk6UvbPbUUG+O1GrWosvqM8zD/36lWkTeBOCse1/PKee3JB5M5FQGDQUOFPJg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sgfSn-000800-OC for bug-gnu-emacs@gnu.org; Wed, 21 Aug 2024 03:09:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?K=C3=A9vin?= Le Gouguec Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 21 Aug 2024 07:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68183 X-GNU-PR-Package: emacs Original-Received: via spool by 68183-submit@debbugs.gnu.org id=B68183.172422408930663 (code B ref 68183); Wed, 21 Aug 2024 07:09:01 +0000 Original-Received: (at 68183) by debbugs.gnu.org; 21 Aug 2024 07:08:09 +0000 Original-Received: from localhost ([127.0.0.1]:34776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgfRw-0007yU-RO for submit@debbugs.gnu.org; Wed, 21 Aug 2024 03:08:09 -0400 Original-Received: from mail-lj1-f177.google.com ([209.85.208.177]:41976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sgfRt-0007xr-8p for 68183@debbugs.gnu.org; Wed, 21 Aug 2024 03:08:06 -0400 Original-Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2f01db9f419so5784131fa.3 for <68183@debbugs.gnu.org>; Wed, 21 Aug 2024 00:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724223975; x=1724828775; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=uUfAH+qkuwG1EG7KgVBu/w5hrAb6Bxa0jOuiptRV0yA=; b=jnqqh6Uoulz96mJW9olYAr0qqYJhBNnwTHCBqP29OyysI18oe/UxYgpzux7+nty7KT 9eAlMbd/Cyp12xylGxNBXRoIOYA0R1VpCEAmeKzVBszPOQzDevFlzIgvocMQuLmjZP2S rq3L1sST1IzkcdDTJbxEXB/zJYI+xykjiEjr2SFLHYsKAHAyFAc6X93ySsc6mU+nN96/ qi+Cjl9K/fcKC2FYEucQv9Zoo7I8g8uI40EQyLG9DTANEHuz9eDLqP9yGtS/J6PJvefd 2eM0FHCpG/2FXU9N8OFiNwxNYqQofjkvTmMgnD7qOTe/CMxOAZZj9yWBlKiiW/YpGlgO WTxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724223975; x=1724828775; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=uUfAH+qkuwG1EG7KgVBu/w5hrAb6Bxa0jOuiptRV0yA=; b=JBsZPHAXXCmCBORI85wox2JuScxQ88ANFDSC3rmP8V0YNS7iKVFD9XDoB+PLGRyvW7 +yPbT2BQ7cJzRPeJtZ5l98Us6ivSFlPtPfNqX6lrIAczj/onwhMvvg99yaqZowPb4PRL AMcb19S+2A0mU2bMOg/EUb6hRYmQm5RQs1mxOz7tzmuyDrvcIYuWjZuPIRNlFkvBLTj2 07w5eI7CCqS7ReNj5YJ02ierFC5msxNXzZt+YI6W4y7v/O/N7BY4Bow2B521TV5Yz5/h d/cLxo5XV+P9nGq0R3fsKSfRBaLXQjQdrv4hw5y92a+YWCw/GnssZRrqjkRpWMLq6UVi YE7g== X-Forwarded-Encrypted: i=1; AJvYcCWuE5qSbJs732FhPdJLk3c/B3qxGmjRn/uU3GuHXhweKYSvaF+wA9+h6VQ+/HSv3+99Nsc4rA==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yz0kuYj9WsYArvIFQ8boQOaiOMB2iYNo39wpf9z08D2lhDQzNeu kWodOKrY0h2W2X4CEusSqCntc1kqqr/1WK0SoRKXn3Z49yiVCGln X-Google-Smtp-Source: AGHT+IFLY/lJd7WOvRuwUEBXF16lnW+e7Qq0cWP84fbabf+OZzGX9RwrCnlO5uvsFD5W8BCWjSwjTQ== X-Received: by 2002:a05:651c:221b:b0:2ef:315c:67e1 with SMTP id 38308e7fff4ca-2f3f89381camr5860871fa.4.1724223974497; Wed, 21 Aug 2024 00:06:14 -0700 (PDT) Original-Received: from kevinlegouguec.net (kevinlegouguec.net. [151.80.149.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a83838c6c12sm867708266b.14.2024.08.21.00.06.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 00:06:12 -0700 (PDT) In-Reply-To: <87msl6tzyz.fsf@melete.silentflame.com> (Sean Whitton's message of "Wed, 21 Aug 2024 09:40:52 +0800") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:290481 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Sean Whitton writes: > Hello, > > On Wed 21 Aug 2024 at 03:42am +03, Dmitry Gutov wrote: > >> NEWS for emacs-30 sounds good,=20 (ACK'ing Eli's request to submit here for review before pushing =F0=9F=91= =8C) >> and I've pushed the other two changes (te= sts >> and refactoring) to the master branch. (Thanks!) > Hang on, I think Kevin hadn't incorporated my requested changes into > that version :) (Right, I've been less reactive than ideal these past few days, apologies for that) > Kevin, could you provide a follow-up patch, please? Thanks. Something like the attached, right? Tested manually with a rebase. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Restore-vc-git-helper-function-bug-68183.patch >From beb4fd8874fb4c03ce2b8b789bcb7a4b7ee411b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Le=20Gouguec?= Date: Wed, 21 Aug 2024 08:45:00 +0200 Subject: [PATCH] Restore vc-git helper function (bug#68183) * lisp/vc/vc-git.el (vc-git--cmds-in-progress): Restore; it was removed in a previous refactoring patch, but we may still find some use for it. (vc-git-dir--in-progress-headers): Use it. --- lisp/vc/vc-git.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 4d631c7e032..dedf6fdd219 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -748,8 +748,8 @@ or an empty string if none." (and tracking (fmt "Tracking" tracking)) (and remote-url (fmt "Remote" remote-url))))))) -(defun vc-git-dir--in-progress-headers () - "Return headers for Git commands in progress in this worktree." +(defun vc-git--cmds-in-progress () + "Return a list of Git commands in progress in this worktree." (let ((gitdir (vc-git--git-path)) cmds) ;; See contrib/completion/git-prompt.sh in git.git. @@ -765,6 +765,11 @@ or an empty string if none." (push 'merge cmds)) (when (file-exists-p (expand-file-name "BISECT_START" gitdir)) (push 'bisect cmds)) + cmds)) + +(defun vc-git-dir--in-progress-headers () + "Return headers for Git commands in progress in this worktree." + (let ((cmds (vc-git--cmds-in-progress))) (cl-flet ((fmt (cmd name) (when (memq cmd cmds) ;; For now just a heading, key bindings can be added -- 2.39.2 --=-=-=--