From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#20558: 24.4; vc-revert on deleted file (git and svn should be more consistent) Date: Wed, 25 Nov 2015 04:42:25 +0200 Message-ID: <56552011.1080209@yandex.ru> References: <7E039918541B4C4183BFDB8F015C743032E1FC1E@WCL-EXCH02.wcl.local> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1448419456 8331 80.91.229.3 (25 Nov 2015 02:44:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Nov 2015 02:44:16 +0000 (UTC) Cc: 20558@debbugs.gnu.org To: Ed Avis Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 25 03:44:03 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a1Q3v-000243-1v for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 Nov 2015 03:44:03 +0100 Original-Received: from localhost ([::1]:42667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1Q3w-0007fR-3L for geb-bug-gnu-emacs@m.gmane.org; Tue, 24 Nov 2015 21:44:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1Q30-000603-4X for bug-gnu-emacs@gnu.org; Tue, 24 Nov 2015 21:43:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1Q2w-0001on-Q6 for bug-gnu-emacs@gnu.org; Tue, 24 Nov 2015 21:43:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1Q2w-0001oj-NL for bug-gnu-emacs@gnu.org; Tue, 24 Nov 2015 21:43:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1a1Q2w-00031t-G0 for bug-gnu-emacs@gnu.org; Tue, 24 Nov 2015 21:43:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 25 Nov 2015 02:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20558 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20558-submit@debbugs.gnu.org id=B20558.144841936911624 (code B ref 20558); Wed, 25 Nov 2015 02:43:02 +0000 Original-Received: (at 20558) by debbugs.gnu.org; 25 Nov 2015 02:42:49 +0000 Original-Received: from localhost ([127.0.0.1]:51966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a1Q2i-00031Q-TG for submit@debbugs.gnu.org; Tue, 24 Nov 2015 21:42:49 -0500 Original-Received: from mail-wm0-f51.google.com ([74.125.82.51]:33281) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a1Q2O-00030z-4P for 20558@debbugs.gnu.org; Tue, 24 Nov 2015 21:42:46 -0500 Original-Received: by wmec201 with SMTP id c201so236366019wme.0 for <20558@debbugs.gnu.org>; Tue, 24 Nov 2015 18:42:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:cc:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=xZsWDyz9ZEIqZJa6sle9roiG1/9wy0rVDVgVdwuRzQk=; b=uSl7TE7u33Z67JkVjGnBk7hGWIH3Tj6ybyipSRYcgTRgpRU7s3UfIoT2f/c7phuFX0 7wRuWE7LOeNwyBARwgFV2WXMCQ3/9n8SE6vsqgaAlINEKBxvyDKnQuhYw6DlgL/ereWZ 4adtiy0StRBgmNpLrtukcwvUYXg0KccqUQzX1DG0VPF/3SEP4Jq5PI3124xFnby6L7U3 ud2+mwCEHAyuBoTgV26tEP/QnMPVPbN7o50ix3c8FrNtrQHgsjmHeJeS3XOsN6C+6WR8 4FxpnDf2wXfPhH/zG4+dS6Fcem0qiMkPn/xtfBgHZx2xJPOcU20NmsRBxXUYvc426NWw tt5w== X-Received: by 10.28.150.7 with SMTP id y7mr1685085wmd.73.1448419347528; Tue, 24 Nov 2015 18:42:27 -0800 (PST) Original-Received: from [192.168.1.2] ([185.105.175.24]) by smtp.googlemail.com with ESMTPSA id jt9sm20913917wjc.24.2015.11.24.18.42.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Nov 2015 18:42:26 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Thunderbird/42.0 In-Reply-To: <7E039918541B4C4183BFDB8F015C743032E1FC1E@WCL-EXCH02.wcl.local> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:109218 Archived-At: On 05/12/2015 06:13 PM, Ed Avis wrote: > If the file no longer exists on disk, then I suggest vc-revert > should act as follows: > > - If the buffer is marked as modified, offer to save it, and after > saving show diffs and prompt to revert as usual. I believe we already do that. And if the user says no, the whole operation is aborted. > - If the buffer is not marked as modified, a diff should still be shown > between the current buffer contents and what would be fetched from the > version control system to replace it. That sounds a bit inconvenient to implement, and I guess I don't see a lot of benefit. > If that diff is empty, then > just go ahead and revert. That goes against the main use case of vc-revert, as I see it: discarding uncommitted changes if you no longer want them. > Or alternatively, vc-revert should just automatically save-buffer first > if the underlying file no longer exists on disk. That's doable. But then we'll also need to delete it afterwards if the user says no.