From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 05 03:02:58 2023 Received: (at submit) by debbugs.gnu.org; 5 Jan 2023 08:02:58 +0000 Received: from localhost ([127.0.0.1]:50166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDLDG-0001yK-0i for submit@debbugs.gnu.org; Thu, 05 Jan 2023 03:02:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:47478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDLDE-0001yB-FQ for submit@debbugs.gnu.org; Thu, 05 Jan 2023 03:02:56 -0500 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 1pDLDE-0006CY-Ak for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2023 03:02:56 -0500 Received: from relay6-d.mail.gandi.net ([2001:4b98:dc4:8::226]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDLDC-0005QF-KB for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2023 03:02:56 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 0EFB2C0011 for ; Thu, 5 Jan 2023 08:02:47 +0000 (UTC) From: Juri Linkov To: bug-gnu-emacs@gnu.org Subject: 29.0.60; vc-pull-and-push unsupported on non-git vcs Organization: LINKOV.NET Date: Thu, 05 Jan 2023 09:58:00 +0200 Message-ID: <864jt58l8f.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2001:4b98:dc4:8::226; envelope-from=juri@linkov.net; helo=relay6-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Isn't it so that as a general rule we don't add a vc command when it's not supported by more than 1 backend? It seems fine to add a git-specific 'vc-git-pull-and-push', but why to add 'vc-pull-and-push' supported only by git? It's more strange that the docstring of 'vc-pull-and-push' says: "It also signals an error in a Bazaar bound branch." whereas in fact it's not implemented for Bazaar at all. From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 18 12:42:06 2023 Received: (at 60569) by debbugs.gnu.org; 18 Jan 2023 17:42:07 +0000 Received: from localhost ([127.0.0.1]:41738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pICRq-0000D9-IK for submit@debbugs.gnu.org; Wed, 18 Jan 2023 12:42:06 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:53253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pICRl-0000Bv-Uk for 60569@debbugs.gnu.org; Wed, 18 Jan 2023 12:42:02 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 0697E60004 for <60569@debbugs.gnu.org>; Wed, 18 Jan 2023 17:41:55 +0000 (UTC) From: Juri Linkov To: 60569@debbugs.gnu.org Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs In-Reply-To: <864jt58l8f.fsf@mail.linkov.net> (Juri Linkov's message of "Thu, 05 Jan 2023 09:58:00 +0200") Organization: LINKOV.NET References: <864jt58l8f.fsf@mail.linkov.net> Date: Wed, 18 Jan 2023 19:39:46 +0200 Message-ID: <861qnr4yet.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 60569 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain > Isn't it so that as a general rule we don't add a vc command > when it's not supported by more than 1 backend? > > It seems fine to add a git-specific 'vc-git-pull-and-push', > but why to add 'vc-pull-and-push' supported only by git? > > It's more strange that the docstring of 'vc-pull-and-push' says: > > "It also signals an error in a Bazaar bound branch." > > whereas in fact it's not implemented for Bazaar at all. We can't release this with such uncalled api changes. So here is the fix: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=vc-pull-and-push.patch diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 412598d084c..ef93edd1616 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1303,25 +1303,6 @@ vc-git-push for the Git command to run." (vc-git--pushpull "push" prompt nil)) -(defun vc-git-pull-and-push (prompt) - "Pull changes into the current Git branch, and then push. -The push will only be performed if the pull was successful. - -Normally, this runs \"git pull\". If PROMPT is non-nil, prompt -for the Git command to run." - (let ((proc (vc-git--pushpull "pull" prompt '("--stat")))) - (when (process-buffer proc) - (with-current-buffer (process-buffer proc) - (if (and (eq (process-status proc) 'exit) - (zerop (process-exit-status proc))) - (let ((vc--inhibit-async-window t)) - (vc-git-push nil)) - (vc-exec-after - (lambda () - (let ((vc--inhibit-async-window t)) - (vc-git-push nil))) - proc)))))) - (defun vc-git-merge-branch () "Merge changes into the current Git branch. This prompts for a branch to merge from." diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 13124509c27..0890b63d417 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -3071,9 +3071,20 @@ vc-pull-and-push (interactive "P") (let* ((vc-fileset (vc-deduce-fileset t)) (backend (car vc-fileset))) - (if (vc-find-backend-function backend 'pull-and-push) - (vc-call-backend backend 'pull-and-push arg) - (user-error "VC pull-and-push is unsupported for `%s'" backend)))) + (if (vc-find-backend-function backend 'pull) + (let ((proc (vc-call-backend backend 'pull arg))) + (when (and (processp proc) (process-buffer proc)) + (with-current-buffer (process-buffer proc) + (if (and (eq (process-status proc) 'exit) + (zerop (process-exit-status proc))) + (let ((vc--inhibit-async-window t)) + (vc-push arg)) + (vc-exec-after + (lambda () + (let ((vc--inhibit-async-window t)) + (vc-push arg))) + proc))))) + (user-error "VC pull is unsupported for `%s'" backend)))) (defun vc-version-backup-file (file &optional rev) "Return name of backup file for revision REV of FILE. --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 19 23:03:04 2023 Received: (at 60569) by debbugs.gnu.org; 20 Jan 2023 04:03:04 +0000 Received: from localhost ([127.0.0.1]:45113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIicK-0002gf-Ep for submit@debbugs.gnu.org; Thu, 19 Jan 2023 23:03:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIicI-0002gB-74 for 60569@debbugs.gnu.org; Thu, 19 Jan 2023 23:03:03 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIicC-0006qD-Mm; Thu, 19 Jan 2023 23:02:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=Date:References:Subject:In-Reply-To:To:From: mime-version; bh=rSf1w9EokrKyuCEZABjLjbLyqYdeRDiQ9R+qUmxs4cw=; b=Bk8XyO3uraYx Y/ZEz7S2AoA+zAjdDtfZtVMEXBwNgRmLYfM3EX8jwxhExFsEkceKI3cBOVzKP7GR2zL54cFbjZCb0 Ts1u7DELvVsz1l1aFlBGJRG7CCJsFPqCVE3gLMm0sg0EM0xUL1TEAWb1agtiHqV149TYcwI/p2Mac lweDitABg7ik8fxw4RPFIwgbzXPd5K9g1y7lgPsk5CIqhq9pQ1eVek95adp/rKWP5HkOg73Oqk0Gp lhiaiIj0uOwGMbTyGljepY2XgwerSCkurV6Ab31N0Y0ll9d4Oq47c1sjOKfvbnSgk+3C63+WCUq6g pXzDYZqIN3eYPz2fcgaLdQ==; Received: from rms by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1pIicC-0002j4-F5; Thu, 19 Jan 2023 23:02:56 -0500 Content-Type: text/plain; charset=Utf-8 From: Richard Stallman To: Juri Linkov In-Reply-To: <861qnr4yet.fsf@mail.linkov.net> (message from Juri Linkov on Wed, 18 Jan 2023 19:39:46 +0200) Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs References: <864jt58l8f.fsf@mail.linkov.net> <861qnr4yet.fsf@mail.linkov.net> Message-Id: Date: Thu, 19 Jan 2023 23:02:56 -0500 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 60569 Cc: 60569@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: rms@gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] Thanks for keeping VC generic. -- Dr Richard Stallman (https://stallman.org) Chief GNUisance of the GNU Project (https://gnu.org) Founder, Free Software Foundation (https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org) From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 21 21:25:49 2023 Received: (at 60569) by debbugs.gnu.org; 22 Jan 2023 02:25:49 +0000 Received: from localhost ([127.0.0.1]:50183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJQ3I-00030j-R3 for submit@debbugs.gnu.org; Sat, 21 Jan 2023 21:25:49 -0500 Received: from mail-wm1-f47.google.com ([209.85.128.47]:46058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJQ3H-00030X-8v for 60569@debbugs.gnu.org; Sat, 21 Jan 2023 21:25:47 -0500 Received: by mail-wm1-f47.google.com with SMTP id o17-20020a05600c511100b003db021ef437so6220896wms.4 for <60569@debbugs.gnu.org>; Sat, 21 Jan 2023 18:25:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=qoKr2Qj12TmeMNdcopoAusRKzS/A92ht22k9iJ2SrBg=; b=V9kULszRUaRY85FzZQD/24JrfznU8M3MwtotXEl3inNLtC2OlfrVRQjqwhjeexhk30 fiCHXCMtMp2mEKMdtdIEgyCYCUrwBYG14Zm1dF2XMUJ1QTHxHKcnM63H5GpXoNiHUWyM +iFk49K1zDdJzIueFeS4PhhQcsSmABccgP6P0K4ZmPzv+PFDNkD8e6uxVJarmA7PsO1x SEqlDrw8x/4Nf5u/TKzfEAy3ata6p6La64oD5ZChmFRuyetpsVLSkMbMvsIKy9lzDPrZ ub6BOCwmPFvPov4QOqSD5sBoxV1njtT0aj/0R4TmCCfcAoGPVDCEQ+nTb5mzEiWfEmKr Jszw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qoKr2Qj12TmeMNdcopoAusRKzS/A92ht22k9iJ2SrBg=; b=VS6AloYp5o+/RQyGIgNM/1sot0X6IH1iC1FGRlJpd4bTTONjBUU2sonG1RzZqv/mkh y7QH2Vkb5GsK/iXIvzeaGG6kUcut6hrSq5E1sA/45fgAmuFf1wcgJ5fVH0BjevacCpCX WsQLbo6ixoBToQzWmQqLubii11ieBpOmIJiaTciWdL/1hl4AfzKFyu59mSVLIKY5SFnX xpAYm2EEJE7PBc1OQ81tWm/OdQhgtCPKamnXYu7wOGPKIW2WNc1pTwSiEZNDPhFpwGW1 bcf9Iy5yxgYCifjOCRoGGjsEwA3ZVM8VaNrRYSivgnO9yG5FzdjanjxTxrKZ5q0YSw3t hOpA== X-Gm-Message-State: AFqh2kqKACg5haVE9srqhYibt32tIPXwoBQPjr8SZpdRc0yLAQS37Ox2 PWBWUjvTWeiAIwOKPzH+OXA= X-Google-Smtp-Source: AMrXdXvVp7KQ9udLuUcZeYlfPQ0sCJ0siF8P/1Uh2Ls2t2GyonUucysT1oc409yElyCf2yKHDztuKQ== X-Received: by 2002:a05:600c:1609:b0:3db:12a:5e65 with SMTP id m9-20020a05600c160900b003db012a5e65mr18808413wmn.4.1674354341357; Sat, 21 Jan 2023 18:25:41 -0800 (PST) Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id o18-20020adf8b92000000b002365730eae8sm1457637wra.55.2023.01.21.18.25.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Jan 2023 18:25:40 -0800 (PST) Message-ID: <5ae58a89-face-647d-d849-6dfb7e1d2831@yandex.ru> Date: Sun, 22 Jan 2023 04:25:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs Content-Language: en-US To: Juri Linkov , 60569@debbugs.gnu.org References: <864jt58l8f.fsf@mail.linkov.net> <861qnr4yet.fsf@mail.linkov.net> From: Dmitry Gutov In-Reply-To: <861qnr4yet.fsf@mail.linkov.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.9 (/) X-Debbugs-Envelope-To: 60569 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.9 (-) On 18/01/2023 19:39, Juri Linkov wrote: > We can't release this with such uncalled api changes. > So here is the fix: This indeed looks much better, thank you. From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 22 12:29:02 2023 Received: (at 60569) by debbugs.gnu.org; 22 Jan 2023 17:29:03 +0000 Received: from localhost ([127.0.0.1]:52586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJe9O-0005wb-Ml for submit@debbugs.gnu.org; Sun, 22 Jan 2023 12:29:02 -0500 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:35303) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJe9J-0005vv-PK; Sun, 22 Jan 2023 12:29:01 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id AAC721BF206; Sun, 22 Jan 2023 17:28:48 +0000 (UTC) From: Juri Linkov To: Dmitry Gutov Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs In-Reply-To: <5ae58a89-face-647d-d849-6dfb7e1d2831@yandex.ru> (Dmitry Gutov's message of "Sun, 22 Jan 2023 04:25:39 +0200") Organization: LINKOV.NET References: <864jt58l8f.fsf@mail.linkov.net> <861qnr4yet.fsf@mail.linkov.net> <5ae58a89-face-647d-d849-6dfb7e1d2831@yandex.ru> Date: Sun, 22 Jan 2023 19:27:36 +0200 Message-ID: <86fsc24gzb.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 60569 Cc: 60569@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) close 60569 29.0.60 thanks >> We can't release this with such uncalled api changes. >> So here is the fix: > > This indeed looks much better, thank you. This is fixed now since it doesn't affect other vc commands. From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 22 12:29:18 2023 Received: (at 60569) by debbugs.gnu.org; 22 Jan 2023 17:29:18 +0000 Received: from localhost ([127.0.0.1]:52590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJe9e-0005xB-5E for submit@debbugs.gnu.org; Sun, 22 Jan 2023 12:29:18 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:60729) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJe9N-0005w4-Ho for 60569@debbugs.gnu.org; Sun, 22 Jan 2023 12:29:02 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id D676EFF803 for <60569@debbugs.gnu.org>; Sun, 22 Jan 2023 17:28:53 +0000 (UTC) From: Juri Linkov To: 60569@debbugs.gnu.org Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs In-Reply-To: (Richard Stallman's message of "Thu, 19 Jan 2023 23:02:56 -0500") Organization: LINKOV.NET References: <864jt58l8f.fsf@mail.linkov.net> <861qnr4yet.fsf@mail.linkov.net> Date: Sun, 22 Jan 2023 19:28:03 +0200 Message-ID: <86edrm4gyk.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 60569 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > Thanks for keeping VC generic. Here is a one-line patch that adds support for vc-bzr. Eli, is it ok to install this on the emacs-29 branch? I briefly tested it on bzr, so it should be quite safe. diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 6443f6d57aa..404800cb208 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -381,7 +381,8 @@ vc-bzr--pushpull (setq-local compile-command (concat vc-bzr-program " " command " " (if args (mapconcat #'identity args " ") ""))))) - (vc-set-async-update buf)))) + (vc-set-async-update buf) + (get-buffer-process buf)))) (defun vc-bzr-pull (prompt) "Pull changes into the current Bzr branch. From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 23 07:00:38 2023 Received: (at 60569) by debbugs.gnu.org; 23 Jan 2023 12:00:38 +0000 Received: from localhost ([127.0.0.1]:53495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJvV7-000274-O6 for submit@debbugs.gnu.org; Mon, 23 Jan 2023 07:00:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJvV5-00026o-A2 for 60569@debbugs.gnu.org; Mon, 23 Jan 2023 07:00:37 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJvUz-0000Q5-Gl; Mon, 23 Jan 2023 07:00:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=TSGoYt1UgT5OeGk9wtQhaEEBsOBogkMhuV7fcV3nwC4=; b=Qerq4kXOyMIp PpITFjcsoJphmmtPbfZCwB2dKjxTvTwbS1RYcF/Z0pxYtkJuk5a6UgjZB5m0/I3gZ4k8GsbmDsSBa W/hOHqkq+Ppf4fw0IvHaNQQZpqhch1orT5+vArJbRe5LqOXGX0z/oOzNxl+zi9livqxFZ6B7zEHl9 M/3UykMqrAV0bvOr/1tYmPAil4wjaPLx6I/8nyQYj+/JW8Sn4SfFnFayukVQZRImdGsg+Fc2g1rrx hTbc+B6gu5y0wV3Fv1tIp4ZA6GG+HbhaboIjwim0WVm/sX9L5G3RNTtk5tNyDYkW1nmjujHgVdfCI aWzShr8r6odiKqhLbJvZfQ==; Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJvUx-0005hB-5w; Mon, 23 Jan 2023 07:00:29 -0500 Date: Mon, 23 Jan 2023 14:00:34 +0200 Message-Id: <838rhtjw9p.fsf@gnu.org> From: Eli Zaretskii To: Juri Linkov In-Reply-To: <86edrm4gyk.fsf@mail.linkov.net> (message from Juri Linkov on Sun, 22 Jan 2023 19:28:03 +0200) Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs References: <864jt58l8f.fsf@mail.linkov.net> <861qnr4yet.fsf@mail.linkov.net> <86edrm4gyk.fsf@mail.linkov.net> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 60569 Cc: 60569@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Juri Linkov > Date: Sun, 22 Jan 2023 19:28:03 +0200 > > > Thanks for keeping VC generic. > > Here is a one-line patch that adds support for vc-bzr. > > Eli, is it ok to install this on the emacs-29 branch? > I briefly tested it on bzr, so it should be quite safe. > > diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el > index 6443f6d57aa..404800cb208 100644 > --- a/lisp/vc/vc-bzr.el > +++ b/lisp/vc/vc-bzr.el > @@ -381,7 +381,8 @@ vc-bzr--pushpull > (setq-local compile-command > (concat vc-bzr-program " " command " " > (if args (mapconcat #'identity args " ") ""))))) > - (vc-set-async-update buf)))) > + (vc-set-async-update buf) > + (get-buffer-process buf)))) Looks OK to me, but could you add some details regarding why this change is needed? Did we change our requirements from the return value of the pushpull method? Or did vc-set-async-update change its behavior and no longer returns the process object? Or something else? Thanks. From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 24 12:51:39 2023 Received: (at 60569) by debbugs.gnu.org; 24 Jan 2023 17:51:39 +0000 Received: from localhost ([127.0.0.1]:57513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKNSN-0003Da-5X for submit@debbugs.gnu.org; Tue, 24 Jan 2023 12:51:39 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:59097) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKNSK-0003DB-Sf for 60569@debbugs.gnu.org; Tue, 24 Jan 2023 12:51:37 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 13484240008; Tue, 24 Jan 2023 17:51:29 +0000 (UTC) From: Juri Linkov To: Eli Zaretskii Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs In-Reply-To: <838rhtjw9p.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 23 Jan 2023 14:00:34 +0200") Organization: LINKOV.NET References: <864jt58l8f.fsf@mail.linkov.net> <861qnr4yet.fsf@mail.linkov.net> <86edrm4gyk.fsf@mail.linkov.net> <838rhtjw9p.fsf@gnu.org> Date: Tue, 24 Jan 2023 19:49:24 +0200 Message-ID: <86sffzx1sj.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 60569 Cc: 60569@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) >> > Thanks for keeping VC generic. >> >> Here is a one-line patch that adds support for vc-bzr. >> >> diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el >> @@ -381,7 +381,8 @@ vc-bzr--pushpull >> (setq-local compile-command >> (concat vc-bzr-program " " command " " >> (if args (mapconcat #'identity args " ") ""))))) >> - (vc-set-async-update buf)))) >> + (vc-set-async-update buf) >> + (get-buffer-process buf)))) > > Looks OK to me, but could you add some details regarding why this > change is needed? Did we change our requirements from the return > value of the pushpull method? Yes, to support vc-pull-and-push now the backend should return the process for the pull operation. Here is the improved documentation: diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 6443f6d57aa..f66e37fffa4 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -381,7 +381,9 @@ vc-bzr--pushpull (setq-local compile-command (concat vc-bzr-program " " command " " (if args (mapconcat #'identity args " ") ""))))) - (vc-set-async-update buf)))) + (vc-set-async-update buf) + ;; Return the process for `vc-pull-and-push' + (get-buffer-process buf)))) (defun vc-bzr-pull (prompt) "Pull changes into the current Bzr branch. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index ef93edd1616..e551a243c80 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1289,6 +1289,7 @@ vc-git--pushpull (lambda (_name-of-mode) buffer) nil)))) (vc-set-async-update buffer) + ;; Return the process for `vc-pull-and-push' proc)) (defun vc-git-pull (prompt) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 0890b63d417..72160c35f57 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -3064,7 +3064,8 @@ vc-pull-and-push operation on the current branch, prompting for the precise command if required. Optional prefix ARG non-nil forces a prompt for the VCS command to run. If this is successful, a \"push\" -operation will then be done. +operation will then be done. This is supported only in backends +where the pull operation returns a process. On a non-distributed version control system, this signals an error. It also signals an error in a Bazaar bound branch." From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 24 13:08:03 2023 Received: (at 60569) by debbugs.gnu.org; 24 Jan 2023 18:08:03 +0000 Received: from localhost ([127.0.0.1]:57529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKNiE-0003cW-Oy for submit@debbugs.gnu.org; Tue, 24 Jan 2023 13:08:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKNiD-0003c0-6I for 60569@debbugs.gnu.org; Tue, 24 Jan 2023 13:08:01 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKNi7-0007EH-Kf; Tue, 24 Jan 2023 13:07:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=ohwkW6AMO8kx+RMqCPq9na/beYxR1Hm6G+FnomG+G3U=; b=Pu1pRpLsIkJs tot7e5gh0RVNobn6/CyJqEo9A49tViqvCnzsFJJ6b36gKcUXTLKxDRze/UXY0U1bGDH5Qom3wIiZu JhUPpCisi4Zfu77zf7kkqMxt6fJIBch/AFmhRj3dU01TcBH09yCopiZ0lL/pb4BPyb2J+pC0nB3OQ QkzHEdjcQS+DQZY/dh6CoDh2eYH7rtHckpO0ykemDqLOYI3AduM4Po66ZC8OoptMd94VtZl2k9txG F9pP//v9k8Ti1Xt5MY22L7zaFB7ppHAINIM/xDOobDblYoyP5VX0lZL88waXnbMDi+dRzqO4qSuH4 C/8B5giRLUKop5XkZ7WdAQ==; Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKNi7-0007u1-2x; Tue, 24 Jan 2023 13:07:55 -0500 Date: Tue, 24 Jan 2023 20:08:06 +0200 Message-Id: <83h6wfhkl5.fsf@gnu.org> From: Eli Zaretskii To: Juri Linkov In-Reply-To: <86sffzx1sj.fsf@mail.linkov.net> (message from Juri Linkov on Tue, 24 Jan 2023 19:49:24 +0200) Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs References: <864jt58l8f.fsf@mail.linkov.net> <861qnr4yet.fsf@mail.linkov.net> <86edrm4gyk.fsf@mail.linkov.net> <838rhtjw9p.fsf@gnu.org> <86sffzx1sj.fsf@mail.linkov.net> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 60569 Cc: 60569@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Juri Linkov > Cc: 60569@debbugs.gnu.org > Date: Tue, 24 Jan 2023 19:49:24 +0200 > > > Looks OK to me, but could you add some details regarding why this > > change is needed? Did we change our requirements from the return > > value of the pushpull method? > > Yes, to support vc-pull-and-push now the backend should return the > process for the pull operation. Here is the improved documentation: Thanks, this is okay for the emacs-29 branch. From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 24 13:30:32 2023 Received: (at 60569) by debbugs.gnu.org; 24 Jan 2023 18:30:32 +0000 Received: from localhost ([127.0.0.1]:57551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKO3z-0004By-Tl for submit@debbugs.gnu.org; Tue, 24 Jan 2023 13:30:32 -0500 Received: from relay11.mail.gandi.net ([217.70.178.231]:35213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pKO3y-0004Bf-5h; Tue, 24 Jan 2023 13:30:30 -0500 Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id AC94310000C; Tue, 24 Jan 2023 18:30:20 +0000 (UTC) From: Juri Linkov To: Eli Zaretskii Subject: Re: bug#60569: 29.0.60; vc-pull-and-push unsupported on non-git vcs In-Reply-To: <83h6wfhkl5.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 24 Jan 2023 20:08:06 +0200") Organization: LINKOV.NET References: <864jt58l8f.fsf@mail.linkov.net> <861qnr4yet.fsf@mail.linkov.net> <86edrm4gyk.fsf@mail.linkov.net> <838rhtjw9p.fsf@gnu.org> <86sffzx1sj.fsf@mail.linkov.net> <83h6wfhkl5.fsf@gnu.org> Date: Tue, 24 Jan 2023 20:29:38 +0200 Message-ID: <86r0vjvl9p.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 60569 Cc: 60569@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) close 60569 29.0.60 quit >> > Looks OK to me, but could you add some details regarding why this >> > change is needed? Did we change our requirements from the return >> > value of the pushpull method? >> >> Yes, to support vc-pull-and-push now the backend should return the >> process for the pull operation. Here is the improved documentation: > > Thanks, this is okay for the emacs-29 branch. Now pushed and closed. From unknown Sat Aug 09 09:37:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 22 Feb 2023 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator