bug#27641: 26.0.50; vc-dir using vc-src.el misses modified files

bug#27641: 26.0.50; vc-dir using vc-src.el misses modified files

[Dieter Deyke]

If you execute the following shell script:

#! /bin/bash

tmpdir=/tmp/tmp$$
mkdir $tmpdir
cd $tmpdir
date > x 
src commit -m Initial x
date >> x
emacs -Q --eval "(vc-dir \"$tmpdir\")"

then the file x is not shown as modified.

My guess is that the following patch does fix that problem:

diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el
index 5c8b3da6f1..0e47cc1512 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -180,7 +180,7 @@ For a description of possible values, see `vc-check-master-templates'."
 
 (defun vc-src-dir-status-files (dir files update-function)
   ;; FIXME: Use one src status -a call for this
-  (if (not files) (setq files (vc-expand-dirs (list dir) 'RCS)))
+  (if (not files) (setq files (vc-expand-dirs (list dir) 'SRC)))
   (let ((result nil))
     (dolist (file files)
       (let ((state (vc-state file))



In GNU Emacs 26.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.22.16)
 of 2017-07-07 built on deyke2
Repository revision: acbe2e9d2baa2c4c44f6de53d966ebfd91a6d93c
Windowing system distributor 'The X.Org Foundation', version 11.0.11903000
System Description:	Debian GNU/Linux testing (buster)

Recent messages:

Configured using:
 'configure --prefix=/usr/local/emacs --without-makeinfo'

Configured features:
XPM JPEG TIFF GIF PNG RSVG SOUND GPM DBUS GCONF GSETTINGS NOTIFY GNUTLS
LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS GTK3 X11

Important settings:
  value of $LANG: en_US.UTF-8
  locale-coding-system: utf-8-unix

Major mode: Diff

Minor modes in effect:
  magit-auto-revert-mode: t
  global-git-commit-mode: t
  async-bytecomp-package-mode: t
  diff-auto-refine-mode: t
  shell-dirtrack-mode: t
  delete-selection-mode: t
  cua-mode: t
  msb-mode: t
  icomplete-mode: t
  show-paren-mode: t
  which-function-mode: t
  display-time-mode: t
  tooltip-mode: t
  global-eldoc-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  buffer-read-only: t
  line-number-mode: t
  transient-mark-mode: t

Load-path shadows:
/home/deyke/.emacs.d/elpa/svg-0.1/svg hides /usr/local/emacs/share/emacs/26.0.50/lisp/svg

Features:
(shadow bbdb-message nnir emacsbug sendmail magit-obsolete magit-blame
magit-stash magit-bisect magit-remote magit-commit magit-sequence
magit-notes magit-worktree magit-branch magit-files magit-refs
magit-status magit magit-repos magit-apply magit-wip magit-log
magit-diff smerge-mode magit-core magit-autorevert autorevert filenotify
magit-process magit-margin magit-mode magit-git magit-section
magit-popup git-commit magit-utils log-edit with-editor async-bytecomp
async dash log-view pcvs-util eieio-opt speedbar sb-image ezimage dframe
help-fns radix-tree dabbrev ibuf-ext ibuffer ibuffer-loaddefs misearch
multi-isearch vc-src vc-sccs vc-svn vc-cvs vc-rcs vc-dir ewoc vc
vc-dispatcher wdired sokoban gamegrid dired-aux rx em-unix em-term term
ehelp em-script em-prompt em-ls em-hist em-pred em-glob em-dirs em-cmpl
em-basic em-banner em-alias tabify dd-misc python tramp-sh json map
swbuff add-log sh-script smie executable time-stamp copyright browse-url
url-http url-gw url-auth gnus-gravatar gravatar url-cache url url-proxy
url-privacy url-expand url-methods url-history url-cookie url-domsuf
url-util cl-extra help-mode gnus-picon sort gnus-cite smiley w3m-form
w3m w3m-hist w3m-fb bookmark-w3m w3m-ems w3m-ccl ccl w3m-favicon
w3m-image w3m-proc w3m-util mm-archive mail-extr gnus-async gnus-bcklg
qp gnus-ml disp-table gnus-topic nnrss xml mm-url nndraft nnmh
gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg gnus-art
mm-uu mml2015 mm-view mml-smime smime dig mailcap nnfolder nnml
gnus-cache gnus-sum bbdb-gnus bbdb-mua bbdb-com crm network-stream nsm
starttls nntp gnus-group gnus-undo spam-stat gnus-start gnus-cloud
nnimap nnmail mail-source tls gnutls utf7 nnoo gnus-spec gnus-int
gnus-range gnus-win gnus nnheader session view cal-china lunar solar
cal-dst cal-bahai cal-islam cal-hebrew holidays hol-loaddefs vc-fossil
diary-lib diary-loaddefs cal-iso vc-git diff-mode tempbuf org-rmail
org-mhe org-irc org-info org-gnus org-docview doc-view jka-compr
image-mode org-bibtex bibtex org-bbdb org-w3m org-agenda org-element
avl-tree org org-macro org-footnote org-pcomplete org-list org-faces
org-entities noutline outline org-version ob-emacs-lisp ob ob-tangle
org-src ob-ref ob-lob ob-table ob-keys ob-exp ob-comint tramp
tramp-compat tramp-loaddefs trampver ucs-normalize shell parse-time
ob-core ob-eval org-compat org-macs org-loaddefs find-func cal-menu
calendar cal-loaddefs generic-x rcirc netrc emms-volume easy-mmode
emms-volume-amixer emms-metaplaylist-mode emms-playlist-mode
emms-player-vlc advice emms-player-mplayer emms-player-simple
emms-source-playlist emms-source-file locate emms-setup emms emms-compat
bongo lastfm-submit volume allout color-theme wid-edit cl pcomplete
comint ansi-color ring esh-var esh-io esh-cmd esh-opt esh-ext esh-proc
esh-arg esh-groups eshell esh-module esh-mode esh-util server message-x
message subr-x puny format-spec rfc822 mml mml-sec epa derived epg
gnus-util rmail rmail-loaddefs mm-decode mm-bodies mm-encode mail-parse
rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev mail-utils gmm-utils
mailheader bbdb bbdb-site timezone delsel cua-base msb icomplete
mic-paren paren german-holidays dired dired-loaddefs which-func imenu
mm-util mail-prsvr time finder-inf info package easymenu epg-config
url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs
eieio-loaddefs password-cache url-vars seq byte-opt gv bytecomp
byte-compile cconv cl-loaddefs cl-lib time-date mule-util tooltip eldoc
electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win
x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe
tabulated-list replace newcomment text-mode elisp-mode lisp-mode
prog-mode register page menu-bar rfn-eshadow isearch timer select
scroll-bar mouse jit-lock font-lock syntax facemenu font-core
term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932
hebrew greek romanian slovak czech european ethiopic indian cyrillic
chinese composite charscript charprop case-table epa-hook jka-cmpr-hook
help simple abbrev obarray minibuffer cl-preloaded 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 dbusbind inotify dynamic-setting system-font-setting
font-render-setting move-toolbar gtk x-toolkit x multi-tty
make-network-process emacs)

Memory information:
((conses 16 788176 82144)
 (symbols 48 91688 78)
 (miscs 40 679 1071)
 (strings 32 234578 8555)
 (string-bytes 1 7171043)
 (vectors 16 100181)
 (vector-slots 8 2173621 80501)
 (floats 8 3860 44334)
 (intervals 56 3438 1459)
 (buffers 976 53))

-- 
Dieter Deyke
mailto:dieter.deyke@gmail.com
Get my Gnupg key:
gpg --keyserver keys.gnupg.net --recv-keys B116EA20

bug#27641: 26.0.50; vc-dir using vc-src.el misses modified files

[Dmitry Gutov]

Hi!

On 7/10/17 4:04 PM, Dieter Deyke wrote:

> My guess is that the following patch does fix that problem:

"Your guess" meaning it works for you? The code makes sense.

bug#27641: 26.0.50; vc-dir using vc-src.el misses modified files

[Dieter Deyke]

Dmitry Gutov <dgutov@yandex.ru> writes:

> Hi!
>
> On 7/10/17 4:04 PM, Dieter Deyke wrote:
>
>> My guess is that the following patch does fix that problem:
>
> "Your guess" meaning it works for you? The code makes sense.

Yes, my guess fixed my problem, but since I do not understand vc code
well enough, I am not sure if the guess is really the correct way to fix
it. Since the code was written by Eric S. Raymond <esr@thyrsus.com>, and
since he is the author of SRC, maybe he can validate the patch.

Thanks for looking into it,
-- 
Dieter Deyke
mailto:dieter.deyke@gmail.com
Get my Gnupg key:
gpg --keyserver keys.gnupg.net --recv-keys B116EA20

bug#27641: 26.0.50; vc-dir using vc-src.el misses modified files

[npostavs]

tags 27641 + patch
quit

Dieter Deyke <dieter.deyke@gmail.com> writes:

> Yes, my guess fixed my problem, but since I do not understand vc code
> well enough, I am not sure if the guess is really the correct way to fix
> it. Since the code was written by Eric S. Raymond <esr@thyrsus.com>, and
> since he is the author of SRC, maybe he can validate the patch.

That was introducted in [1: b1a765b3a8], seems fairly clear that it's
copy-pasta.  If anyone uses sccs it looks like the same typo was made
there.

[1: b1a765b3a8]: 2014-12-02 10:11:48 -0500
  In vc, abolish the dir-status method.
  http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=b1a765b3a8586cd53c21579982c8fbc0ce534336

bug#27641: 26.0.50; vc-dir using vc-src.el misses modified files

[Dmitry Gutov]

Version: 26.1

On 7/12/17 3:27 AM, npostavs@users.sourceforge.net wrote:
> Dieter Deyke <dieter.deyke@gmail.com> writes:
> 
>> Yes, my guess fixed my problem, but since I do not understand vc code
>> well enough, I am not sure if the guess is really the correct way to fix
>> it. Since the code was written by Eric S. Raymond <esr@thyrsus.com>, and
>> since he is the author of SRC, maybe he can validate the patch.
> 
> That was introducted in [1: b1a765b3a8], seems fairly clear that it's
> copy-pasta.  If anyone uses sccs it looks like the same typo was made
> there.

I've pushed the patch. Thank you both.