From unknown Sat Sep 06 13:38:00 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#24082 <24082@debbugs.gnu.org> To: bug#24082 <24082@debbugs.gnu.org> Subject: Status: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory Reply-To: bug#24082 <24082@debbugs.gnu.org> Date: Sat, 06 Sep 2025 20:38:00 +0000 retitle 24082 25.1; vc-dir for CVS repositories list all files as if from t= oplevel directory reassign 24082 emacs submitter 24082 G=C3=B6ktu=C4=9F Kayaalp severity 24082 normal tag 24082 confirmed thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 26 17:07:49 2016 Received: (at submit) by debbugs.gnu.org; 26 Jul 2016 21:07:49 +0000 Received: from localhost ([127.0.0.1]:38495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bS9Zr-00089Q-FQ for submit@debbugs.gnu.org; Tue, 26 Jul 2016 17:07:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bS8RC-00066e-G5 for submit@debbugs.gnu.org; Tue, 26 Jul 2016 15:54:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bS8R5-0007ya-5f for submit@debbugs.gnu.org; Tue, 26 Jul 2016 15:54:41 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57066) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS8R5-0007yL-2W for submit@debbugs.gnu.org; Tue, 26 Jul 2016 15:54:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS8R1-0002CX-Tv for bug-gnu-emacs@gnu.org; Tue, 26 Jul 2016 15:54:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bS8Qw-0007uu-QL for bug-gnu-emacs@gnu.org; Tue, 26 Jul 2016 15:54:35 -0400 Received: from relay6-d.mail.gandi.net ([2001:4b98:c:538::198]:53238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS8Qw-0007uR-HI for bug-gnu-emacs@gnu.org; Tue, 26 Jul 2016 15:54:30 -0400 Received: from mfilter31-d.gandi.net (mfilter31-d.gandi.net [217.70.178.162]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id DC311FB89F for ; Tue, 26 Jul 2016 21:54:28 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter31-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter31-d.gandi.net (mfilter31-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id Dmt-m4ES0lzA for ; Tue, 26 Jul 2016 21:54:26 +0200 (CEST) X-Originating-IP: 88.235.163.130 Received: from localhost (unknown [88.235.163.130]) (Authenticated sender: self@gkayaalp.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 39C96FB8A3 for ; Tue, 26 Jul 2016 21:54:26 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: bug-gnu-emacs@gnu.org Subject: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory Date: Tue, 26 Jul 2016 23:02:39 +0300 Message-ID: <874m7crwv4.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 26 Jul 2016 17:07:45 -0400 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: -5.0 (-----) When a directory is viewed via VC (=E2=80=98vc-dir=E2=80=99), when that dir= ectory is a CVS directory, all files that are edited, whether in that directory or in its subdirectories, are listed as if they were in the toplevel directory of the repo. Example (25.1): ,---- | VC backend : CVS | Working dir: [deduced] | Repository : [deduced] | Module : emacs.d |=20 |=20 | ./ | edited eval-sexp-fu.el | edited gk-org.el | edited gk-utils.el | edited gk.el `---- Same directory, in 24.5: ,---- | VC backend : CVS | Working dir: [deduced] | Repository : [deduced] | Module : emacs.d |=20 |=20 | ./ | gk/ | edited gk/gk-org.el | edited gk/gk-utils.el | edited gk/gk.el | site/ | edited site/eval-sexp-fu.el `---- Commands like vc-diff from this buffer (via =E2=80=98=3D=E2=80=99) fail, co= mplaining it can't find the VC backend. Reproduction: - Modify a tracked file in a submodule of a toplevel CVS module - Call =E2=80=98vc-dir=E2=80=99 on the toplevel module - Run a command on the modified file. This is the stacktrace I get from =E2=80=98vc-diff=E2=80=99 (=E2=80=98=3D= =E2=80=99 in vc-dir) with =E2=80=98debug-on-error=E2=80=99 t: ,---- | Debugger entered--Lisp error: (file-error "Cannot open load file" "No suc= h file or directory" "vc-nil") | require(vc-nil) | vc-find-backend-function(nil make-version-backups-p) | vc-call-backend(nil make-version-backups-p "[deduced]/emacs.d/gk-org.el= ") | vc-version-backup-file("[deduced]/emacs.d/gk-org.el" nil) | vc-cvs-diff(("[deduced]/emacs.d/gk-org.el") nil nil "*vc-diff*" t) | apply(vc-cvs-diff (("[deduced]/emacs.d/gk-org.el") nil nil "*vc-diff*" = t)) | vc-call-backend(CVS diff ("[deduced]/emacs.d/gk-org.el") nil nil "*vc-d= iff*" t) | vc-diff-internal(t (CVS ("[deduced]/emacs.d/gk-org.el") nil nil nil) ni= l nil t) | vc-diff(nil t) | funcall-interactively(vc-diff nil t) | call-interactively(vc-diff nil nil) | command-execute(vc-diff) `---- If I try to see the version log, via =E2=80=98l=E2=80=99 in the *vc-dir* bu= ffer, I get the =E2=80=98*vc-change-log*=E2=80=99 buffer with these contents: ,---- | cvs log: nothing known about gk-org.el `---- In GNU Emacs 25.1.1 (x86_64-unknown-freebsd10.3, X toolkit, Xaw scroll bars) of 2016-07-26 built on xi.bootis Windowing system distributor 'The X.Org Foundation', version 11.0.11704000 Configured using: 'configure -C --enable-silent-rules --disable-dependency-tracking --without-pop --with-x-toolkit=3Dathena --without-gpm --without-dbus --without-gconf --without-gsettings --without-selinux --with-modules --with-file-notification=3Dyes --with-x --prefix=3D[deduced]' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND NOTIFY ACL GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB TOOLKIT_SCROLL_BARS LUCID X11 MODULES Important settings: value of $LC_MESSAGES: en_US.UTF-8 value of $LANG: tr_TR.UTF-8 locale-coding-system: utf-8-unix Major mode: VC dir Minor modes in effect: diff-auto-refine-mode: t show-paren-mode: t auto-insert-mode: t change-cursor-mode: t winner-mode: t auto-image-file-mode: t which-key-mode: t smooth-scroll-mode: t save-place-mode: t savehist-mode: t global-paren-face-mode: t eval-sexp-fu-flash-mode: t global-gk-minor-mode: t gk-minor-mode: t global-undo-tree-mode: t undo-tree-mode: t gk-utf8-entry-mode: t pdf-occur-global-minor-mode: t shell-dirtrack-mode: t tooltip-mode: t global-eldoc-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 size-indication-mode: t line-number-mode: t transient-mark-mode: t Recent messages: Traversing directory [deduced]/emacs.d/lisp... Traversing directory [deduced]/emacs.d/packages... Traversing directory [deduced]/emacs.d/packages/bbdb-20150523.1239... Traversing directory [deduced]/emacs.d/packages/elfeed-git... Traversing directory [deduced]/emacs.d/packages/pdf-tools-0.70... Traversing directory [deduced]/emacs.d/site... Traversing directory [deduced]/emacs.d/themes... Traversing directory [deduced]/emacs.d/...done Finding changes in [deduced]/emacs.d/eval-sexp-fu.el... Entering debugger... Load-path shadows: [deduced]/co/Exwm/gk-wm hides [deduced]/.emacs.d/gk/gk-wm [deduced]/co/Exwm/cl-generic hides [deduced]/Local/emacs25.1/share/emacs/25= .1/lisp/emacs-lisp/cl-generic [deduced]/.emacs.d/site/let-alist hides [deduced]/Local/emacs25.1/share/ema= cs/25.1/lisp/emacs-lisp/let-alist Features: (conf-mode shadow mailalias mail-extr emacsbug make-mode vc-git diff-mode vc-bzr vc-src vc-sccs vc-svn eieio-opt speedbar sb-image ezimage dframe debug dabbrev sort tabify two-column iso-transl dired-aux org-colview shr-color color qp goto-addr rmailmm exim xcb-xim xcb-xlib exwm-systemtray xcb-systemtray xcb-xembed exwm-config ido exwm exwm-input xcb-keysyms exwm-manage exwm-floating xcb-cursor xcb-render exwm-layout exwm-workspace exwm-core xcb-ewmh xcb-icccm xcb xcb-xproto xcb-types tls gnutls ibuf-macs supercite regi rmailsum mh-e mh-compat mh-acros mh-buffers mh-loaddefs ispell bbdb-mua diary-lib diary-loaddefs misearch multi-isearch grep executable pcmpl-cvs vc-dir ewoc pcmpl-unix parse-time disp-table org-rmail org-mhe org-irc org-info org-gnus org-docview org-bibtex bibtex org-bbdb org-w3m paren autoinsert init server gk thinks analog-clock artist picture reporter boxquote gk-www twittering-mode gk-feeds gk-urls elfeed-show elfeed-db elfeed-lib avl-tree elfeed-search elfeed xml-query xml gk-vc vc-rcs vc-cvs vc vc-dispatcher log-edit pcvs-util add-log gk-ui cursor-chg winner gk-system man gk-servers simple-httpd gk-multimedia image+ image-file gk-mail sendmail rmail message idna rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums gmm-utils mailheader f dash epa-mail bbdb-vcard bbdb-com crm mailabbrev vcard mairix gk-ibuffer ibuffer-vc tramp-cache tramp tramp-compat tramp-loaddefs trampver bbdb bbdb-site timezone gk-globals forecast which-key smooth-scroll saveplace savehist paren-face gk-keys windmove gk-programming sass-mode haml-mode css-mode ruby-mode smie js sgml-mode thingatpt cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs gk-outline eval-sexp-fu warnings rx highlight inf-lisp highlight-parentheses paredit edmacro kmacro gk-org ob-sh latexenc ox-odt rng-loc rng-uri rng-parse rng-match rng-dt rng-util rng-pttrn nxml-parse nxml-ns nxml-enc xmltok nxml-util ox-beamer ox-latex ox-icalendar ox-html ox-ascii ox-publish ox org-element org-mobile org-location-google-maps org-capture org-agenda interleave doc-view google-maps google-maps-static google-maps-geocode google-maps-base json map gk-org-cite gk-fonts gk-alist gk-lingua gk-minor-mode ace-jump-mode face-remap apropos gk-file gk-editing zencoding-mode cl writeroom-mode visual-fill-column undo-tree diff typo lorem-ipsum gk-utf8 gk-input-methods gk-unilat gk-greek gk-armenian quail gk-global-modes diminish gk-edit rect gk-documents gk-utils epa derived whole-line-or-region s ucs-normalize org org-macro org-footnote org-pcomplete org-list org-faces org-entities noutline outline easy-mmode org-version ob-emacs-lisp ob ob-tangle ob-ref ob-lob ob-table ob-exp org-src ob-keys ob-comint ob-core ob-eval org-compat org-macs org-loaddefs cal-menu calendar cal-loaddefs etags xref project eww mm-url gnus gnus-ems nnheader mail-utils url-queue url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util url-parse auth-source cl-seq gnus-util mm-util help-fns mail-prsvr password-cache url-vars mailcap shr seq dom subr-x browse-url pdf-links pdf-occur ibuf-ext ibuffer tablist tablist-filter semantic/wisent/comp semantic/wisent semantic/wisent/wisent semantic/util-modes semantic/util semantic semantic/tag semantic/lex semantic/fw eieio byte-opt bytecomp byte-compile cl-extra help-mode cconv eieio-core cl-macs gv mode-local find-func cedet pdf-isearch let-alist pdf-misc imenu pdf-tools compile cus-edit cus-start cus-load wid-edit pdf-view bookmark pp jka-compr pdf-cache pdf-info tq pdf-util advice image-mode gk-dired ls-lisp wdired image-dired format-spec dired-x dired gk-crypt gk-mac epg epg-config gk-comint shell pcomplete comint ansi-color ring info easymenu cl-loaddefs pcase cl-lib time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core 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 charscript case-table epa-hook jka-cmpr-hook help simple abbrev 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 kqueue dynamic-setting font-render-setting x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 723191 648769) (symbols 48 77111 0) (miscs 40 2748 5673) (strings 32 158878 311981) (string-bytes 1 5053215) (vectors 16 96985) (vector-slots 8 2335188 485593) (floats 8 2069 3651) (intervals 56 21909 2441) (buffers 976 119)) --=20 =C4=B0. G=C3=B6ktu=C4=9F Kayaalp. http://gkayaalp.com/ From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 14:18:11 2016 Received: (at control) by debbugs.gnu.org; 28 Jul 2016 18:18:11 +0000 Received: from localhost ([127.0.0.1]:49578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSpsp-00080R-0x for submit@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSpsm-00080B-Qo for control@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSpsg-0001m5-VN for control@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSpsg-0001ly-S7 for control@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:02 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1bSpsf-0007L7-PY for control@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:01 -0400 Subject: control message for bug 24082 To: X-Mailer: mail (GNU Mailutils 2.99.98) Message-Id: From: Glenn Morris Date: Thu, 28 Jul 2016 14:18:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -6.3 (------) X-Debbugs-Envelope-To: control 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: -6.3 (------) tag 24082 confirmed From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 14:18:20 2016 Received: (at control) by debbugs.gnu.org; 28 Jul 2016 18:18:21 +0000 Received: from localhost ([127.0.0.1]:49581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSpsy-00080n-OI for submit@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSpsx-00080c-NT for control@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSpss-0001nN-1P for control@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSpsr-0001nJ-UW for control@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:13 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1bSpsq-0007MJ-KN for control@debbugs.gnu.org; Thu, 28 Jul 2016 14:18:12 -0400 Subject: control message for bug 21966 To: X-Mailer: mail (GNU Mailutils 2.99.98) Message-Id: From: Glenn Morris Date: Thu, 28 Jul 2016 14:18:12 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -6.3 (------) X-Debbugs-Envelope-To: control 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: -6.3 (------) block 21966 by 24082 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 29 20:35:33 2016 Received: (at 24082) by debbugs.gnu.org; 30 Jul 2016 00:35:33 +0000 Received: from localhost ([127.0.0.1]:51018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bTIFY-0001cj-SS for submit@debbugs.gnu.org; Fri, 29 Jul 2016 20:35:33 -0400 Received: from paulo.mayfirst.org ([162.247.75.145]:47320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bTIFY-0001cc-0T for 24082@debbugs.gnu.org; Fri, 29 Jul 2016 20:35:32 -0400 Received: from paulo.mayfirst.org (unknown [127.0.0.1]) by paulo.mayfirst.org (Postfix) with ESMTP id D39B13F1E for <24082@debbugs.gnu.org>; Fri, 29 Jul 2016 20:35:26 -0400 (EDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: srevilak@paulo.mayfirst.org) with ESMTPSA id 9454F3F1D Date: Fri, 29 Jul 2016 20:35:21 -0400 From: Steve Revilak To: 24082@debbugs.gnu.org Subject: vc-dir changes working directory (git backend) Message-ID: <20160730003521.GA17700@srevilak.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4SFOXa2GPu3tIq4H" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 24082 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.0 (+) --4SFOXa2GPu3tIq4H Content-Type: multipart/mixed; boundary="jRHKVT23PllUwdXP" Content-Disposition: inline --jRHKVT23PllUwdXP Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I'd like to submit some additional information. I seem similar (but not identical behavior) when git is used as the vc backend. I am using emacs version GNU Emacs 25.1.1 (x86_64-unknown-linux-gnu, GTK+ Version 3.14.15) of 201= 6-07-29 I've attached a small shell script to assist in reproducing the behavior. The script creates a git repository and commits two files =2E/my-repo/file1.txt and ./my-repo/file2.txt. The script also creates (an unregistered) file ./my-repo/new-file.txt. STEPS TO REPRODUCE: sh mk-repository.sh emacs -Q C-x f my-repo/subdir RET C-x v d At this point emacs prompts "VC status for directory: ~/my-repo", although the buffer's working directory was "~/my-repo/subdir". I press RET at the "VC status for directory: ~/my-repo". Here's what I see --------------------------------- VC backend : Git Working dir: ~/my-repo/ Branch : master Remote :=20 Stash : Nothing stashed ./ unregistered new-file.txt --------------------------------- When performing these steps with emacs-24.5: - After pressing C-x v d, emacs prompts "VC status for directory: ~/my-repo/subdir/" - I press RET and see --------------------------------- VC backend : Git Working dir: ~/my-repo/subdir/ Branch : master Remote :=20 Stash : Nothing stashed ./ --------------------------------- I agree with the reporter: the VC status is being reported from the top-level of the repository, as opposed to the buffer's working directory. emacs-25.0.90 behaves the same way as emacs 25.1-rc1 Unlike the CVS report, '=3D' (in vc-dir) behaves as I would expect: it shows me a diff of the file at point. --jRHKVT23PllUwdXP Content-Type: application/x-sh Content-Disposition: attachment; filename="mk-repository.sh" Content-Transfer-Encoding: quoted-printable #!/bin/sh=0A=0Arepo=3Dmy-repo=0A=0Arm -rf $repo=0Amkdir $repo=0A(cd $repo= =0A git init=0A mkdir subdir=0A date > subdir/file1.txt=0A date > subdir/fi= le2.txt=0A git add subdir=0A git commit -m "initial revision"=0A date > new= -file.txt=0A)=0A --jRHKVT23PllUwdXP-- --4SFOXa2GPu3tIq4H Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXm/ZIAAoJED6yLeTllNzyxqAP/0wSjtsVlNVsvXjFzepsehKZ QqHmZpKd63iGvEroXt+Q0SZoS27J+lwJy+fyFuRKpaRHCtCGlxvpzD9jPSjm1LzI pG8vTusgjuzlvyRm8J/eYdtpZWMoL8lNVU6h/3jpjQ81J5vGUVlXrH20roCmrM62 sTtXRkCh7q6s4Z6Rz4HUjXJWaeCixB44N5o98WVRBW2qzlWsmSQPrW5r9RfJ+9M4 e7m9ZKrfOwxyt5P4oBViMhdUlVYLa81/I3IqfZnWXGASuFnF960Xids4Wkz4Jp1p QQhO3RWCw4CcbhDAVa4EhNWdVWLz+doVwDr6fXAY0gaRN6m51zdJuMNZQwBqwp9Z gdXkrcZi1WZZBF6F33mr8KwM1tyUeeIl9y+V4mQaN+pTUnVQQp/1KvKSDtN7xjHO uBH4nSGb2wtOVBI4UsjJ606luTV25eDlP93+/bsIklECPFVDUI4KO7kHFCi/4pvK fECtXV7whV6j2NdV/fLAl2m+E5qmO5fLqxEOJ/IoXBBvTMi/F5M9orgUKt+1MdM7 vPKY/JFGMbulsN8v9E0zVFXhdx70WB+QYvaiOBnZNmeFlm4XniKxX/OrkBA/kaFe 7LKRufTkrn15Iscnb+R7u1KNfwF4PrMwQl1bTWstmPXI9GpIrrsQ/KGDgpKZ4LNi GfkNfyHjw5hLLq+217hM =utEv -----END PGP SIGNATURE----- --4SFOXa2GPu3tIq4H-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 28 16:07:20 2016 Received: (at 24082) by debbugs.gnu.org; 28 Aug 2016 20:07:20 +0000 Received: from localhost ([127.0.0.1]:43073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1be6MS-0004SY-FD for submit@debbugs.gnu.org; Sun, 28 Aug 2016 16:07:20 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:36470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1be6MQ-0004SP-6E for 24082@debbugs.gnu.org; Sun, 28 Aug 2016 16:07:18 -0400 Received: from mfilter15-d.gandi.net (mfilter15-d.gandi.net [217.70.178.143]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id 47262FB89F for <24082@debbugs.gnu.org>; Sun, 28 Aug 2016 22:07:16 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter15-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter15-d.gandi.net (mfilter15-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 5pFCXWEiQuLx for <24082@debbugs.gnu.org>; Sun, 28 Aug 2016 22:07:14 +0200 (CEST) X-Originating-IP: 78.181.205.50 Received: from localhost (unknown [78.181.205.50]) (Authenticated sender: self@gkayaalp.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 91E1EFB8A3 for <24082@debbugs.gnu.org>; Sun, 28 Aug 2016 22:07:13 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: 24082@debbugs.gnu.org Subject: [PATCH] Use =?utf-8?B?4oCYY3ZzIHVwZGF0ZeKAmQ==?= instead =?utf-8?B?4oCYY3ZzIHN0YXR1c+KAmQ==?= for CVS *vc-dir* buffers Date: Sun, 28 Aug 2016 23:17:57 +0300 Message-ID: <874m64wsui.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 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: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, attached is a patch that fixes bug#24082. The reason of the bug was that, in function =E2=80=98vc-cvs-after-dir-statu= s=E2=80=99, the CVS status line =E2=80=98cvs status: Examining =E2=80=99 was exclu= ded when the function narrows to match, and when it tries to set the local variable =E2=80=98subdir=E2=80=99, as it does not find this line, it skips setting i= t. As =E2=80=98subdir=E2=80=99 defaults to =E2=80=98default-directory=E2=80=99, w= hich is previously set to repo root (i.e. the argument to function =E2=80=98vc-dir=E2=80=99, when =E2= =80=98subdir=E2=80=99 is used to construct the relative path to file, concatenating it with the already-known file base name, it returns the basename, i.e. in the form =E2=80=98name.ext=E2=80=99, with no directory path. This because = it constructs the relative path like =E2=80=98(file-relative-name basename subdir)=E2=80= =99. The patch uses =E2=80=98cvs update=E2=80=99 command instead. The implement= ation was already there, commented out. I enabled and corrected it. The result is more correct than the =E2=80=98cvs status=E2=80=99 approach, i.e. includ= es unregistered and missing, and is faster compared to =E2=80=98cvs status=E2= =80=99 way. PS.: Please have me in CC when updating, I'm not subscribed to bug-gnu-emacs. --=20 =C4=B0. G=C3=B6ktu=C4=9F Kayaalp. http://gkayaalp.com/ --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=bug-24082.patch Content-Description: patch for #24082 diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 5019871..fa385ae 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -944,103 +944,32 @@ state." (t 'edited)))))))) (defun vc-cvs-after-dir-status (update-function) - ;; Heavily inspired by vc-cvs-parse-status. AKA a quick hack. - ;; This needs a lot of testing. - (let ((status nil) - (status-str nil) - (file nil) - (result nil) - (missing nil) - (ignore-next nil) - (subdir default-directory)) + (let ((result nil) + (translation '((?? . unregistered) + (?A . added) + (?C . conflict) + (?M . edited) + (?P . needs-merge) + (?R . removed) + (?U . needs-update)))) (goto-char (point-min)) - (while - ;; Look for either a file entry, an unregistered file, or a - ;; directory change. - (re-search-forward - "\\(^=+\n\\([^=c?\n].*\n\\|\n\\)+\\)\\|\\(\\(^?? .*\n\\)+\\)\\|\\(^cvs status: \\(Examining\\|nothing\\) .*\n\\)" - nil t) - ;; FIXME: get rid of narrowing here. - (narrow-to-region (match-beginning 0) (match-end 0)) - (goto-char (point-min)) - ;; The subdir - (when (looking-at "cvs status: Examining \\(.+\\)") - (setq subdir (expand-file-name (match-string 1)))) - ;; Unregistered files - (while (looking-at "? \\(.*\\)") - (setq file (file-relative-name - (expand-file-name (match-string 1) subdir))) - (push (list file 'unregistered) result) - (forward-line 1)) - (when (looking-at "cvs status: nothing known about") - ;; We asked about a non existent file. The output looks like this: - - ;; cvs status: nothing known about `lisp/v.diff' - ;; =================================================================== - ;; File: no file v.diff Status: Unknown - ;; - ;; Working revision: No entry for v.diff - ;; Repository revision: No revision control file - ;; - - ;; Due to narrowing in this iteration we only see the "cvs - ;; status:" line, so just set a flag so that we can ignore the - ;; file in the next iteration. - (setq ignore-next t)) - ;; A file entry. - (when (re-search-forward "^File: \\(no file \\)?\\(.*[^ \t]\\)[ \t]+Status: \\(.*\\)" nil t) - (setq missing (match-string 1)) - (setq file (file-relative-name - (expand-file-name (match-string 2) subdir))) - (setq status-str (match-string 3)) - (setq status - (cond - ((string-match "Up-to-date" status-str) 'up-to-date) - ((string-match "Locally Modified" status-str) 'edited) - ((string-match "Needs Merge" status-str) 'needs-merge) - ((string-match "Needs \\(Checkout\\|Patch\\)" status-str) - (if missing 'missing 'needs-update)) - ((string-match "Locally Added" status-str) 'added) - ((string-match "Locally Removed" status-str) 'removed) - ((string-match "File had conflicts " status-str) 'conflict) - ((string-match "Unknown" status-str) 'unregistered) - (t 'edited))) - (if ignore-next - (setq ignore-next nil) - (unless (eq status 'up-to-date) - (push (list file status) result)))) - (goto-char (point-max)) - (widen)) - (funcall update-function result)) - ;; Alternative implementation: use the "update" command instead of - ;; the "status" command. - ;; (let ((result nil) - ;; (translation '((?? . unregistered) - ;; (?A . added) - ;; (?C . conflict) - ;; (?M . edited) - ;; (?P . needs-merge) - ;; (?R . removed) - ;; (?U . needs-update)))) - ;; (goto-char (point-min)) - ;; (while (not (eobp)) - ;; (if (looking-at "^[ACMPRU?] \\(.*\\)$") - ;; (push (list (match-string 1) - ;; (cdr (assoc (char-after) translation))) - ;; result) - ;; (cond - ;; ((looking-at "cvs update: warning: \\(.*\\) was lost") - ;; ;; Format is: - ;; ;; cvs update: warning: FILENAME was lost - ;; ;; U FILENAME - ;; (push (list (match-string 1) 'missing) result) - ;; ;; Skip the "U" line - ;; (forward-line 1)) - ;; ((looking-at "cvs update: New directory `\\(.*\\)' -- ignored") - ;; (push (list (match-string 1) 'unregistered) result)))) - ;; (forward-line 1)) - ;; (funcall update-function result))) - ) + (while (not (eobp)) + (if (looking-at "^[ACMPRU?] \\(.*\\)$") + (push (list (match-string 1) + (cdr (assoc (char-after) translation))) + result) + (cond + ((looking-at "cvs update: warning: \\(.*\\) was lost") + ;; Format is: + ;; cvs update: warning: FILENAME was lost + ;; U FILENAME + (push (list (match-string 1) 'missing) result) + ;; Skip the "U" line + (forward-line 1)) + ((looking-at "cvs update: New directory `\\(.*\\)' -- ignored") + (push (list (match-string 1) 'unregistered) result)))) + (forward-line 1)) + (funcall update-function result))) ;; Based on vc-cvs-dir-state-heuristic from Emacs 22. ;; FIXME does not mention unregistered files. @@ -1078,15 +1007,12 @@ Query all files in DIR if files is nil." (let ((local (vc-cvs-stay-local-p dir))) (if (and (not files) local (not (eq local 'only-file))) (vc-cvs-dir-status-heuristic dir update-function) - (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS))) - (vc-cvs-command (current-buffer) 'async files "-f" "status") - ;; Alternative implementation: use the "update" command instead of - ;; the "status" command. - ;; (vc-cvs-command (current-buffer) 'async - ;; (file-relative-name dir) - ;; "-f" "-n" "update" "-d" "-P") - (vc-run-delayed - (vc-cvs-after-dir-status update-function))))) + (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS)))) + (vc-cvs-command (current-buffer) 'async + (file-relative-name dir) + "-f" "-n" "-q" "update") + (vc-run-delayed + (vc-cvs-after-dir-status update-function)))) (defun vc-cvs-file-to-string (file) "Read the content of FILE and return it as a string." --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 05 14:18:21 2016 Received: (at 24082) by debbugs.gnu.org; 5 Oct 2016 18:18:21 +0000 Received: from localhost ([127.0.0.1]:46020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brqlp-0004iB-11 for submit@debbugs.gnu.org; Wed, 05 Oct 2016 14:18:21 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:41379) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brqln-0004i1-He for 24082@debbugs.gnu.org; Wed, 05 Oct 2016 14:18:19 -0400 Received: from mfilter22-d.gandi.net (mfilter22-d.gandi.net [217.70.178.150]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 5191A1720A5 for <24082@debbugs.gnu.org>; Wed, 5 Oct 2016 20:18:18 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter22-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter22-d.gandi.net (mfilter22-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id UzupeUzc_rWD for <24082@debbugs.gnu.org>; Wed, 5 Oct 2016 20:18:17 +0200 (CEST) X-Originating-IP: 88.235.171.29 Received: from localhost (unknown [88.235.171.29]) (Authenticated sender: self@gkayaalp.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 9A201172094 for <24082@debbugs.gnu.org>; Wed, 5 Oct 2016 20:18:16 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: 24082@debbugs.gnu.org Subject: Update Date: Wed, 05 Oct 2016 21:31:54 +0300 Message-ID: <87zimive91.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 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: -0.7 (/) Hi, I just wanted to check in for an update on whether or not this patch will be accepted or not. I have my copyright assignment stuff sorted (confirmed by FSF today). --=20 =C4=B0. G=C3=B6ktu=C4=9F Kayaalp. http://gkayaalp.com/ From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 05 14:34:09 2016 Received: (at 24082) by debbugs.gnu.org; 5 Oct 2016 18:34:09 +0000 Received: from localhost ([127.0.0.1]:46032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brr17-0005Bi-K3 for submit@debbugs.gnu.org; Wed, 05 Oct 2016 14:34:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brr16-0005BT-NQ for 24082@debbugs.gnu.org; Wed, 05 Oct 2016 14:34:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brr0w-0006I2-N3 for 24082@debbugs.gnu.org; Wed, 05 Oct 2016 14:34:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40213) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brr0w-0006Hl-JR; Wed, 05 Oct 2016 14:33:58 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1448 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1brr0t-0005QT-TR; Wed, 05 Oct 2016 14:33:57 -0400 Date: Wed, 05 Oct 2016 21:33:49 +0300 Message-Id: <838tu2lk6q.fsf@gnu.org> From: Eli Zaretskii To: =?utf-8?B?R8O2a3R1xJ8=?= Kayaalp , Dmitry Gutov In-reply-to: <87zimive91.fsf@xi.bootis> (message from =?utf-8?B?R8O2a3R1?= =?utf-8?B?xJ8=?= Kayaalp on Wed, 05 Oct 2016 21:31:54 +0300) Subject: Re: bug#24082: Update References: <874m7crwv4.fsf@xi.bootis> <87zimive91.fsf@xi.bootis> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -7.7 (-------) X-Debbugs-Envelope-To: 24082 Cc: 24082@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: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -7.7 (-------) > From: GöktuÄŸ Kayaalp > Date: Wed, 05 Oct 2016 21:31:54 +0300 > > Hi, I just wanted to check in for an update on whether or not this patch > will be accepted or not. I have my copyright assignment stuff sorted > (confirmed by FSF today). Dmitry, could you please look into this? Thanks. From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 06 19:25:35 2016 Received: (at 24082) by debbugs.gnu.org; 6 Oct 2016 23:25:35 +0000 Received: from localhost ([127.0.0.1]:47028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsI2h-0001pg-KL for submit@debbugs.gnu.org; Thu, 06 Oct 2016 19:25:35 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsI2f-0001pO-8t for 24082@debbugs.gnu.org; Thu, 06 Oct 2016 19:25:33 -0400 Received: by mail-wm0-f44.google.com with SMTP id b201so2452565wmb.0 for <24082@debbugs.gnu.org>; Thu, 06 Oct 2016 16:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=tEfxgljvZ+Ccnn2gbQkwuE/6aIXaZmcXnvGoUgNKz1A=; b=C100bGUDiKRw2Ve9q8LK+jqe7rccciue/UQiTiWAZpVjCVWHsRjfcYAEe/mXuJdvpz yd6XNBuvqyaV+Zh9zLboHD7orb1/wDbv3wO8KA9CiJcG+++snBdCs3oeDUbWb2tL+zS/ 1XnYf5FVXBxxHmrYcgcSscHmCdwv2TCHgp6eV3vWtVhkIAXIzc105eC7MM54/dgslsFQ 6F+lsy/URCe2Hr9ASd7SjvYAFmfBtAzXX5eXmMJEYwiZPc+NdJPLl0xyE5bhkR2PLKE8 QUqUnCVgV7Lv2m4KnF4vYzSmZciGNR86ZbtraZAXf048yjb4oSkbO2qnWDjpXpxJZPUS qJ1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=tEfxgljvZ+Ccnn2gbQkwuE/6aIXaZmcXnvGoUgNKz1A=; b=h/mWl+sx9FraI6/LAOAyIrLLRuB0pMHceKjI1VFYmrtEcNvJO2Ft9y6Zy69Dzjak+m xJkQR6turKI0DoNio6zgKPyxiyUR12rdky6ajQ/LubX9ZHK/rpKAIFykqXsgjZlOa80q 6LgJNRfuU6CvSCK1WqxXYRfT9e3Vx7+SDRRMAGgTWbI2fKIJvGfzqZU4PR+fovXPaL6S w7lmRZiz5uapGnsvtWRq9dkBgn/+v4NWbJR9V9pZAYmWrdXKSm+dg+JG7zRVIWIBV7KG zr/BED7Iq1wviyW6cnJe0UEdk1yYOWjS/1j9y77S7dQblq9j0jzk6e1jT2P3DOuWyG1r SYCw== X-Gm-Message-State: AA6/9RlTCN+ir3ncUwo0bGFFvW+ATzmFrT9uLiZoR90PFkEOYBYtRz6Y4w/B1uT9Tk2WKA== X-Received: by 10.28.142.14 with SMTP id q14mr10012823wmd.87.1475796327446; Thu, 06 Oct 2016 16:25:27 -0700 (PDT) Received: from [192.168.1.3] ([185.105.174.103]) by smtp.googlemail.com with ESMTPSA id n131sm170380wmd.3.2016.10.06.16.25.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Oct 2016 16:25:26 -0700 (PDT) Subject: =?UTF-8?Q?Re:_bug#24082:_[PATCH]_Use_=e2=80=98cvs_update=e2=80=99_i?= =?UTF-8?Q?nstead_=e2=80=98cvs_status=e2=80=99_for_CVS_*vc-dir*_buffers?= To: =?UTF-8?Q?G=c3=b6ktu=c4=9f_Kayaalp?= , 24082@debbugs.gnu.org References: <874m7crwv4.fsf@xi.bootis> <874m64wsui.fsf@xi.bootis> From: Dmitry Gutov Message-ID: Date: Fri, 7 Oct 2016 02:25:24 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:49.0) Gecko/20100101 Thunderbird/49.0 MIME-Version: 1.0 In-Reply-To: <874m64wsui.fsf@xi.bootis> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 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: 0.5 (/) Hi! Sorry for the long wait. On 28.08.2016 23:17, GöktuÄŸ Kayaalp wrote: > Hi, attached is a patch that fixes bug#24082. Could you help me reproduce the issue locally first? Either by pointing to a publicly available CVS repo with submodules, or by providing a sequence of commands that would create such repo locally (we do something like that in vc-tests.el). > The reason of the bug was that, in function ‘vc-cvs-after-dir-status’, > the CVS status line ‘cvs status: Examining ’ was excluded when the > function narrows to match, and when it tries to set the local variable > ‘subdir’, as it does not find this line, it skips setting it. As > ‘subdir’ defaults to ‘default-directory’, which is previously set to > repo root (i.e. the argument to function ‘vc-dir’, when ‘subdir’ is used > to construct the relative path to file, concatenating it with the > already-known file base name, it returns the basename, i.e. in > the form ‘name.ext’, with no directory path. This because it constructs > the relative path like ‘(file-relative-name basename subdir)’. Could we just fix that, to address this specific bug? > The patch uses ‘cvs update’ command instead. The implementation was > already there, commented out. I enabled and corrected it. The result > is more correct than the ‘cvs status’ approach, i.e. includes > unregistered and missing, and is faster compared to ‘cvs status’ way. If that change is mostly unrelated to the reported bug, could you send it as two separate patches? Further, do you have any inkling why the 'cvs update' implementation was commented out? Did it require a particular recent version of CVS, maybe? We can ask Dan if you don't. From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 06 19:32:49 2016 Received: (at 24082) by debbugs.gnu.org; 6 Oct 2016 23:32:50 +0000 Received: from localhost ([127.0.0.1]:47036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsI9h-00021i-Nr for submit@debbugs.gnu.org; Thu, 06 Oct 2016 19:32:49 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:34884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsI9g-00021S-90 for 24082@debbugs.gnu.org; Thu, 06 Oct 2016 19:32:48 -0400 Received: by mail-wm0-f41.google.com with SMTP id f193so2201143wmg.0 for <24082@debbugs.gnu.org>; Thu, 06 Oct 2016 16:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=5YBKKQ//r15rfO6GPZSiRtTQYIjUftYYNiP3WAWm4Es=; b=BhpFQURT6bEhcouYkxpi0mi/g17JDnIc/Hns3dyiywmy2TQvddNHdeiPx0ArR0iBA9 rcR5wE1apTDxoTF0PuBKWlL1tg7vOxAAhYR4HKRTXlrDnJQ+uucndY0SB9tBsphPT54J KP1maBePMZZXn2n+Vz2DQgSKYtFUW1OjK59m1qWDD3JmcIBbCqhhgRTJj281GigHEwCx 0ie3AYufBN96VG7hVjVRiosdfN1/fiq/cvolq4/Ed2iwD4M2Bd/coI4LDwDEhFhXcDKv kWmL3BEm1gaNbV430jESWawueTNU3wq94Qme3jWJYaRd3a9F7eCsoyhSf6kAprXGY+fj 9cSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=5YBKKQ//r15rfO6GPZSiRtTQYIjUftYYNiP3WAWm4Es=; b=kALS1SxK4dzFJOJtJo6kgK0ZL4TL40H/mQa5nWFKaVN6XRkk8iPVdtwszr1MbWvMx7 shk/EFTHeLWqGA+Plm3bkWP9MTTT63erREEf+rNz0ooqlsf9g5634L6L4nami9ZHKH84 9CL2Jvjqaro3cxGcSVcekmyG9ayvP9O0iLAXqiqECuLKRh1NN8gr4k01rzXbnh7xnBTl fE4BebhtYNefdGNLLSJZ2ncNtTGB6f1PSSRBXa2rGZJTenE7FcvWBfRY7LmLKvK2OcIi H/Udy4I8IMU6MGgwTI3JqMBbOlPBopOeXQzSv2bRYD5fbIjtRIG2n4IZ6UfrM4VrnISp a/Qw== X-Gm-Message-State: AA6/9RnlTOz6wupeKIguDsGlbJUzFOMwKUMb6ButBQ7hWySMEcwlpRtkH2e2FiJQlOW0ug== X-Received: by 10.28.74.9 with SMTP id x9mr16556792wma.132.1475796762354; Thu, 06 Oct 2016 16:32:42 -0700 (PDT) Received: from [192.168.1.3] ([185.105.174.103]) by smtp.googlemail.com with ESMTPSA id vx7sm16909062wjc.1.2016.10.06.16.32.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Oct 2016 16:32:41 -0700 (PDT) Subject: Re: bug#24082: vc-dir changes working directory (git backend) To: Steve Revilak , 24082@debbugs.gnu.org References: <874m7crwv4.fsf@xi.bootis> <20160730003521.GA17700@srevilak.net> From: Dmitry Gutov Message-ID: <2766cdb8-4cb2-12ea-ccca-c19138f982b8@yandex.ru> Date: Fri, 7 Oct 2016 02:32:40 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:49.0) Gecko/20100101 Thunderbird/49.0 MIME-Version: 1.0 In-Reply-To: <20160730003521.GA17700@srevilak.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 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: 0.5 (/) On 30.07.2016 03:35, Steve Revilak wrote: > At this point emacs prompts "VC status for directory: ~/my-repo", > although the buffer's working directory was "~/my-repo/subdir". > > I press RET at the "VC status for directory: ~/my-repo". Here's what > I see What if you don't just press RET, and pick the directory you wanted first? I don't see a problem here: offering the repository root as default is a reasonable (if new-ish) behavior. We've changed it in commit f30247547, nearly two years ago, and haven't seen any other complaints so far. > I agree with the reporter: the VC status is being reported from the > top-level of the repository, as opposed to the buffer's working > directory. It's reported from the directory you pick, as far as I can see. From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 07 10:46:21 2016 Received: (at 24082) by debbugs.gnu.org; 7 Oct 2016 14:46:22 +0000 Received: from localhost ([127.0.0.1]:47967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsWPl-0006rd-PR for submit@debbugs.gnu.org; Fri, 07 Oct 2016 10:46:21 -0400 Received: from chomsky.autogeree.net ([91.216.110.36]:46636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsWPk-0006rU-6t for 24082@debbugs.gnu.org; Fri, 07 Oct 2016 10:46:20 -0400 Received: from ritchie.wxcvbn.org (localhost [127.0.0.1]) by wxcvbn.org (8.15.2/8.15.2) with ESMTP id u97Ejflq070747 for <24082@debbugs.gnu.org>; Fri, 7 Oct 2016 16:45:41 +0200 (CEST) Received: (from jca@localhost) by ritchie.wxcvbn.org (8.15.2/8.15.2/Submit) id u97EjenP053629; Fri, 7 Oct 2016 16:45:40 +0200 (CEST) From: jca@wxcvbn.org (=?utf-8?Q?J=C3=A9r=C3=A9mie_Courr=C3=A8ges-Anglas?=) To: 24082@debbugs.gnu.org Subject: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory Date: Fri, 07 Oct 2016 16:45:40 +0200 Message-ID: <87twcoz08b.fsf@ritchie.wxcvbn.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 24082 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: -0.0 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable I see this regression using 25.1 (tarball) and emacs-26.0.50 (git). Reverting http://git.savannah.gnu.org/cgit/emacs.git/commit/lisp/vc/vc-cvs.el?id=3D= fa7f79e8234c60ae425f7c3cf1b9486765a7111e fixes the problem here. =2D-=20 jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE OpenBSD emacs port maintainer --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJX97UUAAoJEA36dK4VJOfuvPYP/3U4IEtdyOVaCn7sRKb5rGMO WzR3TUUP/umavRu5qcpHc/xSvWMoqF7uhv9O95pI3SEDCJLj2Z/F18GyxHiykmy9 PSopom3xGFxmeIqEKq0zfCV4Hng88bTyQcDUztB7iHvZ4PM53qYWLm021eu+cCzz uk7j61OVS0p3Iq2hUY9ih+oaO7OvNImX/oWJluXzcqpUle6crxnk1TILKHu4cDB+ EaSRHNpjlgPUmtW0qVLih7KetamV/5LgMIa6X7sqya6lQbN6JFs3e1kiZ9mBd7lE Z2k+wCvJkbRnAWGDPasqu/LAIvlAvOgddaR9LiBPpThZ6eivvZcN1i8Hx3J4tCSn t1l2lKFCQ/WAnr50IZjtVIaDYwczAF+1eeJ0trIucbfyOOf59YLpATqZWun3VRuQ UkpuoxjUxVF0Hl4G2vk3CQGZCUDpNcTiup3iCX7+na0t1ulv1dWaND50ZsAYA0vk 0L7ajemiVT764QZVm0CzrY57hxI5G1hCYGK71jAstbJmSVazY96tDrLQzLJIqqC+ 9jwWvZStVRi49Dru9ognmzAyobZxhPcau7HptlBas9bT0jtNfya0ZWBCMFq7/EQh gdURbqO4pANu09auo+GNmzjHcHAuIjEhaQ4psnSr2KIadDiaakbcKyxtmalv4WrQ 2lGOTSB5H2QYYF9IEyCH =B5jE -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 07 15:15:31 2016 Received: (at 24082) by debbugs.gnu.org; 7 Oct 2016 19:15:31 +0000 Received: from localhost ([127.0.0.1]:48063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsacF-0004sC-G9 for submit@debbugs.gnu.org; Fri, 07 Oct 2016 15:15:31 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:57397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsacD-0004s4-V6 for 24082@debbugs.gnu.org; Fri, 07 Oct 2016 15:15:30 -0400 Received: from mfilter6-d.gandi.net (mfilter6-d.gandi.net [217.70.178.135]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id E6E19172094; Fri, 7 Oct 2016 21:15:28 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter6-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter6-d.gandi.net (mfilter6-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id TYhUWcBWCTMS; Fri, 7 Oct 2016 21:15:26 +0200 (CEST) X-Originating-IP: 88.235.171.29 Received: from localhost (unknown [88.235.171.29]) (Authenticated sender: self@gkayaalp.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id A584417209B; Fri, 7 Oct 2016 21:15:25 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: Dmitry Gutov Subject: Re: bug#24082: [PATCH] Use =?utf-8?B?4oCYY3ZzIHVwZGF0ZeKAmQ==?= instead =?utf-8?B?4oCYY3ZzIHN0YXR1c+KAmQ==?= for CVS *vc-dir* buffers In-Reply-To: (message from Dmitry Gutov on Fri, 7 Oct 2016 02:25:24 +0300) Date: Fri, 07 Oct 2016 22:29:14 +0300 Message-ID: <87y420arg5.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@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: -0.7 (/) On 2016-10-07 02:25:24 AM +0300, Dmitry Gutov wrote: > Hi! Sorry for the long wait. No problem, though actually I'm the one who caused the long delay b/c I was too late to send in copyright papers, sorry :) > > On 28.08.2016 23:17, G=C3=B6ktu=C4=9F Kayaalp wrote: >> Hi, attached is a patch that fixes bug#24082. > > Could you help me reproduce the issue locally first? > > Either by pointing to a publicly available CVS repo with submodules, or=20 > by providing a sequence of commands that would create such repo locally=20 > (we do something like that in vc-tests.el). On a computer with CVS installed, these commands should create a working directory with which the bug can be reproduced: $ cd /tmp $ mkdir cvsroot $ cvs -d /tmp/cvsroot init $ mkdir -p test/subdir $ touch test/testfil test/subdir/subfil $ cd test/ $ cvs -d /tmp/cvsroot/ import $(basename $(pwd)) $(whoami) start $ cd ../ $ mv test test.bkp $ cvs -d /tmp/cvsroot/ co test $ echo test > test/testfil=20 $ echo test > test/subdir/subfil=20 Then, in Emacs, run [ C-x v d /tmp/test RET ], and on =E2=80=98subfil=E2=80= =99, hit =E2=80=98=3D=E2=80=99 (i.e. ask for a diff). >> The reason of the bug was that, in function =E2=80=98vc-cvs-after-dir-st= atus=E2=80=99, >> the CVS status line =E2=80=98cvs status: Examining =E2=80=99 was ex= cluded when the >> function narrows to match, and when it tries to set the local variable >> =E2=80=98subdir=E2=80=99, as it does not find this line, it skips settin= g it. As >> =E2=80=98subdir=E2=80=99 defaults to =E2=80=98default-directory=E2=80=99= , which is previously set to >> repo root (i.e. the argument to function =E2=80=98vc-dir=E2=80=99, when = =E2=80=98subdir=E2=80=99 is used >> to construct the relative path to file, concatenating it with the >> already-known file base name, it returns the basename, i.e. in >> the form =E2=80=98name.ext=E2=80=99, with no directory path. This becau= se it constructs >> the relative path like =E2=80=98(file-relative-name basename subdir)=E2= =80=99. > > Could we just fix that, to address this specific bug? The output for the =E2=80=98cvs status=E2=80=99 command does not provide ad= equate information to reliably and simply construct the full path to each file. The output from the abovementioned command in the checkout the commands I listed created is like follows: ,---- | cvs status: Examining . | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D | File: testfil Status: Locally Modified |=20 | Working revision: 1.1.1.1 Fri Oct 7 18:46:53 2016 | Repository revision: 1.1.1.1 /tmp/cvsroot/test/testfil,v | Sticky Tag: (none) | Sticky Date: (none) | Sticky Options: (none) |=20 | cvs status: Examining subdir | =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D | File: subfil Status: Locally Modified |=20 | Working revision: 1.1.1.1 Fri Oct 7 18:46:53 2016 | Repository revision: 1.1.1.1 /tmp/cvsroot/test/subdir/subfil,v | Sticky Tag: (none) | Sticky Date: (none) | Sticky Options: (none) `---- The code was trying to rememeber the =E2=80=98cvs status: Examining =E2=80=99 line in order to reconstruct the path, a method that's fragile and which requires a lot of regexp magic. =E2=80=98cvs update=E2=80=99, instea= d has a very filter-friendly and determinable output syntax also imitated by other version control software (output for the same checkout): ,---- | $ cvs -fn update -dP | cvs update: Updating . | M testfil | cvs update: Updating subdir | M subdir/subfil `---- The =E2=80=98-n=E2=80=99 argument makes sure the =E2=80=98cvs update=E2=80= =99 command does not alter in any way the working directory (i.e. the checkout), and -f surpresses the user CVS config (~/.cvsrc). I actually sort-a-kind-a fixed the =E2=80=98cvs status=E2=80=99 version ini= tially, but it's waay slower than using update. I don't have that fix anymore, but as I said, using =E2=80=98cvs update=E2=80=99 is more robust, simpler, and = faster. In order to fix the =E2=80=98cvs status=E2=80=99 method, I read the relevant f= iles from the CVS/ subdir of the checkout, reconstruct the absolute module path using info from files therewithin, than subtract that from the third column of the =E2=80=98 Repository version:...=E2=80=99 lines for each file to find i= ts relative path to the checkout's root directory, ending up with a complex and fragile hack, that's also slow and incomplete. >> The patch uses =E2=80=98cvs update=E2=80=99 command instead. The implem= entation was >> already there, commented out. I enabled and corrected it. The result >> is more correct than the =E2=80=98cvs status=E2=80=99 approach, i.e. inc= ludes >> unregistered and missing, and is faster compared to =E2=80=98cvs status= =E2=80=99 way. > > If that change is mostly unrelated to the reported bug, could you send=20 > it as two separate patches? That actually is the fix. =E2=80=98cvs status=E2=80=99 output does not len= d itself to being computed in a simple, reliable manner. The patched function's first half was the implementation of an incomplete and buggy parser for the abovementioned command, and the other half was commented out code to parse the output of =E2=80=98cvs update=E2=80=99. > Further, do you have any inkling why the 'cvs update' implementation was= =20 > commented out? Did it require a particular recent version of CVS, maybe? > > We can ask Dan if you don't. > Well, I'm unaware of both the history of the command and why the related Elisp was commented out, though I do not think that the output format changed in a long time, or that anything else really changed in CVS recently :) I recommend asking someone more knowledgeable than me as I can't see why it was commented out. The related commits are: 798dafb4 and 769303ae, both don't say anything about why. --=20 =C4=B0. G=C3=B6ktu=C4=9F Kayaalp. http://gkayaalp.com/ From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 07 20:38:24 2016 Received: (at 24082) by debbugs.gnu.org; 8 Oct 2016 00:38:24 +0000 Received: from localhost ([127.0.0.1]:48141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsfei-0004AT-L5 for submit@debbugs.gnu.org; Fri, 07 Oct 2016 20:38:24 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsfeh-0004AF-6d for 24082@debbugs.gnu.org; Fri, 07 Oct 2016 20:38:23 -0400 Received: by mail-wm0-f67.google.com with SMTP id f193so5121081wmg.2 for <24082@debbugs.gnu.org>; Fri, 07 Oct 2016 17:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=VoDHp/iXXWSj+eQdI3KdyjN30nl/dVWMcsuq8B3e2gQ=; b=TBbjN7IG1+oRq9JNH+0hM9AXnSZD93QyCpsH6NB1xvsyyXAFVmOdYqvz+onTJRT9nn FCOrToBK+6HmLO5JYqlCKyBPu/2nTnIllhPrBHpmD9RftFC59GM3fOPb7eErR31Qo4CK ITRrh+TF66Ic0U/GGEVWW9RVPLvdCVHZLz7xGpJeEOlir8vD8NvTTEhRqIzt0e2PT/AI OgLTx5pLaekC0U0LJR/jSPnfhtkFBVH+9aIGAyrntHrZt+B+C21yZsS5rY5X47mMMX8e YOw6C9mZMXUyEDaFtsY/NgTYpL22dbThcN+xg8cMtV6h55nUOUMmhaZdy+sW6yfYvSWV tLxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=VoDHp/iXXWSj+eQdI3KdyjN30nl/dVWMcsuq8B3e2gQ=; b=KiN1TvpwvegyJz+dRQI6SHK75AGScn9dSTHqAPk+hmChR7dixiutgjRf1w8FPXGIxF AhgAn7gRbbgLiWAFJvYYIh1OkLlvI8J4NAzdq8YOzx/iLE62Zgha/RUwfgfdS8gqvPao yBaUSQ7pqpGv20puDMIhibPl6g2bsyzw7VAczSocuEl7zB5blg5/EKOH44mrl9jDslyr WmJFenlyYqVxZ8ndQuDczIoqAfl4NVRYzMBiw8iS/K5ABV22cwWEmjqIokeorteeJj5u TRPe1i0fKPtfrxZlZU7/U6CtwQMpHM/eB4oKmY3yXxH+XJfzztHZJAFyy4VTbd71/FZT Eafw== X-Gm-Message-State: AA6/9RnuhZlnrq+aPvGPeHEL43plL53HBaa4/WJnHEY9JdbjzIIn8vYf/7/dltJrA4OxBg== X-Received: by 10.28.27.12 with SMTP id b12mr1085320wmb.1.1475887097271; Fri, 07 Oct 2016 17:38:17 -0700 (PDT) Received: from [192.168.1.3] ([185.105.174.103]) by smtp.googlemail.com with ESMTPSA id uq6sm22009927wjc.37.2016.10.07.17.38.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Oct 2016 17:38:16 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory To: =?UTF-8?B?SsOpcsOpbWllIENvdXJyw6hnZXMtQW5nbGFz?= , 24082@debbugs.gnu.org References: <874m7crwv4.fsf@xi.bootis> <87twcoz08b.fsf@ritchie.wxcvbn.org> From: Dmitry Gutov Message-ID: <0ad0b9e3-b4d6-b162-05fe-8800a0bb8aff@yandex.ru> Date: Sat, 8 Oct 2016 03:38:14 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:49.0) Gecko/20100101 Thunderbird/49.0 MIME-Version: 1.0 In-Reply-To: <87twcoz08b.fsf@ritchie.wxcvbn.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 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: 0.5 (/) Hi! On 07.10.2016 17:45, Jérémie Courrèges-Anglas wrote: > > I see this regression using 25.1 (tarball) and emacs-26.0.50 (git). > > Reverting > > http://git.savannah.gnu.org/cgit/emacs.git/commit/lisp/vc/vc-cvs.el?id=fa7f79e8234c60ae425f7c3cf1b9486765a7111e > > fixes the problem here. I wonder how that could be possible: reverting it gives me a characterp error. But if you mean just replacing `files' with `dir', that seems to work, at the cost of possible performance overhead with larger repositories. Could you try the more complex patch that has been posted here? You can view it at https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24082#15. In particular, I'd like to know whether it fixes this bug for you, and whether it works well with all CVS repositories you work with. From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 07 21:01:31 2016 Received: (at 24082) by debbugs.gnu.org; 8 Oct 2016 01:01:31 +0000 Received: from localhost ([127.0.0.1]:48146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsg15-0004if-Ho for submit@debbugs.gnu.org; Fri, 07 Oct 2016 21:01:31 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:34774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsg14-0004iS-Av for 24082@debbugs.gnu.org; Fri, 07 Oct 2016 21:01:30 -0400 Received: by mail-wm0-f52.google.com with SMTP id i130so7384018wmg.1 for <24082@debbugs.gnu.org>; Fri, 07 Oct 2016 18:01:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=xtn+wVKCbQp18fnaRWyGJgAVlTsqupSPSX6IsDdJgWU=; b=jnjkVtOZ+wABXw2I37xiCwz6ybsNMRk1DUJdIsiJd9agop49K7vKRwYxX4/t8EgvXO MGzfP+L8FfG5Ncfl0A0N9Hn7z8sBcnbknl9hEruFmjXKjZ2H5ZUH5iWaB0Gn37rUGXhl SpWRdoGRHnwgxLBTnKWPRC25YH9OAaDAdQ4PCqwRoKJnRLfO7+J5ZgWqFE8z8QGsg9RB TRT4+Ammdh4qGhweKf3r8dsyITiV+/y+LJHcNnM0RilFBSTMAp8ZuYZ8d+lY/IXKa5Z+ nCKPwmEdtQ04OzVVYj0Bzv+FZIfkp2WsYLE6VVfbPatUIoNd3jiPpKEV/Ef+DEyZ2ZHO 6+rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=xtn+wVKCbQp18fnaRWyGJgAVlTsqupSPSX6IsDdJgWU=; b=Bp5Kp9PjOfe0COQB/owto889yhe7GTS09t9Fs/lhFYOlixAV0iD5a0JRKdyc1wAGcy MmDZeYvnbDjSDkHFkPnfkyt03Tdbetba//xnFASwyKBhlYnrzDaoEoaQpqt2ixEaV98y p1Nu6YjL8U3zdYs0uyauZOZoc7OlW4rXvHwmSmn4gNHa0xq8C32THtRmiSZgcZ3sS2H1 xP+jFY23wjmp4aySarUh89ZZKrWcL0d2MQAFtwpIsRr5gMh1kKpcwLjzsr71Z32l13gy ZK5Cv+hRC1Z8lFb90mP3tt/Ob5qRkCM4SFsyo7PxCNNnz8GfWoO6f8q2kHi1lHFaoO6B H2tw== X-Gm-Message-State: AA6/9Rma7/qediKB2EbSj9QVk6RZWvd/c832Uc59g/7hJWUSLkP0tId/w+hlu1VFnRc1Gw== X-Received: by 10.194.11.100 with SMTP id p4mr18115523wjb.125.1475888484475; Fri, 07 Oct 2016 18:01:24 -0700 (PDT) Received: from [192.168.1.3] ([185.105.174.103]) by smtp.googlemail.com with ESMTPSA id 17sm22059197wju.44.2016.10.07.18.01.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Oct 2016 18:01:23 -0700 (PDT) Subject: =?UTF-8?Q?Re:_bug#24082:_[PATCH]_Use_=e2=80=98cvs_update=e2=80=99_i?= =?UTF-8?Q?nstead_=e2=80=98cvs_status=e2=80=99_for_CVS_*vc-dir*_buffers?= To: =?UTF-8?Q?G=c3=b6ktu=c4=9f_Kayaalp?= References: <87y420arg5.fsf@xi.bootis> From: Dmitry Gutov Message-ID: <4af6dea0-e5e9-6bc7-c10f-a792f16874a5@yandex.ru> Date: Sat, 8 Oct 2016 04:01:22 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:49.0) Gecko/20100101 Thunderbird/49.0 MIME-Version: 1.0 In-Reply-To: <87y420arg5.fsf@xi.bootis> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@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: -0.0 (/) On 07.10.2016 22:29, GöktuÄŸ Kayaalp wrote: > On 2016-10-07 02:25:24 AM +0300, Dmitry Gutov wrote: >> Hi! Sorry for the long wait. > > No problem, though actually I'm the one who caused the long delay b/c I > was too late to send in copyright papers, sorry :) We could have done the review earlier. But anyway... > On a computer with CVS installed, these commands should create a working > directory with which the bug can be reproduced: Thank you, that works. > The output for the ‘cvs status’ command does not provide adequate > information to reliably and simply construct the full path to each > file. The output from the abovementioned command in the checkout the > commands I listed created is like follows: > > ,---- > | cvs status: Examining . > | =================================================================== > | File: testfil Status: Locally Modified > | > | Working revision: 1.1.1.1 Fri Oct 7 18:46:53 2016 > | Repository revision: 1.1.1.1 /tmp/cvsroot/test/testfil,v > | Sticky Tag: (none) > | Sticky Date: (none) > | Sticky Options: (none) > | > | cvs status: Examining subdir > | =================================================================== > | File: subfil Status: Locally Modified > | > | Working revision: 1.1.1.1 Fri Oct 7 18:46:53 2016 > | Repository revision: 1.1.1.1 /tmp/cvsroot/test/subdir/subfil,v > | Sticky Tag: (none) > | Sticky Date: (none) > | Sticky Options: (none) > `---- > > The code was trying to rememeber the ‘cvs status: Examining ’ > line in order to reconstruct the path, a method that's fragile and > which requires a lot of regexp magic. Maybe the problem here is that the output we have to deal with does not contain "Examining subdir" because the current implementation of vc-cvs-dir-status-files passes each individual files name to 'cvs -f status'. And 'cvs -f status testfil subdir/subfil' does not output that line. I think the most reasonable approach for that solution would be to parse the "Repository revision" lines. Apparently, vc-cvs-dir-status-files was always broken for this usage, and the problem has surfaced now when we've reimplemented dir-status on top of dir-status-files. ‘cvs update’, instead has a very > filter-friendly and determinable output syntax also imitated by other > version control software (output for the same checkout): That looks reasonable. However, it looks like a significant change, so I'm not sure it's appropriate for Emacs 25.2. We'd like to get *a* fix into 25.2, however. > I actually sort-a-kind-a fixed the ‘cvs status’ version initially, but > it's waay slower than using update. I don't have that fix anymore, but > as I said, using ‘cvs update’ is more robust, simpler, and faster. In > order to fix the ‘cvs status’ method, I read the relevant files from the > CVS/ subdir of the checkout, reconstruct the absolute module path using > info from files therewithin, than subtract that from the third column of > the ‘ Repository version:...’ lines for each file to find its relative > path to the checkout's root directory, ending up with a complex and > fragile hack, that's also slow and incomplete. Couldn't you subtract those values from default-directory instead? > Well, I'm unaware of both the history of the command and why the related > Elisp was commented out, though I do not think that the output format > changed in a long time, or that anything else really changed in CVS > recently :) I recommend asking someone more knowledgeable than me OK, let's ask Dan. In the meantime, here's a simple fix we can consider. This would still adhere to the dir-status-files protocol, but it's probably slower than ideal: diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index a2499a2..e949f30 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -1073,7 +1073,7 @@ vc-cvs-dir-status-files (if (and (not files) local (not (eq local 'only-file))) (vc-cvs-dir-status-heuristic dir update-function) (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS))) - (vc-cvs-command (current-buffer) 'async files "-f" "status") + (vc-cvs-command (current-buffer) 'async dir "-f" "status") ;; Alternative implementation: use the "update" command instead of ;; the "status" command. ;; (vc-cvs-command (current-buffer) 'async From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 07 21:04:20 2016 Received: (at 24082) by debbugs.gnu.org; 8 Oct 2016 01:04:20 +0000 Received: from localhost ([127.0.0.1]:48150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsg3o-0004mo-28 for submit@debbugs.gnu.org; Fri, 07 Oct 2016 21:04:20 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:37474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsg3m-0004mb-93 for 24082@debbugs.gnu.org; Fri, 07 Oct 2016 21:04:18 -0400 Received: by mail-wm0-f49.google.com with SMTP id b201so70740711wmb.0 for <24082@debbugs.gnu.org>; Fri, 07 Oct 2016 18:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:references:cc:to:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=n2jb+PYkUhY1JT5HBLq2mC9q19zs0U5SRAc8ZCj7Wy0=; b=aUAgVKC5bGSFIno9RMitqdiE+Och0WkiJEr//Ub7nKa8pFSl7YQS4xVxMduOxE1O7X awdJ7T1o1Sd7YCRhBwP4dlcJjkgeFTIP8J+c1ON8nskxqtG0v4PHRFPHadyw0n3egUsU 6gP08laisiwcmqfJGlzn062ATahhWgThgCwtVn+mBf2I4Gz+6MZ0MUyP54ePsVGmy3Za NhAbQ1HmmDp3nWnI2J4LIHon6INR5yVbdFf+f0lsB59IAq2/jB9h6rifuGU/KiWwx/Y9 DPDJ61JO+XJCx66owC+04+ZYquGuux5plKO/av/Vj0Ltjv8rEyIHNeYUG0azdzoaxKli ZLaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:references:cc:to:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=n2jb+PYkUhY1JT5HBLq2mC9q19zs0U5SRAc8ZCj7Wy0=; b=AR9ddEV9JgZdB1rlIny5wliJ6ftg23ZI3eCSw26BHjBt8o0kVT04y0QmFVIHFd/3h2 c4eJAwwcQMiiH7F1vEdw58UZIVAGEVdSjli25H8XDeE6o0/f9NEw9LivKni+866uKz0G xvG1YJTQfuW2w363cjX9LbO15ArfMTjRKQL1AV7iqCCwXdOX9nYEsg4Rt1aWKra+HZ/D LC4sHS0qeQuYdnfwf4z8c6DHDPJ4j416skail+jzOV5Dd+UXLuvu5+6qitcJqtKa+jNv xNr72zn8+VXjzyf/3WeGE2Indi4q87sMbAZAR2E7nl7tRI60WULqLtBUBT8rU5BhN74C n2JA== X-Gm-Message-State: AA6/9Rkwm7XAWsrThF/1Ym49JGU6odQyQ8cUBgC2ce4fixXDk9ua0nL/Foo3gQSuHPaerA== X-Received: by 10.28.148.18 with SMTP id w18mr1133631wmd.108.1475888652550; Fri, 07 Oct 2016 18:04:12 -0700 (PDT) Received: from [192.168.1.3] ([185.105.174.103]) by smtp.googlemail.com with ESMTPSA id 193sm5551724wmo.14.2016.10.07.18.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Oct 2016 18:04:12 -0700 (PDT) Subject: =?UTF-8?Q?Re:_bug#24082:_[PATCH]_Use_=e2=80=98cvs_update=e2=80=99_i?= =?UTF-8?Q?nstead_=e2=80=98cvs_status=e2=80=99_for_CVS_*vc-dir*_buffers?= References: <87y420arg5.fsf@xi.bootis> To: Dan Nicolaescu From: Dmitry Gutov Message-ID: Date: Sat, 8 Oct 2016 04:04:11 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:49.0) Gecko/20100101 Thunderbird/49.0 MIME-Version: 1.0 In-Reply-To: <87y420arg5.fsf@xi.bootis> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 Cc: =?UTF-8?Q?G=c3=b6ktu=c4=9f_Kayaalp?= , 24082@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: 0.5 (/) Hi Dan, Do you remember why you added 'cvs update' based implementation of vc-cvs-dir-status, but decided to leave it commented out, in commit 769303ae? Thanks, Dmitry. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 08 11:15:21 2016 Received: (at 24082) by debbugs.gnu.org; 8 Oct 2016 15:15:21 +0000 Received: from localhost ([127.0.0.1]:48863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bstLM-0003UA-M1 for submit@debbugs.gnu.org; Sat, 08 Oct 2016 11:15:20 -0400 Received: from chomsky.autogeree.net ([91.216.110.36]:47351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bstLL-0003U2-4h for 24082@debbugs.gnu.org; Sat, 08 Oct 2016 11:15:19 -0400 Received: from ritchie.wxcvbn.org (localhost [127.0.0.1]) by wxcvbn.org (8.15.2/8.15.2) with ESMTP id u98FDWCd038000 for <24082@debbugs.gnu.org>; Sat, 8 Oct 2016 17:13:32 +0200 (CEST) Received: (from jca@localhost) by ritchie.wxcvbn.org (8.15.2/8.15.2/Submit) id u98FDVSR016230; Sat, 8 Oct 2016 17:13:31 +0200 (CEST) From: jca@wxcvbn.org (=?utf-8?Q?J=C3=A9r=C3=A9mie_Courr=C3=A8ges-Anglas?=) To: 24082@debbugs.gnu.org Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <874m7crwv4.fsf@xi.bootis> <87twcoz08b.fsf@ritchie.wxcvbn.org> <0ad0b9e3-b4d6-b162-05fe-8800a0bb8aff@yandex.ru> Date: Sat, 08 Oct 2016 17:13:27 +0200 In-Reply-To: <0ad0b9e3-b4d6-b162-05fe-8800a0bb8aff@yandex.ru> (Dmitry Gutov's message of "Sat, 8 Oct 2016 03:38:14 +0300") Message-ID: <87h98mzxew.fsf@ritchie.wxcvbn.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 24082 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: -0.0 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dmitry Gutov writes: > Hi! Hi, > On 07.10.2016 17:45, J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas wrote: >> >> I see this regression using 25.1 (tarball) and emacs-26.0.50 (git). >> >> Reverting >> >> http://git.savannah.gnu.org/cgit/emacs.git/commit/lisp/vc/vc-cvs.el?id= =3Dfa7f79e8234c60ae425f7c3cf1b9486765a7111e >> >> fixes the problem here. > > I wonder how that could be possible: reverting it gives me a characterp > error. But if you mean just replacing `files' with `dir', that seems to > work, at the cost of possible performance overhead with larger > repositories. Oops, sorry. Yes indeed, I only replaced `files' with `dir'. > Could you try the more complex patch that has been posted here? You can > view it at https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#15. > > In particular, I'd like to know whether it fixes this bug for you, It does. > and > whether it works well with all CVS repositories you work with. Works fine, there are some differences. With just `files' replaced with `dir': =2D-8<-- VC backend : CVS Working dir: /usr/ports/editors/ Repository : /cvs Module : ports/editors ./ emacs/ edited emacs/Makefile edited emacs/distinfo emacs/patches/ edited emacs/patches/patch-Makefile_in edited emacs/patches/patch-configure removed emacs/patches/patch-src_unexelf_c emacs/pkg/ edited emacs/pkg/PFRAG.no-no_x11 edited emacs/pkg/PLIST =2D->8-- With the patch in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#15: =2D-8<-- VC backend : CVS Working dir: /usr/ports/editors/ Repository : /cvs Module : ports/editors ./ unregistered .//emacs-wip emacs/ edited .//emacs/Makefile edited .//emacs/distinfo emacs/patches/ edited .//emacs/patches/patch-Makefile_in edited .//emacs/patches/patch-configure unregistered .//emacs/patches/patch-lisp_vc_vc-cvs_el unregistered .//emacs/patches/patch-lisp_vc_vc_el removed .//emacs/patches/patch-src_unexelf_c emacs/pkg/ edited .//emacs/pkg/PFRAG.no-no_x11 edited .//emacs/pkg/PLIST =2D->8-- So the patched version shows unregistered files and directories, which is good, but has formatting artifacts (`.//' above). Also, pressing `=3D' on `.//emacs-wip', I get the following in *Messages*: ... Traversing directory /usr/ports/editors/...done Finding changes in /usr/ports/editors/emacs-wip... vc-find-backend-function: Cannot open load file: No such file or directory,= vc-nil even though the directory contains a CVS dir, and cvs(1) works fine in it. I don't think it's a big problem though. =2D-=20 jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJX+Q0XAAoJEA36dK4VJOfuwK8QAI0uOKsO39fpk2cIHKroyk3H M0mX5PRDNe3zEYq4sHWtS5ovq7XH8jAabDrtHyIKDoXWv7sYDNE4PovFf7Dz09Mo i8/r7Oq2pimwFF+EtY+jNJQxk8cV+juu6ZzRds77ETI4EYAtBY5jIJFbYUV+YgBR V+RyVcxaE0s7KiQoK12N1l6yYvCLuDuQqR8xX/CeR0Xemp3SuG4RYMMAdeZBHTS3 zUxYJKIWTwsaBFThsgIn926s8k94/V8ekJluWX2/kwPI0PaVhO7GS/7GGA5KkzBh MQuK0dOnFGiR/p9BXKcebHHhlpJhxQ72hnVkXOEl3LvKXLrKp7iXw334HiyHom3R hrmoIORYA/465zivLbzt2OAdJO6D7F/+cFO8rkPRvo1h9i/vN07xDScbDVacFZ0d XLKja2Q/+W99qNtzVLPYP3A+Yjn2d4ai4VWRiyJoqTJVNNyqF64pLvUMgJ3nh504 DQVhob2ojw0jG6rDLxPo2Jwn/4yeNKY9hCUUzqhNqqQNLgtUaInbffML62uZwOzF ID3+Xjne5V2npZn9X8qQkiAwenFX3b6K2cM78tDIyvL0J3zta+dPfSrjO7zHV9jh 7LbgoW1ipygWFBT6/5BT1m88Ny9HOBipV1do9bEt+uoDgR8Pa01fz2yh1aMdFphh d1Y81WXsrZEAN5PvQRK0 =Hd6v -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 08 16:06:21 2016 Received: (at 24082) by debbugs.gnu.org; 8 Oct 2016 20:06:22 +0000 Received: from localhost ([127.0.0.1]:49065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsxsy-0003wl-IL for submit@debbugs.gnu.org; Sat, 08 Oct 2016 16:06:21 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsxsx-0003wX-8E for 24082@debbugs.gnu.org; Sat, 08 Oct 2016 16:06:19 -0400 Received: by mail-wm0-f49.google.com with SMTP id k125so86628495wma.1 for <24082@debbugs.gnu.org>; Sat, 08 Oct 2016 13:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=hfULslowYTKKNvesY5eaqOucHpOHOp3t5uO034ghQzw=; b=AVg+v1b+s+Ml5rbY6NRdyfIRtBHFwPg5iaaKXxK3OyxwjhnYVsktvL64cHsTkoV7f7 5rvAVCt3po4ngMOQMWyJJtv0y8YHbN6nRbmbXg1PJR+dQwyv7RgLeCNKqYJTXb6z/YF5 e3ysOvPaUDcei/zp5XWGqE8cPbopsZkG1As61o6l0OjKuzz6fPnwF3DYTx4efz0MoO+s B9f+FPLS5IAbew8gLt5fY0a5uM/MfUw7M5FimbUvoBGRupTpx3B5N9+Jr7qQxUbpMOOh 59eT5FwB5wuLP+K4r4+CjCOplvQ6iaIMgGVA8gmX70lf+WiqgQV9+qsLb85/JMIKHUhk xOvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=hfULslowYTKKNvesY5eaqOucHpOHOp3t5uO034ghQzw=; b=amk/RSCZr8w3MXePXMbRFt6ppqsK+gLhLvsEmyroiUqUUNka8saIyFPLdJi3XNXXb4 FzcrZbbhBdXPiey+EcbyY3IIT2mPB6kCCnmYKNBPzO2bJ7W/IcntPuAYeIC6bEiSKt/x FLMC3QYVSNnEhim3LJHbp6wGAqL2ryHeehxya78Tpp/wN6rD/6DscDGSTRtzhtHSWjsv ByMPQfjLylkIzjTBj6IUWtoe2OpJaIc/2y9cJO2+/AL123UiLpNznsFWUC8x9fdDmJsJ QiyYawb4upiyIOoMSGDDAd2aZrDA4eA6wcWRJqnb1W7stJFPokXmurbZwX0PTDWDsXbi Lpaw== X-Gm-Message-State: AA6/9RkiUyeUxcYCBSwAkkEvxcjlkKoieBBqVN0nUvqsrwuhzxEwjy0fXG/dmu4aFoS0iA== X-Received: by 10.28.186.6 with SMTP id k6mr3665625wmf.101.1475957173095; Sat, 08 Oct 2016 13:06:13 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id rv12sm2048851wjb.29.2016.10.08.13.06.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Oct 2016 13:06:12 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory To: =?UTF-8?B?SsOpcsOpbWllIENvdXJyw6hnZXMtQW5nbGFz?= , 24082@debbugs.gnu.org References: <874m7crwv4.fsf@xi.bootis> <87twcoz08b.fsf@ritchie.wxcvbn.org> <0ad0b9e3-b4d6-b162-05fe-8800a0bb8aff@yandex.ru> <87h98mzxew.fsf@ritchie.wxcvbn.org> From: Dmitry Gutov Message-ID: <7ebca0e9-bb76-8329-7848-0d1ec0016176@yandex.ru> Date: Sat, 8 Oct 2016 23:06:10 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:49.0) Gecko/20100101 Thunderbird/49.0 MIME-Version: 1.0 In-Reply-To: <87h98mzxew.fsf@ritchie.wxcvbn.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 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: 0.5 (/) On 08.10.2016 18:13, Jérémie Courrèges-Anglas wrote: > Oops, sorry. Yes indeed, I only replaced `files' with `dir'. OK, good. Any obvious problems with that solution? I don't work with CVS at all, and if you (or anyone else) interact with any particularly big repositories, I'd love to hear how it fares there. >> and >> whether it works well with all CVS repositories you work with. > > Works fine, there are some differences. That's too bad. I've tried the patch myself, and I didn't see those, neither with the temporary repository created using GöktuÄŸ's instructions, nor with a random GNU CVS repo I cloned afterwards. Might there be something special with the repo you're trying it on? Maybe the fact that the working dir and the repository root only have the root directory as the common ancestor? Just a random guess. > So the patched version shows unregistered files and directories, which > is good, but has formatting artifacts (`.//' above). Also, pressing `=' > on `.//emacs-wip', I get the following in *Messages*: > > ... > Traversing directory /usr/ports/editors/...done > Finding changes in /usr/ports/editors/emacs-wip... > vc-find-backend-function: Cannot open load file: No such file or directory, vc-nil > > even though the directory contains a CVS dir, and cvs(1) works fine in > it. I don't think it's a big problem though. Agree, that doesn't sound like too big of a problem. And seeing unregistered files is pretty much working as intended. Alas, I see them in both versions of the code (the one using `dir', and the one using 'cvs update'). Any ideas why you're seeing differently? Do you have a non-default value of vc-cvs-stay-local, maybe? From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 09 08:04:52 2016 Received: (at 24082) by debbugs.gnu.org; 9 Oct 2016 12:04:52 +0000 Received: from localhost ([127.0.0.1]:49388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btCqa-0006kz-5V for submit@debbugs.gnu.org; Sun, 09 Oct 2016 08:04:52 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:54149) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btCqY-0006kr-GO for 24082@debbugs.gnu.org; Sun, 09 Oct 2016 08:04:51 -0400 Received: from mfilter21-d.gandi.net (mfilter21-d.gandi.net [217.70.178.149]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 641DA172098; Sun, 9 Oct 2016 14:04:49 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter21-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter21-d.gandi.net (mfilter21-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id PaRN1q1ZlPOi; Sun, 9 Oct 2016 14:04:47 +0200 (CEST) X-Originating-IP: 88.235.171.29 Received: from localhost (unknown [88.235.171.29]) (Authenticated sender: self@gkayaalp.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 06D97172094; Sun, 9 Oct 2016 14:04:46 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: Dmitry Gutov Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory In-Reply-To: <7ebca0e9-bb76-8329-7848-0d1ec0016176@yandex.ru> (message from Dmitry Gutov on Sat, 8 Oct 2016 23:06:10 +0300) Date: Sun, 09 Oct 2016 15:18:42 +0300 Message-ID: <87wphh67h9.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.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: -0.7 (/) On 2016-10-08 11:06:10 PM +0300, Dmitry Gutov wrote: > On 08.10.2016 18:13, J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas wrote: >> Oops, sorry. Yes indeed, I only replaced `files' with `dir'. > OK, good. Any obvious problems with that solution? [...] Does not show unregistered files at all, so need to add them from shell. In fact, =E2=80=98cvs status=E2=80=99 command itself does not know anything= about unregistered files at all, it only deals with registered files. >> [... G=C3=B6ktu=C4=9F's patch works] fine, there are some differences. > > That's too bad. I've tried the patch myself, and I didn't see those,=20 > neither [...] > Might there be something special with the repo you're trying it on?=20 I've been using the patch since I submitted it, first on 25.1 release candidates and then on 25.1 release itself, and have not encountered any of these problems. And most of my source-controlled stuff is in CVS. I'd say the local configuration or the patch application may have caused this problems. I'd be glad if J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas could post output fr= om =E2=80=98cvs -fnq update=E2=80=99 in that checkout, I could maybe use it to understand the situation (BTW the =E2=80=98cvs -fn update -dP=E2=80=99 command I gave as a= n example in my previous message was mistaken, I took it from the =E2=80=98-=E2=80=99 li= nes of the patch, sorry). >> So the patched version shows unregistered files and directories, which >> is good, but has formatting artifacts (`.//' above). Also, pressing `= =3D' >> on `.//emacs-wip', I get the following in *Messages*: >> >> ... >> Traversing directory /usr/ports/editors/...done >> Finding changes in /usr/ports/editors/emacs-wip... >> vc-find-backend-function: Cannot open load file: No such file or directo= ry, vc-nil >> >> even though the directory contains a CVS dir, and cvs(1) works fine in >> it. I don't think it's a big problem though. > > Agree, that doesn't sound like too big of a problem. > > And seeing unregistered files is pretty much working as intended. Alas,=20 > I see them in both versions of the code (the one using `dir', and the=20 > one using 'cvs update'). I don't see unregistered files with the dir version. > Any ideas why you're seeing differently? Do you have a non-default value= =20 > of vc-cvs-stay-local, maybe? If he's using the port from the repo in his message, the =E2=80=98lisp/vc/v= c.el=E2=80=99 file seems to be patched and that may be conflicting. If possible, I ask J=C3=A9r=C3=A9mie to test my patch on master or 25.1 release without al= l those other patches, (applying it on package root w/ =E2=80=98patch -p 0=E2=80=99= ), and running emacs w/ -Q flag. Also, =E2=80=98vc-cvs-stay-local=E2=80=99 does not cause any problem, I jus= t set it to =E2=80=98.*=E2=80=99 and tested, the output is as expected for me: ,---- | VC backend : CVS | Working dir: /tmp/emacs.d/ | Repository : /igk/cvsroot | Module : emacs.d |=20 |=20 | ./ | site/ | unregistered site/test.el `---- --=20 =C4=B0. G=C3=B6ktu=C4=9F Kayaalp. http://gkayaalp.com/ From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 10 12:43:03 2016 Received: (at 24082) by debbugs.gnu.org; 10 Oct 2016 16:43:03 +0000 Received: from localhost ([127.0.0.1]:51403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btdfK-0004Mk-NS for submit@debbugs.gnu.org; Mon, 10 Oct 2016 12:43:03 -0400 Received: from chomsky.autogeree.net ([91.216.110.36]:48983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btdfI-0004MG-Lu for 24082@debbugs.gnu.org; Mon, 10 Oct 2016 12:43:01 -0400 Received: from ritchie.wxcvbn.org (localhost [127.0.0.1]) by wxcvbn.org (8.15.2/8.15.2) with ESMTP id u9AGfs0Z085064; Mon, 10 Oct 2016 18:41:54 +0200 (CEST) From: jca@wxcvbn.org (=?utf-8?Q?J=C3=A9r=C3=A9mie_Courr=C3=A8ges-Anglas?=) To: =?utf-8?B?R8O2a3R1xJ8=?= Kayaalp Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <87wphh67h9.fsf@xi.bootis> Date: Mon, 10 Oct 2016 18:41:54 +0200 Message-ID: <877f9gqhpp.fsf@ritchie.wxcvbn.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, Dmitry Gutov 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: -0.0 (/) G=C3=B6ktu=C4=9F Kayaalp writes: > On 2016-10-08 11:06:10 PM +0300, Dmitry Gutov wrote: >> On 08.10.2016 18:13, J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas wrote: >>> Oops, sorry. Yes indeed, I only replaced `files' with `dir'. >> OK, good. Any obvious problems with that solution? [...] > > Does not show unregistered files at all, so need to add them from shell. > In fact, =E2=80=98cvs status=E2=80=99 command itself does not know anythi= ng about > unregistered files at all, it only deals with registered files. > >>> [... G=C3=B6ktu=C4=9F's patch works] fine, there are some differences. >> >> That's too bad. I've tried the patch myself, and I didn't see those,=20 >> neither [...] >> Might there be something special with the repo you're trying it on?=20 Well, the repo is a local mirror of the OpenBSD cvs repo, stored in /cvs (/d/cvs today, after I had to do partitioning changes). There may be special settings in that repo, but the /tmp/test repo set up by the script in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#33 shows the same artifacts (see below). > I've been using the patch since I submitted it, first on 25.1 release > candidates and then on 25.1 release itself, and have not encountered any > of these problems. And most of my source-controlled stuff is in CVS. > I'd say the local configuration or the patch application may have caused > this problems. > > I'd be glad if J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas could post output = from =E2=80=98cvs -fnq > update=E2=80=99 in that checkout, I could maybe use it to understand the > situation (BTW the =E2=80=98cvs -fn update -dP=E2=80=99 command I gave as= an example in > my previous message was mistaken, I took it from the =E2=80=98-=E2=80=99 = lines of the > patch, sorry). /usr/ports/editors$ cvs -fnq update ? emacs-wip ? unregistered-file M emacs/Makefile M emacs/distinfo M emacs/patches/patch-Makefile_in M emacs/patches/patch-configure R emacs/patches/patch-src_unexelf_c ? emacs/patches/patch-lisp_vc_vc-cvs_el ? emacs/patches/patch-lisp_vc_vc_el M emacs/pkg/PFRAG.no-no_x11 M emacs/pkg/PLIST The output is the same if I rename my ~/.cvsrc, which contains: --8<-- cvs -q diff -uNp update -Pd checkout -P -->8-- probably irrelevant, since you specify -f. Note that this is cvs from the base OpenBSD system: --8<-- $ cvs --version Concurrent Versions System (CVS) 1.11.1p1 (client/server) ... -->8-- which AFAIK doesn't contain differences wrt cvs update from upstream cvs-1.11.1p1. >>> So the patched version shows unregistered files and directories, which >>> is good, but has formatting artifacts (`.//' above). Also, pressing `= =3D' >>> on `.//emacs-wip', I get the following in *Messages*: >>> >>> ... >>> Traversing directory /usr/ports/editors/...done >>> Finding changes in /usr/ports/editors/emacs-wip... >>> vc-find-backend-function: Cannot open load file: No such file or direct= ory, vc-nil >>> >>> even though the directory contains a CVS dir, and cvs(1) works fine in >>> it. I don't think it's a big problem though. >> >> Agree, that doesn't sound like too big of a problem. >> >> And seeing unregistered files is pretty much working as intended. Alas,= =20 >> I see them in both versions of the code (the one using `dir', and the=20 >> one using 'cvs update'). > > I don't see unregistered files with the dir version. > >> Any ideas why you're seeing differently? Do you have a non-default value= =20 >> of vc-cvs-stay-local, maybe? I had it in my ~/.emacs.d/init.el (I since removed it), but I ran my tests with emacs -q, so it shouldn't affect the results anyway. Also note that the OpenBSD emacs package doesn't ship with a start file, so -q and -Q should be equivalent: /usr/local/share/emacs$ find . -name site-start.el /usr/local/share/emacs$ > If he's using the port from the repo in his message, the =E2=80=98lisp/vc= /vc.el=E2=80=99 > file seems to be patched and that may be conflicting. If possible, I > ask J=C3=A9r=C3=A9mie to test my patch on master or 25.1 release without = all those > other patches, (applying it on package root w/ =E2=80=98patch -p 0=E2=80= =99), and > running emacs w/ -Q flag. Here's the patch you spotted, it suppresses messages that slow down vc-dir processes, but shouldn't affect the inner workings of vc-cvs. Note that I first tested your patch using the master branch of the git repo, which doesn't contain the patch below. ;$OpenBSD$ ; ;- kill messages that slow down emacs at startup with many vc-dir opened. ; ;--- lisp/vc/vc.el.orig Mon Oct 3 23:42:15 2016 ;+++ lisp/vc/vc.el Mon Oct 3 23:43:16 2016 ;@@ -2897,13 +2897,11 @@ to provide the `find-revision' operation instead." ; (defun vc-file-tree-walk (dirname func &rest args) ; "Walk recursively through DIRNAME. ; Invoke FUNC f ARGS on each VC-managed file f underneath it." ;- (vc-file-tree-walk-internal (expand-file-name dirname) func args) ;- (message "Traversing directory %s...done" dirname)) ;+ (vc-file-tree-walk-internal (expand-file-name dirname) func args)) ;=20 ; (defun vc-file-tree-walk-internal (file func args) ; (if (not (file-directory-p file)) ; (when (vc-backend file) (apply func file args)) ;- (message "Traversing directory %s..." (abbreviate-file-name file)) ; (let ((dir (file-name-as-directory file))) ; (mapcar ; (lambda (f) (or For completeness, here are the results with: 1. /usr/ports/editors, using emacs-25.1 and your patch --8<-- VC backend : CVS Working dir: /usr/ports/editors/ Repository : /d/cvs Module : ports/editors ./ unregistered .//emacs-wip unregistered .//unregistered-file emacs/ edited .//emacs/Makefile edited .//emacs/distinfo emacs/patches/ edited .//emacs/patches/patch-Makefile_in edited .//emacs/patches/patch-configure unregistered .//emacs/patches/patch-lisp_vc_vc-cvs_el removed .//emacs/patches/patch-src_unexelf_c emacs/pkg/ edited .//emacs/pkg/PFRAG.no-no_x11 edited .//emacs/pkg/PLIST -->8-- 2. your /tmp/test testcase, from the cli and from vc, using emacs-master: /tmp/test$ cvs -fnq update M testfil M subdir/subfil /tmp/test$ emacs -Q . --8<-- VC backend : CVS Working dir: /tmp/test/ Repository : /tmp/cvsroot/ Module : test ./ edited .//testfil subdir/ edited .//subdir/subfil -->8-- 3. your /tmp/test testcase, from vc, using emacs-master and your patch: /tmp/test$ $HOME/src/emacs-master/src/emacs -Q . --8<-- VC backend : CVS Working dir: /tmp/test/ Repository : /tmp/cvsroot/ Module : test ./ edited .//testfil subdir/ edited .//subdir/subfil -->8-- --=20 jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 10 19:55:27 2016 Received: (at 24082) by debbugs.gnu.org; 10 Oct 2016 23:55:28 +0000 Received: from localhost ([127.0.0.1]:51552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btkPn-0007pZ-Og for submit@debbugs.gnu.org; Mon, 10 Oct 2016 19:55:27 -0400 Received: from mail-lf0-f45.google.com ([209.85.215.45]:36426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btkPm-0007pK-4l for 24082@debbugs.gnu.org; Mon, 10 Oct 2016 19:55:26 -0400 Received: by mail-lf0-f45.google.com with SMTP id b75so9067748lfg.3 for <24082@debbugs.gnu.org>; Mon, 10 Oct 2016 16:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=ZZbYf13vK9YAsWA2cRu1PH2hkiWXdEu6xnWiCu9BZ6U=; b=BL15ddkyRUEyvWzLrq80aBscqvFpsFYjpiTo/0ZBTbCCh/ngWtAH5z00T+iG5+J2wu 9u3PrSUfPpZAo8wRwY+qYVfnwXzjqlJsQHo0ZdtKeR4Y+6/v8xEeN1M9E09rM+SZvN3M Xj4ZHuhGgabjUualzU2n4ghKp1McFccpww8OK9lIZ9aEzPiRWUnzLLKdEJCdp059hA76 5UP7l0CgOBFoqbMMsoLUO57yKq6eQ1KX5QqEVniSoKXmhnVxmP0iZ+Pe1g8EkgfnWg1p dZRIlTZM6dIZLLKN462SLPrNAOjNuK6mzfe41c4onb/dpgsSmwdH2Lwh4dvGPUyQuJaw pRgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ZZbYf13vK9YAsWA2cRu1PH2hkiWXdEu6xnWiCu9BZ6U=; b=SL+pyAKvEyH+MaGdpTtiibge8ocCODhZ1EU4Opglo+nEfFr1DXs2E8TMGSRL/cqm/0 GFi1kyt1MW953fsM+2RwJjum0ddNUDPxVaXakSBvbWD8nWejmWtankWk13Ahbftb4KRN f4DsGvgiZeTyS3mj+VIfeMehjY26ExExfV3hadSgIEgcz4UWyfo7NOGb6wn7/CZi1nyJ 6JmbGM9i2HHJF+luFcsGJ1+8I7lLnP4nkRi1WSZK8gnggAheEvCEXpCkoF5NF1Yt2hPz 878wGaO+d3SzMw3g3Q/Ng1s1aox8ffVKMUh2Mdm+EKLeBxwEUO6AWwKIDHHe7daiKAn3 Fa0Q== X-Gm-Message-State: AA6/9RkX1e3UaQJp5BjYVORF5ysh5e5LPEXSovzQrZPKTyb1WTtQIt2uVOU0TRrUKW2u2g== X-Received: by 10.194.250.106 with SMTP id zb10mr775977wjc.99.1476143719853; Mon, 10 Oct 2016 16:55:19 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id ce6sm1018825wjc.27.2016.10.10.16.55.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Oct 2016 16:55:19 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory To: =?UTF-8?Q?G=c3=b6ktu=c4=9f_Kayaalp?= References: <874m7crwv4.fsf@xi.bootis> <87wphh67h9.fsf@xi.bootis> From: Dmitry Gutov Message-ID: Date: Tue, 11 Oct 2016 02:55:17 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 MIME-Version: 1.0 In-Reply-To: <87wphh67h9.fsf@xi.bootis> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.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: 0.5 (/) On 09.10.2016 15:18, GöktuÄŸ Kayaalp wrote: > Does not show unregistered files at all, so need to add them from shell. > In fact, ‘cvs status’ command itself does not know anything about > unregistered files at all, it only deals with registered files. For some reason, I get 'cvs -f status' include the unregistered files in the output with the remote repo, but not with the one I've created from your test scenario. With the remote one, the output looks like: cvs -f status ? asdasd ? tests/foo cvs status: Examining . =================================================================== File: AUTHORS Status: Up-to-date Working revision: 1.1 Repository revision: 1.1 /sources/public/recut/AUTHORS,v Commit Identifier: 6fOuIAy2oJtoJf6y Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) =================================================================== File: COPYING Status: Locally Modified Working revision: 1.1 Repository revision: 1.1 /sources/public/recut/COPYING,v Commit Identifier: 6fOuIAy2oJtoJf6y Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) ... From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 10 21:55:56 2016 Received: (at 24082) by debbugs.gnu.org; 11 Oct 2016 01:55:56 +0000 Received: from localhost ([127.0.0.1]:51583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btmIO-0002Fi-5m for submit@debbugs.gnu.org; Mon, 10 Oct 2016 21:55:56 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:52569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btmIM-0002FZ-8R for 24082@debbugs.gnu.org; Mon, 10 Oct 2016 21:55:54 -0400 Received: from mfilter2-d.gandi.net (mfilter2-d.gandi.net [217.70.178.140]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id 2DEE2FB882; Tue, 11 Oct 2016 03:55:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter2-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter2-d.gandi.net (mfilter2-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id bdUjwpYtSU_c; Tue, 11 Oct 2016 03:55:51 +0200 (CEST) X-Originating-IP: 88.235.171.29 Received: from localhost (unknown [88.235.171.29]) (Authenticated sender: self@gkayaalp.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id C9E89FB89F; Tue, 11 Oct 2016 03:55:49 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: Dmitry Gutov Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory In-Reply-To: (message from Dmitry Gutov on Tue, 11 Oct 2016 02:55:17 +0300) Date: Tue, 11 Oct 2016 05:09:46 +0300 Message-ID: <87shs3y6tx.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.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: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2016-10-11 02:55 +0300, Dmitry Gutov wrote: > On 09.10.2016 15:18, G=C3=B6ktu=C4=9F Kayaalp wrote: > >> Does not show unregistered files at all, so need to add them from shell. >> In fact, =E2=80=98cvs status=E2=80=99 command itself does not know anyth= ing about >> unregistered files at all, it only deals with registered files. > > For some reason, I get 'cvs -f status' include the unregistered files in= =20 > the output with the remote repo, but not with the one I've created from=20 > your test scenario. With the remote one, the output looks like: > > cvs -f status > ? asdasd > ? tests/foo > [... snip ...] > Commit Identifier: 6fOuIAy2oJtoJf6y > [... snip ...] This looks like a CVSNT server[1] (given the =E2=80=98commit identifier=E2= =80=99), so that may be the cause. I don't have a remote repo now, I'll try with one as soon as I'll have free time (I'll try with OpenBSD src/). Or it may be the artifact of the missing =E2=80=98-q=E2=80=99 flag to cvs, or som= e config on the remote. I'm mostly a user of CVS so I don't know these detail, sorry. Would you mind trying =E2=80=98cvs -fnq update=E2=80=99 and =E2=80=98cvs -f= q status=E2=80=99 with that server too? The GNU CVS manpage describes the =E2=80=98status=E2=80=99 comment thus: ,---- cvs(5) | status Show current status of files: latest version, version in working | directory, whether working version has been edited and, option- | ally, symbolic tags in the RCS file. (Does not change reposi- | tory or working directory.) `---- Which sort-a indicates that its scope is registered files, as non-registered files would not have latest versions or modification statuses. [1] It is a fork of CVS in 2004, backwards compatible with many new features ap per the wiki says: https://en.wikipedia.org/wiki/CVSNT =2D-=20 =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp PGP pubkey: --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX/EnrAAoJEEZc2UmxASQn0XsP/iKF0fpFhAyZE4SMNI55oBlr on6PF4Ps6H8e8cg5y3KKjybl6m45PqVA7h8cYlpYEHZfP8V3YWv8qAk7Ua7FT/6b DNfMt/NROzX94taOoyKMUIbqdo30d3c8b3bLwawk/LCCM9vjQiva3SjHBe0l1D+3 yQywdggKdAhYYCsU9zrBTz1o2FJusYNSetQaTHg+Bxi4spIpTcWm+BuDQeF1fXEx cPevoHYXz7ZX5gTaW8QPKJ+mC7kgpRDzjISc7jh8P3USL5+DWkjHK9tfBd00+ZaL vmurRS7schZBBFdw6SH0sm9+9bUhtNHS1sSm06N2TmIeVIfzpH9dRd4P+PMtevZs 9FgH6lbgepDeN4gKh3Pwn7r+DkHpF9GxyOLhtTp12yPrzQycFA/S/0w3vJBLhxH4 YJFO5u1gv4OpbmVQSiwSyhM9uZ43x6+bt+pMrPDWzpQbkEiq9bp4vDbcnrb7KYqB lYhzdnKr18ZhG9AX42C83kEjNWpr4UNO5zPYRwBqB6aGpaHthzbS+Ta5pD3NBJ30 V1Gz6nkjcfslF+t2D+/G7KbE+Zl9NWStzrLUP8POouhCn6WrLqnJyeUyWqSQdF/A rNd2jLzGOt1kYtLLiU1x+IMu2+Ofp2W1ppwaos9Ra5VnYYBbWBFRsCrisN+wje46 8Et3CG22QBoS8PjN1jG3 =tdu3 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 11 03:51:33 2016 Received: (at 24082) by debbugs.gnu.org; 11 Oct 2016 07:51:33 +0000 Received: from localhost ([127.0.0.1]:51664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btrqX-0002DA-An for submit@debbugs.gnu.org; Tue, 11 Oct 2016 03:51:33 -0400 Received: from mx2.suse.de ([195.135.220.15]:34759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btrqV-0002D1-6I for 24082@debbugs.gnu.org; Tue, 11 Oct 2016 03:51:31 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 16A3AAC29; Tue, 11 Oct 2016 07:51:30 +0000 (UTC) From: Andreas Schwab To: =?utf-8?B?R8O2a3R1xJ8=?= Kayaalp Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <874m7crwv4.fsf@xi.bootis> <87shs3y6tx.fsf@xi.bootis> X-Yow: Kids, don't gross me off.. ``Adventures with MENTAL HYGIENE'' can be carried too FAR! Date: Tue, 11 Oct 2016 09:51:29 +0200 In-Reply-To: <87shs3y6tx.fsf@xi.bootis> (=?utf-8?B?IkfDtmt0dcSf?= Kayaalp"'s message of "Tue, 11 Oct 2016 05:09:46 +0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.org, Dmitry Gutov 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 (--) On Okt 11 2016, GöktuÄŸ Kayaalp wrote: > On 2016-10-11 02:55 +0300, Dmitry Gutov wrote: >> On 09.10.2016 15:18, GöktuÄŸ Kayaalp wrote: >> >>> Does not show unregistered files at all, so need to add them from shell. >>> In fact, ‘cvs status’ command itself does not know anything about >>> unregistered files at all, it only deals with registered files. >> >> For some reason, I get 'cvs -f status' include the unregistered files in >> the output with the remote repo, but not with the one I've created from >> your test scenario. With the remote one, the output looks like: >> >> cvs -f status >> ? asdasd >> ? tests/foo >> [... snip ...] >> Commit Identifier: 6fOuIAy2oJtoJf6y >> [... snip ...] > > This looks like a CVSNT server[1] (given the ‘commit identifier’), so Commit identifiers are also implemented in CVS. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 11 04:51:43 2016 Received: (at 24082) by debbugs.gnu.org; 11 Oct 2016 08:51:43 +0000 Received: from localhost ([127.0.0.1]:51704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btsmh-0006rD-MJ for submit@debbugs.gnu.org; Tue, 11 Oct 2016 04:51:43 -0400 Received: from mail-lf0-f50.google.com ([209.85.215.50]:34078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btsmc-0006qu-MS for 24082@debbugs.gnu.org; Tue, 11 Oct 2016 04:51:38 -0400 Received: by mail-lf0-f50.google.com with SMTP id b81so30153319lfe.1 for <24082@debbugs.gnu.org>; Tue, 11 Oct 2016 01:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=oYWRGMrirekcurwA3/v4ECh/rIhM+5wuSMHbGkUKhSI=; b=d5FJjh6p7ivhFJ7a7V6IImFGzQaiCxCR4413Xcz5M0l5qWqzs1RXzRn/fDUe5z6F7D FeYB7W28rtlexyXc2AtmFiEfB4Dghxc91LdytpIdUFSjcizyx/vYU3JidnnRrGz2pZD3 8NyiW1Aagyc7NRyokXAUrxXvL8dk46N5dRZIkUJIIfdRnnqDvM4zMHJ0JDyXKlWJsC2j TjbYvp9QYfhl48RrcfiTXKkmiJVcyewQ6jbgzGaSXG3rF+7KYZiWEOZqbqSEqD8kjFST VVjISpncMkw6yHn6h8DJehxPe5DDSs66Szq8aPFwlO1RLF2LiES7UxVHsn5ctnt6uxke TPZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=oYWRGMrirekcurwA3/v4ECh/rIhM+5wuSMHbGkUKhSI=; b=W+DH8JU2xlsoXOyo5xlfxccxv7Az0ipCbIi4Wf15KmcfsMvlvS5PFmWqC5u6QWRDM4 yllX4YdvgE2AziKk/axgUXdBmjHIt7ZYD/gbQY9suCtHW+qXWcmQ+IEpV2IlaJU+0jJa MtALZVY3AFyYdsrTKq4wd2TeFMhV+2OBZMXvORQyQbeHWq5MLrD74JeiDtwXNNdgnx7g cG+0/EQT0ctKBFZtpA3/F45GHjpTjjc+yoEwbkj5TwEytC9hhr7h2SCtAwScugPT+RJn /g96W9vYvBHSeJYrBh0ZD3l9LqJbWsMyRLpMq+iVQEQrBtTkXZiVxDyfkW/4RMfJatqy ygMA== X-Gm-Message-State: AA6/9RmdObeUcOrJEJhHXfz06GIFuwaXeVK0NU7eO+lZFML62mVqeq0kkKJL2dFsA+I00Q== X-Received: by 10.25.22.72 with SMTP id m69mr1835689lfi.179.1476175888056; Tue, 11 Oct 2016 01:51:28 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id 94sm520391lja.10.2016.10.11.01.51.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2016 01:51:27 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory To: =?UTF-8?Q?G=c3=b6ktu=c4=9f_Kayaalp?= References: <87shs3y6tx.fsf@xi.bootis> From: Dmitry Gutov Message-ID: <7cb3fd58-618a-1454-10b1-827616cdcbcd@yandex.ru> Date: Tue, 11 Oct 2016 11:51:25 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 MIME-Version: 1.0 In-Reply-To: <87shs3y6tx.fsf@xi.bootis> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.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: -0.2 (/) On 11.10.2016 05:09, GöktuÄŸ Kayaalp wrote: > This looks like a CVSNT server[1] (given the ‘commit identifier’), so > that may be the cause. I don't have a remote repo now, I'll try with > one as soon as I'll have free time (I'll try with OpenBSD src/). Or it > may be the artifact of the missing ‘-q’ flag to cvs, I'm getting the same output from 'cvs -fq status'. > or some config on > the remote. I'm mostly a user of CVS so I don't know these detail, > sorry. I'm not even a user, so unfortunately it seems like it falls on you to make sense of it. But if the feature doesn't work with all popular CVS servers, then it would be half-broken anyway, and we'd be better off relying on your solution. Anyway, to clone the repo I've tried, you can: CVSROOT=:pserver:anonymous@dev.w3.org:/sources/public cvs login (enter 'anonymous') CVSROOT=:pserver:anonymous@dev.w3.org:/sources/public cvs checkout recut > Would you mind trying ‘cvs -fnq update’ and ‘cvs -fq status’ with that > server too? 'cvs -fnq update' gives: $ cvs -fnq update ? asdasd ? tests/foo M COPYING M tests/bytes2.sh (So it doesn't mention up-to-date files; which can be a boon performance-wise, starting with repos of certain size). From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 11 11:34:15 2016 Received: (at 24082) by debbugs.gnu.org; 11 Oct 2016 15:34:15 +0000 Received: from localhost ([127.0.0.1]:52316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btz4J-0004s6-L4 for submit@debbugs.gnu.org; Tue, 11 Oct 2016 11:34:15 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:35544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1btz4H-0004rv-3G for 24082@debbugs.gnu.org; Tue, 11 Oct 2016 11:34:13 -0400 Received: from mfilter37-d.gandi.net (mfilter37-d.gandi.net [217.70.178.168]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id EEA511720CE; Tue, 11 Oct 2016 17:34:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter37-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter37-d.gandi.net (mfilter37-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id LHcpCeLbMQRg; Tue, 11 Oct 2016 17:34:10 +0200 (CEST) X-Originating-IP: 88.235.171.29 Received: from localhost (unknown [88.235.171.29]) (Authenticated sender: self@gkayaalp.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id E8AF21720AE; Tue, 11 Oct 2016 17:34:07 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: Dmitry Gutov Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory In-Reply-To: <7cb3fd58-618a-1454-10b1-827616cdcbcd@yandex.ru> (message from Dmitry Gutov on Tue, 11 Oct 2016 11:51:25 +0300) Date: Tue, 11 Oct 2016 18:48:09 +0300 Message-ID: <87vawy3n0m.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: schwab@suse.de, 24082@debbugs.gnu.org, jca@wxcvbn.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: -0.7 (/) On 2016-10-11 11:51 +0300, Dmitry Gutov wrote: > [... snip ...] But if the feature doesn't work with all popular CVS=20 > servers, then it would be half-broken anyway, and we'd be better off=20 > relying on your solution. Turns out my cvs was a year behind the latest, and the commitid was ported in a later release (see also Andreas Schwab's message). Sorry. > 'cvs -fnq update' gives: > [... snip ...] > (So it doesn't mention up-to-date files; which can be a boon=20 > performance-wise, starting with repos of certain size). =E2=80=98cvs status=E2=80=99 output is mostly garbage (i.e. not needed) in = this context, whereas every byte of =E2=80=98cvs -fnq update=E2=80=99 is used. Also, the= amount of the output from the latter is a fraction of that from the former. With =E2=80=98status=E2=80=99, reporting even a completely pristine repo will be= slow if it has more than a dozen files, and the results will depend on the CVS version, regarding unregistered files, commitid, etc. I'm CC'ing Andreas too, maybe he can comment about J=C3=A9r=C3=A9mie's issu= e? Also, AFAIK we havent heard from Dan Nicolescu yet. --=20 =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp PGP pubkey: From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 11 20:59:49 2016 Received: (at 24082) by debbugs.gnu.org; 12 Oct 2016 00:59:49 +0000 Received: from localhost ([127.0.0.1]:52585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bu7tc-00039S-Ta for submit@debbugs.gnu.org; Tue, 11 Oct 2016 20:59:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bu7tb-00039E-1a for 24082@debbugs.gnu.org; Tue, 11 Oct 2016 20:59:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bu7tU-0006sC-Ri for 24082@debbugs.gnu.org; Tue, 11 Oct 2016 20:59:41 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45760) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bu7tU-0006rv-P6; Tue, 11 Oct 2016 20:59:40 -0400 Received: from localhost ([::1]:52839 helo=fencepost.gnu.org) by fencepost.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bu7tT-00079e-2J; Tue, 11 Oct 2016 20:59:39 -0400 From: Dan Nicolaescu To: Dmitry Gutov Subject: Re: bug#24082: [PATCH] Use =?utf-8?B?4oCYY3ZzIHVwZGF0ZeKAmQ==?= instead =?utf-8?B?4oCYY3ZzIHN0YXR1c+KAmQ==?= for CVS *vc-dir* buffers References: <87y420arg5.fsf@xi.bootis> X-Debbugs-No-Ack: yes Date: Tue, 11 Oct 2016 20:59:37 -0400 In-Reply-To: (Dmitry Gutov's message of "Sat, 8 Oct 2016 04:04:11 +0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.3 (-----) X-Debbugs-Envelope-To: 24082 Cc: =?utf-8?B?R8O2a3R1xJ8=?= Kayaalp , 24082@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: -5.3 (-----) Dmitry Gutov writes: > Hi Dan, > > Do you remember why you added 'cvs update' based implementation of > vc-cvs-dir-status, but decided to leave it commented out, in commit > 769303ae? I think it was getting closer to a release and didn't want to take any risks. --Dan From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 13 13:57:03 2016 Received: (at 24082) by debbugs.gnu.org; 13 Oct 2016 17:57:04 +0000 Received: from localhost ([127.0.0.1]:54469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bukFb-0004SK-Mm for submit@debbugs.gnu.org; Thu, 13 Oct 2016 13:57:03 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:35805) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bukFZ-0004Rm-7L for 24082@debbugs.gnu.org; Thu, 13 Oct 2016 13:57:01 -0400 Received: from mfilter37-d.gandi.net (mfilter37-d.gandi.net [217.70.178.168]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 6B98A41C092; Thu, 13 Oct 2016 19:56:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter37-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter37-d.gandi.net (mfilter37-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id JJt5M78p9v_S; Thu, 13 Oct 2016 19:56:57 +0200 (CEST) X-Originating-IP: 88.235.171.29 Received: from localhost (unknown [88.235.171.29]) (Authenticated sender: self@gkayaalp.com) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 0854741C07E; Thu, 13 Oct 2016 19:56:56 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: Dan Nicolaescu Subject: Re: bug#24082: [PATCH] Use =?utf-8?B?4oCYY3ZzIHVwZGF0ZeKAmQ==?= instead =?utf-8?B?4oCYY3ZzIHN0YXR1c+KAmQ==?= for CVS *vc-dir* buffers In-Reply-To: (message from Dan Nicolaescu on Tue, 11 Oct 2016 20:59:37 -0400) Date: Thu, 13 Oct 2016 21:10:57 +0300 Message-ID: <87shs02k7i.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.org, dgutov@yandex.ru 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: -0.7 (/) Hello, What do you think about the patch? Should it be merged? Also, on this thread [1, 2], there's J=C3=A9r=C3=A9mie's issue which I coul= dn't reproduce (I tried various local and remote repos, including the OpenBSD =E2=80=98src/=E2=80=99 repo). Do you have any ideas regarding this? I'll be able to work on the patch in the weekend (GMT+3) if any modifications are needed. -gk. [1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#45 [2] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#54 --=20 =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp PGP pubkey: From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 13 14:33:33 2016 Received: (at 24082) by debbugs.gnu.org; 13 Oct 2016 18:33:34 +0000 Received: from localhost ([127.0.0.1]:54474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bukov-0005N3-Kn for submit@debbugs.gnu.org; Thu, 13 Oct 2016 14:33:33 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:58413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bukot-0005Ms-4P for 24082@debbugs.gnu.org; Thu, 13 Oct 2016 14:33:31 -0400 Received: from mfilter37-d.gandi.net (mfilter37-d.gandi.net [217.70.178.168]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 4FF19A80D3; Thu, 13 Oct 2016 20:33:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter37-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter37-d.gandi.net (mfilter37-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id Y4j3zy2xz7Ny; Thu, 13 Oct 2016 20:33:27 +0200 (CEST) X-Originating-IP: 88.235.171.29 Received: from localhost (unknown [88.235.171.29]) (Authenticated sender: self@gkayaalp.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 1A79AA80DC; Thu, 13 Oct 2016 20:33:26 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: jca@wxcvbn.org (=?utf-8?Q?J=C3=A9r=C3=A9mie_Courr=C3=A8ges-Anglas?=) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory In-Reply-To: <877f9gqhpp.fsf@ritchie.wxcvbn.org> (jca@wxcvbn.org) Date: Thu, 13 Oct 2016 21:47:28 +0300 Message-ID: <87mvi82iin.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, dgutov@yandex.ru 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: -0.7 (/) Hi, I've tried it out with a checkout of OpenBSD src/, and with the `recut' repo that Dmitry pointed, was unable to reproduce your issue. The output from =E2=80=98cvs update=E2=80=99 that you shared is just as exp= ected. I'm on FreeBSD myself, cvs 1.11.22.1-20080310-FreeBSD. The NEWS file for CVS suggests nothing happened to =E2=80=98update=E2=80=99 between at least = 1.11.1 and 1.11.4. I believe something happens when applying the patch, it should be applied w/ =E2=80=98patch -p 1=E2=80=99 in emacs source root, and the resul= ting md5 hash for the =E2=80=98vc-cvs.el=E2=80=99 file is this: MD5 (lisp/vc/vc-cvs.el) =3D 4e0f51335e8de5957eef2d92606146f8 --=20 =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp PGP pubkey: From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 15 07:11:10 2016 Received: (at 24082) by debbugs.gnu.org; 15 Oct 2016 11:11:10 +0000 Received: from localhost ([127.0.0.1]:59141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvMru-00035p-DI for submit@debbugs.gnu.org; Sat, 15 Oct 2016 07:11:10 -0400 Received: from chomsky.autogeree.net ([91.216.110.36]:49107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvMrs-00035e-Ch for 24082@debbugs.gnu.org; Sat, 15 Oct 2016 07:11:08 -0400 Received: from ritchie.wxcvbn.org (localhost [127.0.0.1]) by wxcvbn.org (8.15.2/8.15.2) with ESMTP id u9EKXVhl026394; Fri, 14 Oct 2016 22:33:31 +0200 (CEST) Received: (from jca@localhost) by ritchie.wxcvbn.org (8.15.2/8.15.2/Submit) id u9EKXI2R030200; Fri, 14 Oct 2016 22:33:18 +0200 (CEST) From: jca@wxcvbn.org (=?utf-8?Q?J=C3=A9r=C3=A9mie_Courr=C3=A8ges-Anglas?=) To: =?utf-8?B?R8O2a3R1xJ8=?= Kayaalp Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <87mvi82iin.fsf@xi.bootis> Date: Fri, 14 Oct 2016 22:33:18 +0200 In-Reply-To: <87mvi82iin.fsf@xi.bootis> (=?utf-8?B?IkfDtmt0dcSf?= Kayaalp"'s message of "Thu, 13 Oct 2016 21:47:28 +0300") Message-ID: <87eg3ibrht.fsf@ritchie.wxcvbn.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, dgutov@yandex.ru 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: -0.0 (/) Hi, G=C3=B6ktu=C4=9F Kayaalp writes: > Hi, I've tried it out with a checkout of OpenBSD src/, and with the > `recut' repo that Dmitry pointed, was unable to reproduce your issue. > The output from =E2=80=98cvs update=E2=80=99 that you shared is just as e= xpected. I'm > on FreeBSD myself, cvs 1.11.22.1-20080310-FreeBSD. The NEWS file for > CVS suggests nothing happened to =E2=80=98update=E2=80=99 between at leas= t 1.11.1 and > 1.11.4. > > I believe something happens when applying the patch, it should be > applied w/ =E2=80=98patch -p 1=E2=80=99 in emacs source root, and the res= ulting md5 hash > for the =E2=80=98vc-cvs.el=E2=80=99 file is this: > > MD5 (lisp/vc/vc-cvs.el) =3D 4e0f51335e8de5957eef2d92606146f8 ritchie ~/src/emacs-master$ md5 lisp/vc/vc-cvs.el MD5 (lisp/vc/vc-cvs.el) =3D 4e0f51335e8de5957eef2d92606146f8 The problem is elsewhere, I'll see if I can debug this in the next days. In the meantime, maybe a conservative approach would be better? --=20 jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 15 08:36:28 2016 Received: (at 24082) by debbugs.gnu.org; 15 Oct 2016 12:36:28 +0000 Received: from localhost ([127.0.0.1]:59278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvOCS-0006ms-0y for submit@debbugs.gnu.org; Sat, 15 Oct 2016 08:36:28 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:36662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvOCQ-0006md-6B for 24082@debbugs.gnu.org; Sat, 15 Oct 2016 08:36:26 -0400 Received: by mail-wm0-f46.google.com with SMTP id f193so28619458wmg.1 for <24082@debbugs.gnu.org>; Sat, 15 Oct 2016 05:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=rqO/Vb32ziAo2AZSMFdx+tL5zsEaBz/2ZoaIBR1JYJo=; b=CYhAhdYGEYlDhf0gxMrR9eZpJdVVFnIl0FthxActUmA8FmnIWllf8mxJMGStO/FTW7 nhFilI7n5qQ8obLmpfzzmAp2QbzoZRLPoSkX1AV1coJnxHxtF69M31VzGVj6NeKZj8Yz zfUt6wL45LdxLAUv2PL7nge4plPXwUv9axg+SMsmDfuH/9jrHipJhDwho+BjGkKxDfdd nYJkf+5gyP3AFuBjofHok8MF7hfeMR/cP/iGpXZHve0pkwL8JzGS6nQftxe/dZ+QtBPN 9kj8wK1VM6F3VPASX57oRYM2njaXs162MI1gfz1Kn0WHdIGDzp/NDr+quACQ04FWARNx GXEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=rqO/Vb32ziAo2AZSMFdx+tL5zsEaBz/2ZoaIBR1JYJo=; b=j/9FCP0gaTKgkjWfoaGijv1gdUFOuTCDaBbRwTMpJOwhgwhm2zvRqLgtzz4FC6CVVm PpgOuukPtwAVJuQe4E1i350wlf7fEFDzrK3vi2UkN+qbWEzIln0BKXo6BVLtJ35KLPrU HnY3R0cZWAFD59w2MNer/BsuAtZcUr9+xh5WsNGwKc8omrGi7bB0Kz1byiYiZfcWLiLa 6XdN0fkYf1qh+0DlRto1xwmThIQmswuUfGSmTnBQhHJ6m2HdHDEUGh0zO1/PvAQUeEUO tGPEWjSc9q1ID9SBWQ6b/BKJEcnphBihC4+h2vaLrHE+Qgf8Oab1t9oHq2g2UbqFlEvj S3xg== X-Gm-Message-State: AA6/9RnQZ1pfWL9GD5SNeGhKplXuUm5w5Exd4bKwv5zYLp/qRHXlkekB7A4eKwrMBp3HGA== X-Received: by 10.194.60.106 with SMTP id g10mr6066548wjr.151.1476534980452; Sat, 15 Oct 2016 05:36:20 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id r204sm3315027wma.1.2016.10.15.05.36.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Oct 2016 05:36:19 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory To: =?UTF-8?B?SsOpcsOpbWllIENvdXJyw6hnZXMtQW5nbGFz?= , =?UTF-8?Q?G=c3=b6ktu=c4=9f_Kayaalp?= References: <87mvi82iin.fsf@xi.bootis> <87eg3ibrht.fsf@ritchie.wxcvbn.org> From: Dmitry Gutov Message-ID: <128cb385-34ba-58b4-8290-3c80ce80a929@yandex.ru> Date: Sat, 15 Oct 2016 15:36:17 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 MIME-Version: 1.0 In-Reply-To: <87eg3ibrht.fsf@ritchie.wxcvbn.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@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: 0.5 (/) On 14.10.2016 23:33, Jérémie Courrèges-Anglas wrote: > The problem is elsewhere, I'll see if I can debug this in the next days. Thanks. > In the meantime, maybe a conservative approach would be better? Considering it introduces a feature regression (no unregistered and ignored files in the listing) at least with some clients, I'm not sure it's best. And since it your case the problem is only of visual nature (diffs and navigation work all right, IIUC), the proposed more complex patch seems desirable. From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 15 09:06:15 2016 Received: (at 24082) by debbugs.gnu.org; 15 Oct 2016 13:06:15 +0000 Received: from localhost ([127.0.0.1]:59315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvOfG-0007WQ-QH for submit@debbugs.gnu.org; Sat, 15 Oct 2016 09:06:14 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:52287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvOfF-0007WI-2l for 24082@debbugs.gnu.org; Sat, 15 Oct 2016 09:06:13 -0400 Received: from mfilter15-d.gandi.net (mfilter15-d.gandi.net [217.70.178.143]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 25FA3A80C8; Sat, 15 Oct 2016 15:06:12 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter15-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter15-d.gandi.net (mfilter15-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id DxeLhvlEiuxI; Sat, 15 Oct 2016 15:06:10 +0200 (CEST) X-Originating-IP: 88.238.225.147 Received: from localhost (unknown [88.238.225.147]) (Authenticated sender: self@gkayaalp.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 4DBD9A80D5; Sat, 15 Oct 2016 15:06:10 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: Dmitry Gutov Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory In-Reply-To: <128cb385-34ba-58b4-8290-3c80ce80a929@yandex.ru> (message from Dmitry Gutov on Sat, 15 Oct 2016 15:36:17 +0300) Date: Sat, 15 Oct 2016 16:20:30 +0300 Message-ID: <87instda01.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.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: -0.7 (/) On 2016-10-15 15:36 +0300, Dmitry Gutov wrote: > On 14.10.2016 23:33, J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas wrote: >> In the meantime, maybe a conservative approach would be better? > > Considering it introduces a feature regression (no unregistered and=20 > ignored files in the listing) at least with some clients, I'm not sure=20 > it's best. > > And since it your case the problem is only of visual nature (diffs and=20 > navigation work all right, IIUC), the proposed more complex patch seems=20 > desirable. As I noted before I couldn't reproduce his issues and can't spot anything that might cause it in the patch (the code does not change the strings in any way, maybe apart from the call to =E2=80=98file-relative-nam= e=E2=80=99 in the second hunk). Hope J=C3=A9r=C3=A9mie will be able to debug the issue. -gk. --=20 =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp PGP pubkey: From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 15 10:07:17 2016 Received: (at 24082) by debbugs.gnu.org; 15 Oct 2016 14:07:17 +0000 Received: from localhost ([127.0.0.1]:60006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvPcK-0000n6-Ou for submit@debbugs.gnu.org; Sat, 15 Oct 2016 10:07:17 -0400 Received: from chomsky.autogeree.net ([91.216.110.36]:49242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvPcI-0000mw-Q6 for 24082@debbugs.gnu.org; Sat, 15 Oct 2016 10:07:15 -0400 Received: from ritchie.wxcvbn.org (localhost [127.0.0.1]) by wxcvbn.org (8.15.2/8.15.2) with ESMTP id u9FE6Ltb028708; Sat, 15 Oct 2016 16:06:21 +0200 (CEST) From: jca@wxcvbn.org (=?utf-8?Q?J=C3=A9r=C3=A9mie_Courr=C3=A8ges-Anglas?=) To: =?utf-8?B?R8O2a3R1xJ8=?= Kayaalp Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <87instda01.fsf@xi.bootis> Date: Sat, 15 Oct 2016 16:06:21 +0200 In-Reply-To: <87instda01.fsf@xi.bootis> (=?utf-8?B?IkfDtmt0dcSf?= Kayaalp"'s message of "Sat, 15 Oct 2016 16:20:30 +0300") Message-ID: <87zim5u2oy.fsf@ritchie.wxcvbn.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, Dmitry Gutov 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: -0.0 (/) G=C3=B6ktu=C4=9F Kayaalp writes: > On 2016-10-15 15:36 +0300, Dmitry Gutov wrote: >> On 14.10.2016 23:33, J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas wrote: >>> In the meantime, maybe a conservative approach would be better? >> >> Considering it introduces a feature regression (no unregistered and=20 >> ignored files in the listing) at least with some clients, I'm not sure=20 >> it's best. >> >> And since it your case the problem is only of visual nature (diffs and=20 >> navigation work all right, IIUC), the proposed more complex patch seems= =20 >> desirable. > > As I noted before I couldn't reproduce his issues and can't spot > anything that might cause it in the patch (the code does not change the > strings in any way, maybe apart from the call to =E2=80=98file-relative-n= ame=E2=80=99 in > the second hunk). Hope J=C3=A9r=C3=A9mie will be able to debug the issue. So..., You asked for the output of `cvs -fnq update', but in my tests the actual command that is run seems to be `cvs -fnq update ./'. Re-using your instructions in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#33 --8<-- ritchie /tmp/test$ cvs -fnq update ./ M .//testfil M .//subdir/subfil -->8-- The result looks like this in vc-dir: --8<-- VC backend : CVS Working dir: /tmp/test/ Repository : /tmp/cvsroot/ Module : test ./ edited .//testfil subdir/ edited .//subdir/subfil -->8-- This happens for all the *local repos* I have on this machine (including my mirrors of the OpenBSD source tree). Adding a few file-relative-name calls around `(match-string 1)' in vc-cvs-after-dir-status helps getting a nicer formatting. However, there could be a nastier problem with remote repos. --8<-- ritchie /tmp/test$ cvs -d jca@localhost:/tmp/cvsroot/ -fnq up M testfil M subdir/subfil -->8-- All is well... note how the file names are not prefixed with `./'. --8<-- ritchie /tmp/test$ cvs -d jca@localhost:/tmp/cvsroot/ -fnq up ./ cvs server: conflict: testfil is modified but no longer in the repository C testfil M subdir/subfil -->8-- Oops... cvs thinks what we want to run update from the cvs root directory (which doesn't contain `testfil'). Here I modified the Root entries to point to localhost: --8<-- ritchie /tmp/test$ cat CVS/Root jca@localhost:/tmp/cvsroot/ ritchie /tmp/test$ cat subdir/CVS/Root jca@localhost:/tmp/cvsroot/ ritchie /tmp/test$ cvs -fnq up M testfil M subdir/subfil ritchie /tmp/test$ cvs -fnq up ./ cvs server: conflict: testfil is modified but no longer in the repository C testfil M subdir/subfil -->8-- vc-dir shows: --8<-- VC backend : CVS Working dir: /tmp/test/ Repository : jca@localhost:/tmp/cvsroot/ Module : test ./ conflict testfil subdir/ edited subdir/subfil -->8-- So with `./', files in the current directory seem to be considered as if we were at the root of the cvs repo root directory. Subdirectories seem to be fine, vc-diff works fine on them. I can't see how the code would manage to pass `./' to cvs on my setup and not on others. I don't know if more recent cvs(1) versions handle `./' and remote repos in a nicer way. --=20 jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 15 13:11:49 2016 Received: (at 24082) by debbugs.gnu.org; 15 Oct 2016 17:11:49 +0000 Received: from localhost ([127.0.0.1]:60428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvSUv-0005LQ-0H for submit@debbugs.gnu.org; Sat, 15 Oct 2016 13:11:49 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:40175) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvSUs-0005LG-M4 for 24082@debbugs.gnu.org; Sat, 15 Oct 2016 13:11:47 -0400 Received: from mfilter23-d.gandi.net (mfilter23-d.gandi.net [217.70.178.151]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id C48C5A80BE; Sat, 15 Oct 2016 19:11:45 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter23-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter23-d.gandi.net (mfilter23-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id D32A4BtNbIiq; Sat, 15 Oct 2016 19:11:43 +0200 (CEST) X-Originating-IP: 88.238.225.147 Received: from localhost (unknown [88.238.225.147]) (Authenticated sender: self@gkayaalp.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 5ECDFA80C4; Sat, 15 Oct 2016 19:11:42 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: jca@wxcvbn.org (=?utf-8?Q?J=C3=A9r=C3=A9mie_Courr=C3=A8ges-Anglas?=) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory In-Reply-To: <87zim5u2oy.fsf@ritchie.wxcvbn.org> (jca@wxcvbn.org) Date: Sat, 15 Oct 2016 20:26:03 +0300 Message-ID: <87funxcyms.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, dgutov@yandex.ru 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: -0.7 (/) On 2016-10-15 16:06 +0200, jca@wxcvbn.org (J=C3=A9r=C3=A9mie Courr=C3=A8ges= -Anglas) wrote: [... snip ...] > You asked for the output of `cvs -fnq update', but in my tests the > actual command that is run seems to be `cvs -fnq update ./'. Re-using > your instructions in > https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#33 > > --8<-- > ritchie /tmp/test$ cvs -fnq update ./ > M .//testfil > M .//subdir/subfil > -->8-- I see the expected output, i.e. without the leading `.//'. > The result looks like this in vc-dir: [... snip ...] > ./ > edited .//testfil > subdir/ > edited .//subdir/subfil > -->8-- Again I have no problems. > This happens for all the *local repos* I have on this machine (including > my mirrors of the OpenBSD source tree). > > Adding a few file-relative-name calls around `(match-string 1)' in > vc-cvs-after-dir-status helps getting a nicer formatting. See below. > However, there could be a nastier problem with remote repos. > > --8<-- > ritchie /tmp/test$ cvs -d jca@localhost:/tmp/cvsroot/ -fnq up > M testfil > M subdir/subfil > -->8-- > > All is well... note how the file names are not prefixed with `./'. > > --8<-- > ritchie /tmp/test$ cvs -d jca@localhost:/tmp/cvsroot/ -fnq up ./ > cvs server: conflict: testfil is modified but no longer in the repository > C testfil > M subdir/subfil > -->8-- > > Oops... cvs thinks what we want to run update from the cvs root > directory (which doesn't contain `testfil'). It does contain `testfil', when you `cvs import', it registers and commits all the files in the current tree (=E2=80=98ls -R /tmp/cvsroot/test= /=E2=80=99). I do not experience these problems, so maybe they've to do with the OpenBSD version of CVS (they have their own copy under http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/gnu/usr.bin/cvs/ which doesn't seem to be up-to-date, and seems that they cherry-pick patches as NEWS and ChangeLog are 20 years old there). I think vc.el is supposed to display the state of the repo, not interpret it, though the its would know better than me. This is (and the initial =E2=80=98./=E2=80= =99) probably an issue of OpenBSD's fork of GNU CVS. > Here I modified the Root entries to point to localhost: > --8<-- > ritchie /tmp/test$ cat CVS/Root > jca@localhost:/tmp/cvsroot/ > ritchie /tmp/test$ cat subdir/CVS/Root > jca@localhost:/tmp/cvsroot/ > ritchie /tmp/test$ cvs -fnq up > M testfil > M subdir/subfil > ritchie /tmp/test$ cvs -fnq up ./ > cvs server: conflict: testfil is modified but no longer in the repository > C testfil > M subdir/subfil > -->8-- > > vc-dir shows: > --8<-- > VC backend : CVS > Working dir: /tmp/test/ > Repository : jca@localhost:/tmp/cvsroot/ > Module : test > > > ./ > conflict testfil > subdir/ > edited subdir/subfil > -->8-- > > So with `./', files in the current directory seem to be considered as if > we were at the root of the cvs repo root directory. Subdirectories seem > to be fine, vc-diff works fine on them. > > I can't see how the code would manage to pass `./' to cvs on my setup > and not on others. I don't know if more recent cvs(1) versions handle > `./' and remote repos in a nicer way. Probably the code passes =E2=80=98./=E2=80=99 on all setups but they just h= andle it fine. Your OpenBSD CVS (not OpenCVS, it's their re-implementation of CVS) is probably a bit divergent from mainstream CVS and thus these problems. I guess if you used mainstream CVS, it'd work OK. Maybe these need to be reported on OpenBSD bugtracker. I'm reluctant to trying to guess what CVS wants to way WRT file names, but I can work on it if that's considered a better approach. --=20 =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp PGP pubkey: From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 15 17:36:52 2016 Received: (at 24082) by debbugs.gnu.org; 15 Oct 2016 21:36:52 +0000 Received: from localhost ([127.0.0.1]:60958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvWdQ-0003JS-50 for submit@debbugs.gnu.org; Sat, 15 Oct 2016 17:36:52 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:35836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvWdO-0003JF-B2 for 24082@debbugs.gnu.org; Sat, 15 Oct 2016 17:36:50 -0400 Received: by mail-wm0-f44.google.com with SMTP id c78so43632488wme.0 for <24082@debbugs.gnu.org>; Sat, 15 Oct 2016 14:36:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-language; bh=Tn7Ugiz75o7P1XBISWt0+8ZMx/FMG12MyiL30cNJumg=; b=JHj7PAuLBSFvkgutyMl0kUD25NEH4Abjwy3qlpOZrvHj0JtJHpAyqMFP/zrX83XP/N 3wj3gSj9HwuvzGXtNblYLp8uzKuNRXWRv1OwpyddSB31Hma5g9NcZiXwMg4DHq04hUSw RuPp9CgP7k6wr4pMYIbTb9hxS4Ny1arGeJn2BaJVC0HwfBh9x2bGxmHmqE61czgv5D0L SmYgtg53Gk0FXXc2RnxI5Ku/2UJRjCcrWTQ7euuohGzG8GEd192rf/zh7vpHyfHS5Wq/ lNXEksw4Xnl0DyW3h+x1lj2rmyFLYSw9mh7bg6Uu/8e4UelPZX8iyeL2oAMEl+OvITGs oi4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-language; bh=Tn7Ugiz75o7P1XBISWt0+8ZMx/FMG12MyiL30cNJumg=; b=AsyXTH55sw0IJ7h0y5j+sfRKZic9TvCIF4912LVzG+omXGnZQ5X5tXjmONBqTB+aBJ hlSmFgYc0+mRyLqTLcs2QlDL3dyIbxgf8k2P+UxhBhcredazij4GjxAqbQR54p9fHUhz MAuYlzzlCZLhwTZVto6lvcfEsy3nMofbRySkdXKYQV/YblkV1V57WHFiTEcvf5nEShpg Du5aZGEtaVuaUtDthD9ClzaqlezRm722KGinPHJMpVUyrodFdTovdbyf7vQlgph6KsLA wmlzf5CEe7xAR1oXNWqRO3rjxiGA3J5TnZozF7SWhsmDld1weLlXPwFWzZmUcguHiNb/ iZUw== X-Gm-Message-State: AA6/9Rl5R87K34qkprxVlaRiTECdcH91tP8C6dpahgLpFOj0jOniIm2vngeJdJtShxeObg== X-Received: by 10.28.148.200 with SMTP id w191mr2849677wmd.43.1476567404479; Sat, 15 Oct 2016 14:36:44 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id w124sm5210798wme.24.2016.10.15.14.36.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Oct 2016 14:36:43 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory To: =?UTF-8?B?SsOpcsOpbWllIENvdXJyw6hnZXMtQW5nbGFz?= , =?UTF-8?Q?G=c3=b6ktu=c4=9f_Kayaalp?= References: <87instda01.fsf@xi.bootis> <87zim5u2oy.fsf@ritchie.wxcvbn.org> From: Dmitry Gutov Message-ID: <94d0e69e-a39f-fec6-3ebf-3863bb8f0fcd@yandex.ru> Date: Sun, 16 Oct 2016 00:36:41 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 MIME-Version: 1.0 In-Reply-To: <87zim5u2oy.fsf@ritchie.wxcvbn.org> Content-Type: multipart/mixed; boundary="------------F83DCCF7E7E26CB861383EB3" Content-Language: en-US X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@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: 0.5 (/) This is a multi-part message in MIME format. --------------F83DCCF7E7E26CB861383EB3 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 15.10.2016 17:06, Jérémie Courrèges-Anglas wrote: > You asked for the output of `cvs -fnq update', but in my tests the > actual command that is run seems to be `cvs -fnq update ./'. Could you both please try the attached modified patch. It removes the vc-expand-dirs call from vc-cvs-dir-status-files (its return value was unused anyway), and passes FILES unmodified to vc-cvs-command. We can be fairly sure that DIR is default-directory, so passing it in explicitly is unnecessary. Whenever that ceases to be the case, we'll have to update other backends as well. --------------F83DCCF7E7E26CB861383EB3 Content-Type: text/x-diff; name="bug-24082-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="bug-24082-2.patch" diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index a2499a2..2134793 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -938,103 +938,32 @@ vc-cvs-parse-status (t 'edited)))))))) (defun vc-cvs-after-dir-status (update-function) - ;; Heavily inspired by vc-cvs-parse-status. AKA a quick hack. - ;; This needs a lot of testing. - (let ((status nil) - (status-str nil) - (file nil) - (result nil) - (missing nil) - (ignore-next nil) - (subdir default-directory)) + (let ((result nil) + (translation '((?? . unregistered) + (?A . added) + (?C . conflict) + (?M . edited) + (?P . needs-merge) + (?R . removed) + (?U . needs-update)))) (goto-char (point-min)) - (while - ;; Look for either a file entry, an unregistered file, or a - ;; directory change. - (re-search-forward - "\\(^=+\n\\([^=c?\n].*\n\\|\n\\)+\\)\\|\\(\\(^?? .*\n\\)+\\)\\|\\(^cvs status: \\(Examining\\|nothing\\) .*\n\\)" - nil t) - ;; FIXME: get rid of narrowing here. - (narrow-to-region (match-beginning 0) (match-end 0)) - (goto-char (point-min)) - ;; The subdir - (when (looking-at "cvs status: Examining \\(.+\\)") - (setq subdir (expand-file-name (match-string 1)))) - ;; Unregistered files - (while (looking-at "? \\(.*\\)") - (setq file (file-relative-name - (expand-file-name (match-string 1) subdir))) - (push (list file 'unregistered) result) - (forward-line 1)) - (when (looking-at "cvs status: nothing known about") - ;; We asked about a non existent file. The output looks like this: - - ;; cvs status: nothing known about `lisp/v.diff' - ;; =================================================================== - ;; File: no file v.diff Status: Unknown - ;; - ;; Working revision: No entry for v.diff - ;; Repository revision: No revision control file - ;; - - ;; Due to narrowing in this iteration we only see the "cvs - ;; status:" line, so just set a flag so that we can ignore the - ;; file in the next iteration. - (setq ignore-next t)) - ;; A file entry. - (when (re-search-forward "^File: \\(no file \\)?\\(.*[^ \t]\\)[ \t]+Status: \\(.*\\)" nil t) - (setq missing (match-string 1)) - (setq file (file-relative-name - (expand-file-name (match-string 2) subdir))) - (setq status-str (match-string 3)) - (setq status - (cond - ((string-match "Up-to-date" status-str) 'up-to-date) - ((string-match "Locally Modified" status-str) 'edited) - ((string-match "Needs Merge" status-str) 'needs-merge) - ((string-match "Needs \\(Checkout\\|Patch\\)" status-str) - (if missing 'missing 'needs-update)) - ((string-match "Locally Added" status-str) 'added) - ((string-match "Locally Removed" status-str) 'removed) - ((string-match "File had conflicts " status-str) 'conflict) - ((string-match "Unknown" status-str) 'unregistered) - (t 'edited))) - (if ignore-next - (setq ignore-next nil) - (unless (eq status 'up-to-date) - (push (list file status) result)))) - (goto-char (point-max)) - (widen)) - (funcall update-function result)) - ;; Alternative implementation: use the "update" command instead of - ;; the "status" command. - ;; (let ((result nil) - ;; (translation '((?? . unregistered) - ;; (?A . added) - ;; (?C . conflict) - ;; (?M . edited) - ;; (?P . needs-merge) - ;; (?R . removed) - ;; (?U . needs-update)))) - ;; (goto-char (point-min)) - ;; (while (not (eobp)) - ;; (if (looking-at "^[ACMPRU?] \\(.*\\)$") - ;; (push (list (match-string 1) - ;; (cdr (assoc (char-after) translation))) - ;; result) - ;; (cond - ;; ((looking-at "cvs update: warning: \\(.*\\) was lost") - ;; ;; Format is: - ;; ;; cvs update: warning: FILENAME was lost - ;; ;; U FILENAME - ;; (push (list (match-string 1) 'missing) result) - ;; ;; Skip the "U" line - ;; (forward-line 1)) - ;; ((looking-at "cvs update: New directory `\\(.*\\)' -- ignored") - ;; (push (list (match-string 1) 'unregistered) result)))) - ;; (forward-line 1)) - ;; (funcall update-function result))) - ) + (while (not (eobp)) + (if (looking-at "^[ACMPRU?] \\(.*\\)$") + (push (list (match-string 1) + (cdr (assoc (char-after) translation))) + result) + (cond + ((looking-at "cvs update: warning: \\(.*\\) was lost") + ;; Format is: + ;; cvs update: warning: FILENAME was lost + ;; U FILENAME + (push (list (match-string 1) 'missing) result) + ;; Skip the "U" line + (forward-line 1)) + ((looking-at "cvs update: New directory `\\(.*\\)' -- ignored") + (push (list (match-string 1) 'unregistered) result)))) + (forward-line 1)) + (funcall update-function result))) ;; Based on vc-cvs-dir-state-heuristic from Emacs 22. ;; FIXME does not mention unregistered files. @@ -1071,16 +1000,12 @@ vc-cvs-dir-status-files Query all files in DIR if files is nil." (let ((local (vc-cvs-stay-local-p dir))) (if (and (not files) local (not (eq local 'only-file))) - (vc-cvs-dir-status-heuristic dir update-function) - (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS))) - (vc-cvs-command (current-buffer) 'async files "-f" "status") - ;; Alternative implementation: use the "update" command instead of - ;; the "status" command. - ;; (vc-cvs-command (current-buffer) 'async - ;; (file-relative-name dir) - ;; "-f" "-n" "update" "-d" "-P") - (vc-run-delayed - (vc-cvs-after-dir-status update-function))))) + (vc-cvs-dir-status-heuristic dir update-function)) + (vc-cvs-command (current-buffer) 'async + files + "-f" "-n" "-q" "update") + (vc-run-delayed + (vc-cvs-after-dir-status update-function)))) (defun vc-cvs-file-to-string (file) "Read the content of FILE and return it as a string." --------------F83DCCF7E7E26CB861383EB3-- From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 15 19:49:13 2016 Received: (at 24082) by debbugs.gnu.org; 15 Oct 2016 23:49:13 +0000 Received: from localhost ([127.0.0.1]:32873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvYhV-000837-5w for submit@debbugs.gnu.org; Sat, 15 Oct 2016 19:49:13 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:43706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvYhT-000830-Uj for 24082@debbugs.gnu.org; Sat, 15 Oct 2016 19:49:12 -0400 Received: from mfilter31-d.gandi.net (mfilter31-d.gandi.net [217.70.178.162]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id EE49EA80C1; Sun, 16 Oct 2016 01:49:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter31-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter31-d.gandi.net (mfilter31-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id JrOlDAUb_qil; Sun, 16 Oct 2016 01:49:09 +0200 (CEST) X-Originating-IP: 88.238.225.147 Received: from localhost (unknown [88.238.225.147]) (Authenticated sender: self@gkayaalp.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id C7932A80BE; Sun, 16 Oct 2016 01:49:08 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: Dmitry Gutov Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory In-Reply-To: <94d0e69e-a39f-fec6-3ebf-3863bb8f0fcd@yandex.ru> (message from Dmitry Gutov on Sun, 16 Oct 2016 00:36:41 +0300) Date: Sun, 16 Oct 2016 03:03:29 +0300 Message-ID: <87r37h88j2.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.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: -0.7 (/) On 2016-10-16 00:36 +0300, Dmitry Gutov wrote: > [1:text/plain Hide] > > On 15.10.2016 17:06, J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas wrote: > >> You asked for the output of `cvs -fnq update', but in my tests the >> actual command that is run seems to be `cvs -fnq update ./'. > > Could you both please try the attached modified patch. Works fine for me, both local and remote. --=20 =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp PGP pubkey: From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 16 08:40:25 2016 Received: (at 24082) by debbugs.gnu.org; 16 Oct 2016 12:40:26 +0000 Received: from localhost ([127.0.0.1]:34025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvkjp-0006EH-Nw for submit@debbugs.gnu.org; Sun, 16 Oct 2016 08:40:25 -0400 Received: from chomsky.autogeree.net ([91.216.110.36]:50622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvkjo-0006E9-5t for 24082@debbugs.gnu.org; Sun, 16 Oct 2016 08:40:24 -0400 Received: from ritchie.wxcvbn.org (localhost [127.0.0.1]) by wxcvbn.org (8.15.2/8.15.2) with ESMTP id u9GCccZl030052; Sun, 16 Oct 2016 14:38:38 +0200 (CEST) Received: (from jca@localhost) by ritchie.wxcvbn.org (8.15.2/8.15.2/Submit) id u9GCcLSb092391; Sun, 16 Oct 2016 14:38:21 +0200 (CEST) From: jca@wxcvbn.org (=?utf-8?Q?J=C3=A9r=C3=A9mie_Courr=C3=A8ges-Anglas?=) To: =?utf-8?B?R8O2a3R1xJ8=?= Kayaalp Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <87r37h88j2.fsf@xi.bootis> Date: Sun, 16 Oct 2016 14:38:21 +0200 In-Reply-To: <87r37h88j2.fsf@xi.bootis> (=?utf-8?B?IkfDtmt0dcSf?= Kayaalp"'s message of "Sun, 16 Oct 2016 03:03:29 +0300") Message-ID: <87eg3geaf6.fsf@ritchie.wxcvbn.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, Dmitry Gutov 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: -0.0 (/) G=C3=B6ktu=C4=9F Kayaalp writes: > On 2016-10-16 00:36 +0300, Dmitry Gutov wrote: >> [1:text/plain Hide] >> >> On 15.10.2016 17:06, J=C3=A9r=C3=A9mie Courr=C3=A8ges-Anglas wrote: >> >>> You asked for the output of `cvs -fnq update', but in my tests the >>> actual command that is run seems to be `cvs -fnq update ./'. >> >> Could you both please try the attached modified patch. > > Works fine for me, both local and remote. Same here, thanks. --=20 jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 16 10:07:54 2016 Received: (at 24082) by debbugs.gnu.org; 16 Oct 2016 14:07:54 +0000 Received: from localhost ([127.0.0.1]:34767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvm6U-0001cZ-CW for submit@debbugs.gnu.org; Sun, 16 Oct 2016 10:07:54 -0400 Received: from mail-lf0-f53.google.com ([209.85.215.53]:35955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvm6T-0001cM-6p for 24082@debbugs.gnu.org; Sun, 16 Oct 2016 10:07:53 -0400 Received: by mail-lf0-f53.google.com with SMTP id b75so235321831lfg.3 for <24082@debbugs.gnu.org>; Sun, 16 Oct 2016 07:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:references:cc:to:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=5hl7hiB83ujSHjysLw8SPTWh/F+7SleuXsZAuafSFAE=; b=tQ1joE9aPs/tt/IUbytl250aYsRr7eXe+5u60CLYPNgycGUuJRM9I7gYPfWofG48MS fEX4QJa2WiTIBxwvJIOo6sG51eVnefMdeODCLog1vNNWmmEVwMMEZWfAD4UQ2BbFgRuz XGtc74jNNlZiibqNSdST8RsBJuODWsyzXOpuZzKmU8m/KSQSXJOmYQA1m+WwO8dGPlOn L85eNohVcV3wbteb/ykwUvCelNjbnr5BOBgOUr3tNvw9ZMBo+vVMv38QPIAx2UBPuq/E 8ZywNVTCs3UC8nYy2Np/V1Zp6Bb1XrOv9zU5Q7tLXd/kmgAoLk6dAT3QqHgIJtrTpTNl fB8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:references:cc:to:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=5hl7hiB83ujSHjysLw8SPTWh/F+7SleuXsZAuafSFAE=; b=OawepE2srB4zuHnczJailIQ7bN0WLFNigP9UP/X6+QlRNyZ72LUqunkblkVcpgiYoK 8z4OMCTkkzcvcEseJZIqY2ISFppYxnmFrxzfkvVzA5HSMwF7HdfMgJXKDvDISj8sQYTu wsMZM+VDFhvgvQkBN9lOiYFOwZXXHqMSKgjRahpaNLs5/P4XMCk6mutaakLeJ5nWAabt m9s9d9Q3W2Zo5c2gvxncFJi30FdGlFcrSj9Zhfzpr50dSPGdBSoFf5uUoOYc+NwDcH+g s4oDOljLq8VsTw8j/BQGBITJGtyh0wuvNUfR6MZym55sBamnNBu5OrtP8jNh+NDMYN0b vlyg== X-Gm-Message-State: AA6/9Rl9i4JJJpzDnR1aEQjx1NkEOX3YmFSKkkR5ZvJYW6GmTuKCKRML/jaTjDh3z6iAAg== X-Received: by 10.28.145.137 with SMTP id t131mr5001707wmd.130.1476626867296; Sun, 16 Oct 2016 07:07:47 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id ce6sm42845893wjc.27.2016.10.16.07.07.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Oct 2016 07:07:46 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <87r37h88j2.fsf@xi.bootis> <87eg3geaf6.fsf@ritchie.wxcvbn.org> To: Eli Zaretskii From: Dmitry Gutov Message-ID: <9fd623f3-eafe-384d-b9f2-22e2025f9819@yandex.ru> Date: Sun, 16 Oct 2016 17:07:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 MIME-Version: 1.0 In-Reply-To: <87eg3geaf6.fsf@ritchie.wxcvbn.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 24082 Cc: =?UTF-8?Q?G=c3=b6ktu=c4=9f_Kayaalp?= , 24082@debbugs.gnu.org, =?UTF-8?B?SsOpcsOpbWllIENvdXJyw6hnZXMtQW5nbGFz?= 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: 0.5 (/) On 16.10.2016 15:38, Jérémie Courrèges-Anglas wrote: > GöktuÄŸ Kayaalp writes: > >> On 2016-10-16 00:36 +0300, Dmitry Gutov wrote: >>> Could you both please try the attached modified patch. >> >> Works fine for me, both local and remote. > > Same here, thanks. That's great. Eli, do we have your blessing to push the patch to emacs-25? It seems non-trivial, but there's no much new code there actually, and it seems to work well. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 16 10:23:16 2016 Received: (at 24082) by debbugs.gnu.org; 16 Oct 2016 14:23:16 +0000 Received: from localhost ([127.0.0.1]:34812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvmLL-0001zc-OU for submit@debbugs.gnu.org; Sun, 16 Oct 2016 10:23:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvmLK-0001zQ-G4 for 24082@debbugs.gnu.org; Sun, 16 Oct 2016 10:23:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bvmLC-0003sz-7Y for 24082@debbugs.gnu.org; Sun, 16 Oct 2016 10:23:09 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.5 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvmLC-0003st-40; Sun, 16 Oct 2016 10:23:06 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2477 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bvmLA-0006xu-CU; Sun, 16 Oct 2016 10:23:05 -0400 Date: Sun, 16 Oct 2016 17:23:03 +0300 Message-Id: <83vawsz83c.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-reply-to: <9fd623f3-eafe-384d-b9f2-22e2025f9819@yandex.ru> (message from Dmitry Gutov on Sun, 16 Oct 2016 17:07:44 +0300) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <87r37h88j2.fsf@xi.bootis> <87eg3geaf6.fsf@ritchie.wxcvbn.org> <9fd623f3-eafe-384d-b9f2-22e2025f9819@yandex.ru> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.3 (-----) X-Debbugs-Envelope-To: 24082 Cc: self@gkayaalp.com, 24082@debbugs.gnu.org, jca@wxcvbn.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: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.3 (-----) > Cc: Jérémie Courrèges-Anglas , > GöktuÄŸ Kayaalp , > 24082@debbugs.gnu.org > From: Dmitry Gutov > Date: Sun, 16 Oct 2016 17:07:44 +0300 > > Eli, do we have your blessing to push the patch to emacs-25? It seems > non-trivial, but there's no much new code there actually, and it seems > to work well. Can you show me the patch again? I'm afraid I got confused between the alternatives. Thanks. From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 16 11:58:46 2016 Received: (at 24082) by debbugs.gnu.org; 16 Oct 2016 15:58:46 +0000 Received: from localhost ([127.0.0.1]:35059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvnpm-0004Bq-4v for submit@debbugs.gnu.org; Sun, 16 Oct 2016 11:58:46 -0400 Received: from mail-lf0-f50.google.com ([209.85.215.50]:36815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvnpk-0004Bd-MH for 24082@debbugs.gnu.org; Sun, 16 Oct 2016 11:58:45 -0400 Received: by mail-lf0-f50.google.com with SMTP id b75so239579662lfg.3 for <24082@debbugs.gnu.org>; Sun, 16 Oct 2016 08:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=bJ+Mg26pDKN3w/MCv9O78hjOypYc9GlhDtKpmUbcOu8=; b=NPcdCW+A3pnNHwiiMKO+ZmH5uoCe2jfmS7XLc+TFuZenHPQO8+W2CythNaceoAeosI LYKOn8BLyZcdIul8LpBxC9FIhamr8xrrK6cOVe4HZ0vjJTxXkvw6RGESa9f8bplK7uLL 1l20aSEnM+0lyvKKTpzxTkigRB6JwIdEc2VOUWxdQPNhpv72WE6yHnfjoEK9u1BhxhI9 Oyy/EtLlJ8IXznl25ObwRsxnbwUJc0CtuL402DtpoYZk7B+yYnsyIAohmKkcBMqgPnGK pAUFqc/OJHRk7r7znBlaM/3OVvknFE1S1Yn6GGjIThnsPQEXFow1/etELcRY4Odk/xf3 0Y5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=bJ+Mg26pDKN3w/MCv9O78hjOypYc9GlhDtKpmUbcOu8=; b=ig9KFFUM8eojnkRJgFLUd9CBBLPwBLYZtxFgL1luxHH5EWH9oEwyqrkdBg3RN/IwJp midB4SleeO4FtdrFCETIA+2pSsgDpU3G3YCHIoiNouwSqghjKqGZiPgf/KEvCmMEd9qa sGMXQ3uELK1qcjx7uFMAbW9kOhZAVjlLB2C65KIG6iu+4vz7YaEQ8DGr9mk+y2Q7Gx2A DWl2uu8zRBsxtIOYd9rWtDQeloIFKeQf2WbkW5KccHbiCT569ZjWYVecrp+og5FY0TAV 5E1cioNgIGdEkwpqqj9ltsLJw/5ov0V6sGUnmbG9UU7V/4p8+SqqSOnIOqj+9humEZ3N khbg== X-Gm-Message-State: AA6/9RmrXKQ7Oc7Ik/ACXG9YZP4V21Nmq1j5ysKTnE8QIL0kfpjCcvUFovrm1bZc61hD2A== X-Received: by 10.28.212.198 with SMTP id l189mr217742wmg.103.1476633518573; Sun, 16 Oct 2016 08:58:38 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id ya1sm43826340wjb.23.2016.10.16.08.58.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Oct 2016 08:58:37 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory To: Eli Zaretskii References: <87r37h88j2.fsf@xi.bootis> <87eg3geaf6.fsf@ritchie.wxcvbn.org> <9fd623f3-eafe-384d-b9f2-22e2025f9819@yandex.ru> <83vawsz83c.fsf@gnu.org> From: Dmitry Gutov Message-ID: <2d45ad9e-7624-993d-1722-e3abc05ba55c@yandex.ru> Date: Sun, 16 Oct 2016 18:58:36 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 MIME-Version: 1.0 In-Reply-To: <83vawsz83c.fsf@gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082 Cc: self@gkayaalp.com, 24082@debbugs.gnu.org, jca@wxcvbn.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: -0.7 (/) On 16.10.2016 17:23, Eli Zaretskii wrote: > Can you show me the patch again? I'm afraid I got confused between > the alternatives. > > Thanks. It's the one in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24082#96. Direct link: https://debbugs.gnu.org/cgi/bugreport.cgi?filename=bug-24082-2.patch;bug=24082;att=1;msg=96 From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 16 13:58:31 2016 Received: (at 24082) by debbugs.gnu.org; 16 Oct 2016 17:58:31 +0000 Received: from localhost ([127.0.0.1]:35362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvphb-00075w-OO for submit@debbugs.gnu.org; Sun, 16 Oct 2016 13:58:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bvpha-00075j-IG for 24082@debbugs.gnu.org; Sun, 16 Oct 2016 13:58:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bvphU-0005co-E4 for 24082@debbugs.gnu.org; Sun, 16 Oct 2016 13:58:21 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvphO-0005Z5-2s; Sun, 16 Oct 2016 13:58:14 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2638 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bvphN-0005Ci-6r; Sun, 16 Oct 2016 13:58:13 -0400 Date: Sun, 16 Oct 2016 20:58:12 +0300 Message-Id: <83r37gyy4r.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-reply-to: <2d45ad9e-7624-993d-1722-e3abc05ba55c@yandex.ru> (message from Dmitry Gutov on Sun, 16 Oct 2016 18:58:36 +0300) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory References: <87r37h88j2.fsf@xi.bootis> <87eg3geaf6.fsf@ritchie.wxcvbn.org> <9fd623f3-eafe-384d-b9f2-22e2025f9819@yandex.ru> <83vawsz83c.fsf@gnu.org> <2d45ad9e-7624-993d-1722-e3abc05ba55c@yandex.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.3 (-----) X-Debbugs-Envelope-To: 24082 Cc: self@gkayaalp.com, 24082@debbugs.gnu.org, jca@wxcvbn.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: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.3 (-----) > Cc: self@gkayaalp.com, 24082@debbugs.gnu.org, jca@wxcvbn.org > From: Dmitry Gutov > Date: Sun, 16 Oct 2016 18:58:36 +0300 > > It's the one in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24082#96. > > Direct link: > https://debbugs.gnu.org/cgi/bugreport.cgi?filename=bug-24082-2.patch;bug=24082;att=1;msg=96 This is okay for emacs-25, thanks. From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 17 20:04:57 2016 Received: (at 24082-done) by debbugs.gnu.org; 18 Oct 2016 00:04:57 +0000 Received: from localhost ([127.0.0.1]:37363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bwHtp-0003IE-69 for submit@debbugs.gnu.org; Mon, 17 Oct 2016 20:04:57 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:35201) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bwHtn-0003I0-5D for 24082-done@debbugs.gnu.org; Mon, 17 Oct 2016 20:04:55 -0400 Received: by mail-lf0-f41.google.com with SMTP id l131so266748441lfl.2 for <24082-done@debbugs.gnu.org>; Mon, 17 Oct 2016 17:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Yovxp73K4qlE8vq5LeJNF/VsxDbBq/c+BoC9Wo0LXpk=; b=vQ7lo+E57dQdetG4kibLeJ254xzI0pkQXTpplBY9K/VG985oj9BTF+faOBBKmzF+YX +EJebAHNjfcpOftIaSJWlbVdA9VHLBBJ4OtoBFQ5G6tqkQQtFhMg3JP73JXQEnB5S8Cx T8zUcEdj+4P5jzG2e6RnoDEgoy6KTW17nbwO5XC5mtXiVed+9n/yZ4C4abW0Sil3DOpV ZF81rQJkarf7hcyl94QwOdP2FRSfGb2hUYyq6vywZlwcNpH8vWRqi74PZaSNVRz39Ena qxCEWR2sgn11DeNEttP4i+3SA5irmiopxKymDTSJioWEmebVb3ASLzPB23wG6fdkmmsS IEoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Yovxp73K4qlE8vq5LeJNF/VsxDbBq/c+BoC9Wo0LXpk=; b=NHvjqE6nEbX+121u27foSztNZCjNxt5QiEFOxUPGOBY73e5HWSJkTFRyQdr+dSfVl6 ooTkh+MMgstfApQrCYKZ392naO+ZxVnBvjHFFb44DtjfzMZkO1LdV1X74bh49/N5EoCp 8Wj8s+62KiszAK/tFtOum5Nhty5ToPnhVFyXfBlTBT7flJ+iiq9+6AF1FW/XpA9Oulq8 ClulA9AVlkG9RbcPHyTdvkYnMs878L2CBS8+2dy8xB3AfVtbpSyLbkhbGbxTE71KgsDe 5CbenHoZFSGUcAmixrXMC/VBy+OV7qEMnfRI3DgpRlqSvcUpvCXQ5B6mRB8KSGNROqm+ l9BA== X-Gm-Message-State: AA6/9RlG9esnfwUAcdl4cVaD5u1fkP3n4XhnKS4Jn5UcR9IVO9zgQbRPfri4d7mQEO0+pg== X-Received: by 10.28.66.26 with SMTP id p26mr9500020wma.120.1476749089251; Mon, 17 Oct 2016 17:04:49 -0700 (PDT) Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id n6sm10895216wjg.30.2016.10.17.17.04.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Oct 2016 17:04:48 -0700 (PDT) Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory To: Eli Zaretskii References: <87r37h88j2.fsf@xi.bootis> <87eg3geaf6.fsf@ritchie.wxcvbn.org> <9fd623f3-eafe-384d-b9f2-22e2025f9819@yandex.ru> <83vawsz83c.fsf@gnu.org> <2d45ad9e-7624-993d-1722-e3abc05ba55c@yandex.ru> <83r37gyy4r.fsf@gnu.org> From: Dmitry Gutov Message-ID: Date: Tue, 18 Oct 2016 03:04:47 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 MIME-Version: 1.0 In-Reply-To: <83r37gyy4r.fsf@gnu.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 24082-done Cc: self@gkayaalp.com, 24082-done@debbugs.gnu.org, jca@wxcvbn.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: -0.2 (/) On 16.10.2016 20:58, Eli Zaretskii wrote: >> Direct link: >> https://debbugs.gnu.org/cgi/bugreport.cgi?filename=bug-24082-2.patch;bug=24082;att=1;msg=96 > > This is okay for emacs-25, thanks. Pushed. Thanks everyone! From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 18 13:21:38 2016 Received: (at 24082-done) by debbugs.gnu.org; 18 Oct 2016 17:21:38 +0000 Received: from localhost ([127.0.0.1]:38323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bwY54-0007ek-0y for submit@debbugs.gnu.org; Tue, 18 Oct 2016 13:21:38 -0400 Received: from slow1-d.mail.gandi.net ([217.70.178.86]:57841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bwY52-0007ec-6n for 24082-done@debbugs.gnu.org; Tue, 18 Oct 2016 13:21:36 -0400 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by slow1-d.mail.gandi.net (Postfix) with ESMTP id 2C13047A17B for <24082-done@debbugs.gnu.org>; Tue, 18 Oct 2016 19:21:35 +0200 (CEST) Received: from mfilter33-d.gandi.net (mfilter33-d.gandi.net [217.70.178.164]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id D45E641C095; Tue, 18 Oct 2016 19:21:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter33-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter33-d.gandi.net (mfilter33-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id RmL96_sQOlt7; Tue, 18 Oct 2016 19:21:10 +0200 (CEST) X-Originating-IP: 88.238.225.147 Received: from localhost (unknown [88.238.225.147]) (Authenticated sender: self@gkayaalp.com) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 671BF41C08E; Tue, 18 Oct 2016 19:21:09 +0200 (CEST) From: =?utf-8?Q?G=C3=B6ktu=C4=9F_Kayaalp?= To: Dmitry Gutov Subject: Re: bug#24082: 25.1; vc-dir for CVS repositories list all files as if from toplevel directory In-Reply-To: (message from Dmitry Gutov on Tue, 18 Oct 2016 03:04:47 +0300) Date: Tue, 18 Oct 2016 20:35:32 +0300 Message-ID: <87h9898srf.fsf@xi.bootis> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 24082-done Cc: eliz@gnu.org, 24082-done@debbugs.gnu.org, jca@wxcvbn.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: -0.7 (/) On 2016-10-18 03:04 +0300, Dmitry Gutov wrote: > Pushed. Thanks everyone! My pleasure, and thanks to everybody for their help! I'm ecstatic for having gotten my first patch into Emacs! --=20 =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp PGP pubkey: From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 21 21:34:38 2016 Received: (at 24082) by debbugs.gnu.org; 22 Oct 2016 01:34:38 +0000 Received: from localhost ([127.0.0.1]:45767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bxlCn-00049X-Rj for submit@debbugs.gnu.org; Fri, 21 Oct 2016 21:34:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bxlCm-00049L-1d for 24082@debbugs.gnu.org; Fri, 21 Oct 2016 21:34:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxlCf-0002BQ-T4 for 24082@debbugs.gnu.org; Fri, 21 Oct 2016 21:34:30 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxlCb-00029E-EV; Fri, 21 Oct 2016 21:34:25 -0400 Received: from localhost ([::1]:47700 helo=fencepost.gnu.org) by fencepost.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bxlCa-0008Py-U0; Fri, 21 Oct 2016 21:34:25 -0400 From: Dan Nicolaescu To: =?utf-8?B?R8O2a3R1xJ8=?= Kayaalp Subject: Re: bug#24082: [PATCH] Use =?utf-8?B?4oCYY3ZzIHVwZGF0ZeKAmQ==?= instead =?utf-8?B?4oCYY3ZzIHN0YXR1c+KAmQ==?= for CVS *vc-dir* buffers References: <87shs02k7i.fsf@xi.bootis> Date: Fri, 21 Oct 2016 21:34:23 -0400 In-Reply-To: <87shs02k7i.fsf@xi.bootis> (=?utf-8?B?IkfDtmt0dcSf?= Kayaalp"'s message of "Thu, 13 Oct 2016 21:10:57 +0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.3 (-----) X-Debbugs-Envelope-To: 24082 Cc: 24082@debbugs.gnu.org, jca@wxcvbn.org, dgutov@yandex.ru 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: -5.3 (-----) G=C3=B6ktu=C4=9F Kayaalp writes: > Hello, > > What do you think about the patch? Should it be merged? Sorry, I haven't used CVS in many years, so I don't know the implications of the proposed changes... --Dan > Also, on this thread [1, 2], there's J=C3=A9r=C3=A9mie's issue which I co= uldn't > reproduce (I tried various local and remote repos, including the OpenBSD > =E2=80=98src/=E2=80=99 repo). Do you have any ideas regarding this? > > I'll be able to work on the patch in the weekend (GMT+3) if any > modifications are needed. > > -gk. > > [1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#45 > [2] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D24082#54 > > --=20 > =C4=B0. V. G=C3=B6ktu=C4=9F Kayaalp > PGP pubkey: From unknown Sat Sep 06 13:38:00 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 19 Nov 2016 12:24:04 +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