[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: bringing psvn.el up to 1.7+ working copies

From: Joseph Schaefer <joe_schaefer_at_yahoo.com>
Date: Fri, 22 Feb 2013 15:24:47 -0500

Here's a better patch that doesn't break the docstring.

Index: contrib/client-side/emacs/psvn.el
===================================================================
--- contrib/client-side/emacs/psvn.el (revision 1449112)
+++ contrib/client-side/emacs/psvn.el (working copy)
@@ -1127,33 +1127,13 @@
 asks svn to connect to the repository and check to see if there are updates
 there.
 
-If there is no .svn directory, examine if there is CVS and run
-`cvs-examine'. Otherwise ask if to run `dired'."
+ Note: psvn.el no longer supports dispatch to cvs nor dired."
+
   (interactive (list (svn-read-directory-name "SVN status directory: "
                                               nil default-directory nil)
                      current-prefix-arg))
- (let ((svn-dir (format "%s%s"
- (file-name-as-directory dir)
- (svn-wc-adm-dir-name)))
- (cvs-dir (format "%sCVS" (file-name-as-directory dir))))
- (cond
- ((file-directory-p svn-dir)
- (setq arg (svn-status-possibly-negate-meaning-of-arg arg 'svn-status))
- (svn-status-1 dir arg))
- ((and (file-directory-p cvs-dir)
- (fboundp 'cvs-examine))
- (cvs-examine dir nil))
- (t
- (when (y-or-n-p
- (format
- (concat
- "%s "
- "is not Subversion controlled (missing %s "
- "directory). "
- "Run dired instead? ")
- dir
- (svn-wc-adm-dir-name)))
- (dired dir))))))
+ (setq arg (svn-status-possibly-negate-meaning-of-arg arg 'svn-status))
+ (svn-status-1 dir arg))
 
 (defvar svn-status-display-new-status-buffer nil)
 (defun svn-status-1 (dir &optional arg)

On Feb 22, 2013, at 12:15 PM, Joseph Schaefer <joe_schaefer_at_yahoo.com> wrote:

> Here's a fugly patch that I'd like to apply to trunk that lets
> psvn.el work properly with 1.7+ working copies that consolidate
> .svn dirs to the top-level of the working copy. For the most part
> psvn.el doesn't need to know where this directory lives, so just
> removing the check for it seems to work fine.
>
> Index: psvn.el
> ===================================================================
> --- psvn.el (revision 1449112)
> +++ psvn.el (working copy)
> @@ -1127,33 +1127,11 @@
> asks svn to connect to the repository and check to see if there are updates
> there.
>
> -If there is no .svn directory, examine if there is CVS and run
> -`cvs-examine'. Otherwise ask if to run `dired'."
> (interactive (list (svn-read-directory-name "SVN status directory: "
> nil default-directory nil)
> current-prefix-arg))
> - (let ((svn-dir (format "%s%s"
> - (file-name-as-directory dir)
> - (svn-wc-adm-dir-name)))
> - (cvs-dir (format "%sCVS" (file-name-as-directory dir))))
> - (cond
> - ((file-directory-p svn-dir)
> - (setq arg (svn-status-possibly-negate-meaning-of-arg arg 'svn-status))
> - (svn-status-1 dir arg))
> - ((and (file-directory-p cvs-dir)
> - (fboundp 'cvs-examine))
> - (cvs-examine dir nil))
> - (t
> - (when (y-or-n-p
> - (format
> - (concat
> - "%s "
> - "is not Subversion controlled (missing %s "
> - "directory). "
> - "Run dired instead? ")
> - dir
> - (svn-wc-adm-dir-name)))
> - (dired dir))))))
> + (setq arg (svn-status-possibly-negate-meaning-of-arg arg 'svn-status))
> + (svn-status-1 dir arg))
>
> (defvar svn-status-display-new-status-buffer nil)
> (defun svn-status-1 (dir &optional arg)
>
Received on 2013-02-22 21:52:05 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.