From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ed Avis Newsgroups: gmane.emacs.bugs Subject: bug#20558: 24.4; vc-revert on deleted file (git and svn should be more consistent) Date: Tue, 12 May 2015 15:13:44 +0000 Message-ID: <7E039918541B4C4183BFDB8F015C743032E1FC1E@WCL-EXCH02.wcl.local> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1431443728 27908 80.91.229.3 (12 May 2015 15:15:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 May 2015 15:15:28 +0000 (UTC) To: 20558@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue May 12 17:15:15 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 1YsBtq-0006n3-5x for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 May 2015 17:15:14 +0200 Original-Received: from localhost ([::1]:43549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsBtp-0001Z5-Hj for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 May 2015 11:15:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsBtl-0001Yo-CT for bug-gnu-emacs@gnu.org; Tue, 12 May 2015 11:15:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsBth-00072v-6a for bug-gnu-emacs@gnu.org; Tue, 12 May 2015 11:15:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsBth-000711-30 for bug-gnu-emacs@gnu.org; Tue, 12 May 2015 11:15:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YsBtg-0000E3-Eq for bug-gnu-emacs@gnu.org; Tue, 12 May 2015 11:15:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ed Avis Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 12 May 2015 15:15:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20558 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: "'bug-gnu-emacs@gnu.org'" Original-Received: via spool by submit@debbugs.gnu.org id=B.1431443646770 (code B ref -1); Tue, 12 May 2015 15:15:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 May 2015 15:14:06 +0000 Original-Received: from localhost ([127.0.0.1]:42522 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsBsj-0000CL-4w for submit@debbugs.gnu.org; Tue, 12 May 2015 11:14:06 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59533) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YsBse-0000Be-Vf for submit@debbugs.gnu.org; Tue, 12 May 2015 11:14:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsBsY-0006jQ-0M for submit@debbugs.gnu.org; Tue, 12 May 2015 11:13:55 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:58260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsBsX-0006jM-TM for submit@debbugs.gnu.org; Tue, 12 May 2015 11:13:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsBsW-000156-7X for bug-gnu-emacs@gnu.org; Tue, 12 May 2015 11:13:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsBsS-0006im-20 for bug-gnu-emacs@gnu.org; Tue, 12 May 2015 11:13:52 -0400 Original-Received: from mail1.bemta14.messagelabs.com ([193.109.254.113]:53565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsBsR-0006ig-Pw for bug-gnu-emacs@gnu.org; Tue, 12 May 2015 11:13:47 -0400 Original-Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 6A/49-02790-AA812555; Tue, 12 May 2015 15:13:46 +0000 X-Env-Sender: eda@waniasset.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1431443625!16928753!1 X-Originating-IP: [80.169.169.167] X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=waniasset.com,-,- X-VirusChecked: Checked Original-Received: (qmail 9095 invoked from network); 12 May 2015 15:13:45 -0000 Original-Received: from unknown (HELO WCL-EXCHCAS02.wcl.local) (80.169.169.167) by server-15.tower-27.messagelabs.com with AES128-SHA encrypted SMTP; 12 May 2015 15:13:45 -0000 Original-Received: from WCL-EXCH02.wcl.local ([169.254.1.57]) by WCL-EXCHCAS02.wcl.local ([149.85.127.102]) with mapi id 14.03.0123.003; Tue, 12 May 2015 16:13:44 +0100 Thread-Topic: 24.4; vc-revert on deleted file (git and svn should be more consistent) Thread-Index: AdCMxgkKjqofcX16QxSykItv6r4/iQ== Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [149.85.127.168] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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: 140.186.70.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:102704 Archived-At: Visit a file in a git or svn checkout. Unknown to emacs, delete that file. Then do vc-revert to get back the original contents from version control. When vc-mode is used with a Subversion working copy, reverting a file which has vanished on disk (but where the buffer is not marked as modified) will just get a fresh copy and put it in the buffer. That is perhaps not ideal because it loses local changes. When vc-mode is used with git, on reverting a file which no longer exists on disk (where the buffer is not marked as modified), a diff is shown betw= een the empty file and the current contents in version control. That is not a particularly helpful diff to show the user. 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. - 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. If that diff is empty, then just go ahead and revert. Or alternatively, vc-revert should just automatically save-buffer first if the underlying file no longer exists on disk. In GNU Emacs 24.4.1 (x86_64-redhat-linux-gnu, GTK+ Version 3.10.9) of 2014-11-03 on wcl-linux04.wcl.local Configured using: `configure --build=3Dx86_64-redhat-linux-gnu --host=3Dx86_64-redhat-linux-gnu --program-prefix=3D --disable-dependency-tracking --prefix=3D/usr --exec-prefix=3D/usr --bindir=3D/usr/bin --sbindir=3D/usr/sbin --sysconfdir=3D/etc --datadir=3D/usr/share --includedir=3D/usr/include --libdir=3D/usr/lib64 --libexecdir=3D/usr/libexec --localstatedir=3D/var --sharedstatedir=3D/var/lib --mandir=3D/usr/share/man --infodir=3D/usr/share/info --with-dbus --with-gif --with-jpeg --with-png= --with-rsvg --with-tiff --with-xft --with-xpm --with-x-toolkit=3Dgtk3 --with-gpm=3Dno build_alias=3Dx86_64-redhat-linux-gnu host_alias=3Dx86_64-redhat-linux-gnu 'CFLAGS=3D-DMAIL_USE_LOCKF -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=3D2 -fexceptions -fstack-protector-strong --param=3Dssp-buffer-size=3D4 -grecord-gcc-switches -m64 -mtune=3Dgeneric' 'LDFLAGS=3D-Wl,-z,relro '' Important settings: value of $LC_COLLATE: C value of $LC_CTYPE: en_GB.UTF-8 value of $LC_MESSAGES: en_GB.UTF-8 value of $LC_MONETARY: en_GB.UTF-8 value of $LC_NUMERIC: en_GB.UTF-8 value of $LC_TIME: en_GB.UTF-8 value of $LANG: en_GB.UTF-8 locale-coding-system: utf-8-unix Major mode: nXML Minor modes in effect: diff-auto-refine-mode: t shell-dirtrack-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: e e C-n C-n C-p C-x e e C-n C-n C-p C-x e e e C-n C-x=20 e C-n C-x e e e C-n C-n C-n C-n C-x e C-x v u y e s=20 DEL DEL y e s RET C-f C-f C-f C-f C-f C-f C-f C-f C-f=20 C-f C-f C-f C-f C-f C-f C-f C-f C-f C-f C-f C-f C-f=20 C-f C-f C-f C-f C-d C-d C-d C-d C-d C-d C-d C-d C-d=20 C-d C-a C-x C-s C-x v =3D C-x v v ESC p DEL DEL DEL DEL=20 N Z . C-c C-c C-x o C-p C-p C-p C-p C-p C-p C-p C-p=20 C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20 C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20 C-x e e e e C-n C-x e e e C-n C-n C-n C-p C-x e e C-n=20 C-n C-x e e C-n C-x e e C-n C-x e e e C-n C-x e C-n=20 C-x e e e C-n C-n C-n C-n C-x e C-n C-x e C-n C-x e=20 C-n C-x e e e e e e e e C-a C-x C-s ESC ! ESC p RET=20 C-x o q ESC < C-s m s c i l o c a l C-a ESC ! m v SPC=20 b u TAB . TAB DEL b u TAB DEL . i n _ p r o g r e s=20 s SPC v DEL - v i RET C-x v u C-g ESC x e w p DEL DEL=20 DEL r e p C-g C-h k C-x v u C-x o C-x o ESC x r e DEL=20 DEL e DEL r e p o r t SPC e m SPC a DEL b SPC RET Recent messages: (Type e to repeat macro) [26 times] Saving file /home/eda/git_working/repos/wwwroot/WaniSystems/Configuration/= MarketSampler/jobs/build.trend.signals.xml... Wrote /home/eda/git_working/repos/wwwroot/WaniSystems/Configuration/Market= Sampler/jobs/build.trend.signals.xml (Shell=20command succeeded with no output) Mark set Mark saved where search started 'build.trend.signals.xml' -> 'build.trend.signals.xml.in_progress' Finding changes in /home/eda/git_working/repos/wwwroot/WaniSystems/Configu= ration/MarketSampler/jobs/build.trend.signals.xml... Quit [2 times] Type C-x 1 to delete the help window. Load-path shadows: None found. Features: (shadow sort emacsbug sendmail eieio-opt speedbar sb-image ezimage dframe find-func sgml-mode warnings dired-aux nroff-mode macros etags pcmpl-gnu sh-script smie executable pcmpl-rpm mule-util ispell conf-mode rect python json smerge-mode network-stream starttls tls sql view dired mail-extr edmacro kmacro vc-bzr vc-sccs vc-svn vc-cvs vc-rcs tabify imenu man pcmpl-x diff-mode log-view vc vc-dispatcher cus-edit wid-edit cus-start cus-load perl-mode help-mode dabbrev misearch multi-isearch vc-git nxml-uchnm rng-xsd xsd-regexp rng-cmpct rng-nxml rng-valid rng-loc rng-uri rng-parse nxml-parse rng-match rng-dt rng-util rng-pttrn nxml-ns nxml-mode nxml-outln nxml-rap nxml-util nxml-glyph nxml-enc xmltok ffap thingatpt url-parse auth-source eieio eieio-core gnus-util password-cache url-vars pcmpl-unix xterm time-date log-edit easy-mmode message format-spec rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mailabbrev mail-utils gmm-utils mailheader pcvs-util add-log server csharp-mode advice help-fns byte-opt bytecomp byte-compile cconv cc-langs cc-mode cc-fonts easymenu cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs zoom-frm frame-cmds frame-fns cl-macs avoid cl gv cl-loaddefs cl-lib compile shell pcomplete comint ring ansi-color tooltip electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind gfilenotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) Memory information: ((conses 16 2740808 222760) (symbols 48 31871 0) (miscs 40 1470 9493) (strings 32 94693 49984) (string-bytes 1 3524974) (vectors 16 44630) (vector-slots 8 1843880 104132) (floats 8 1680 1157) (intervals 56 396602 1450) (buffers 960 263) (heap 1024 118762 5547)) --=20 Ed Avis Please ignore autogenerated disclaimer below this line. This email is intended only for the person to whom it is addressed and may= contain confidential information. Any retransmission, copying, disclosure= or other use of, this information by persons other than the intended reci= pient is prohibited. If you received this email in error, please contact t= he sender and delete the material. This email is for information only and = is not intended as an offer or solicitation for the purchase or sale of an= y financial instrument. Wadhwani Asset Management LLP is a Limited Liabili= ty Partnership registered in England (OC303168) with registered office at = 40 Berkeley Square, 3rd Floor, London, W1J 5AL. It is authorised and regul= ated by the Financial Conduct Authority.