From: Nick Roberts <nickrob@snap.net.nz>
To: Glenn Morris <rgm@gnu.org>, 1046@emacsbugs.donarmstrong.com
Subject: bug#1046: 23.0.60; vc-dir with Subversion
Date: Sat, 4 Oct 2008 20:53:57 +1200 [thread overview]
Message-ID: <18663.12069.154443.910505@kahikatea.snap.net.nz> (raw)
In-Reply-To: <pgwsgrex5m.fsf@fencepost.gnu.org>
> >> In the past I've remarked that with CVS vc-dir ignores vc-stay-local (and
> >> vc-cvs-stay-local) and consults the repository, in any case.
> >
> > Can you file a separate bug for that please, if it still applies?
>
> Never mind. For a limited time only, your initial bug report entitles
> you to one complimentary patch for a second issue.
I've glanced over it and tried it out and it looks good to me.
Thanks,
Nick
>
> *** vc-cvs.el 7 Sep 2008 20:24:27 -0000 1.148
> --- vc-cvs.el 1 Oct 2008 23:02:15 -0000
> ***************
> *** 905,912 ****
> --- 905,943 ----
> ;; (funcall update-function result)))
> )
>
> + ;; Based on vc-cvs-dir-state-heuristic.
Perhaps mention that this function is only in pre Emacs 23. I'm not sure that
I understand the current naming convention. Some functions now use 'status':
vc-cvs-dir-status, while others still use 'state': vc-cvs-state-heuristic.
> + (defun vc-cvs-dir-status-heuristic (dir update-function &optional basedir)
> + "Find the CVS state of all files in DIR, using only local information."
> + (let (file basename status result dirlist)
(let (result dirlist)
> + (with-temp-buffer
> + (vc-cvs-get-entries dir)
> + (goto-char (point-min))
> + (while (not (eobp))
> + (if (looking-at "D/\\([^/]*\\)////")
> + (push (expand-file-name (match-string 1) dir) dirlist)
> + ;; CVS-removed files are not taken under VC control.
> + (when (looking-at "/\\([^/]*\\)/[^/-]")
> + (setq basename (match-string 1)
> + file (expand-file-name basename dir)
> + status (or (vc-file-getprop file 'vc-state)
> + (vc-cvs-parse-entry file t)))
(let ((basename (match-string 1))
(file (expand-file-name basename dir))
(status (or (vc-file-getprop file 'vc-state)
(vc-cvs-parse-entry file t))))
No big deal. Perhaps a bit clearer.
...
--
Nick http://www.inet.net.nz/~nickrob
next prev parent reply other threads:[~2008-10-04 8:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-28 7:33 bug#1046: 23.0.60; vc-dir with Subversion Nick Roberts
2008-10-01 7:28 ` Glenn Morris
2008-10-01 16:05 ` Glenn Morris
2008-10-01 23:03 ` Glenn Morris
2008-10-04 8:53 ` Nick Roberts [this message]
2008-10-04 19:54 ` Glenn Morris
2008-10-06 14:18 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18663.12069.154443.910505@kahikatea.snap.net.nz \
--to=nickrob@snap.net.nz \
--cc=1046@emacsbugs.donarmstrong.com \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).