[Emacs-diffs] trunk r113590: vc-ignore fixes.

[Xue Fuqiao]

------------------------------------------------------------
revno: 113590
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-30 11:46:06 +0800
message:
  vc-ignore fixes.
  
  * vc/vc-svn.el (vc-svn-ignore): Remove `interactive'.  Use `*vc*'
  buffer for output.
  
  * vc/vc-hg.el (vc-hg-ignore): Remove `interactive'; do not assume
  point-min==1; fix search string; fix parentheses missing.
  
  * vc/vc-git.el (vc-git-ignore): Remove `interactive'; do not
  assume point-min==1; fix search string; fix parentheses missing.
  
  * vc/vc-cvs.el (vc-cvs-ignore): Remove `interactive'.
  
  * vc/vc-bzr.el (vc-bzr-ignore): Remove `interactive'.  Use `*vc*'
  buffer for output.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-bzr.el              vcbzr.el-20091113204419-o5vbwnq5f7feedwu-5055
  lisp/vc/vc-cvs.el              vccvs.el-20091113204419-o5vbwnq5f7feedwu-1927
  lisp/vc/vc-git.el              vcgit.el-20091113204419-o5vbwnq5f7feedwu-5070
  lisp/vc/vc-hg.el               vchg.el-20091113204419-o5vbwnq5f7feedwu-5062
  lisp/vc/vc-svn.el              vcsvn.el-20091113204419-o5vbwnq5f7feedwu-2575

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-30 00:29:09 +0000
+++ b/lisp/ChangeLog    2013-07-30 03:46:06 +0000
@@ -1,3 +1,19 @@
+2013-07-30  Xue Fuqiao  <address@hidden>
+
+       * vc/vc-svn.el (vc-svn-ignore): Remove `interactive'.  Use `*vc*'
+       buffer for output.
+
+       * vc/vc-hg.el (vc-hg-ignore): Remove `interactive'; do not assume
+       point-min==1; fix search string; fix parentheses missing.
+
+       * vc/vc-git.el (vc-git-ignore): Remove `interactive'; do not
+       assume point-min==1; fix search string; fix parentheses missing.
+
+       * vc/vc-cvs.el (vc-cvs-ignore): Remove `interactive'.
+
+       * vc/vc-bzr.el (vc-bzr-ignore): Remove `interactive'.  Use `*vc*'
+       buffer for output.
+
 2013-07-29  Eli Zaretskii  <address@hidden>
 
        * frame.el (frame-notice-user-settings): Avoid inflooping when the

=== modified file 'lisp/vc/vc-bzr.el'
--- a/lisp/vc/vc-bzr.el 2013-07-30 00:25:31 +0000
+++ b/lisp/vc/vc-bzr.el 2013-07-30 03:46:06 +0000
@@ -653,9 +653,7 @@
 
 (defun vc-bzr-ignore (file)
   "Ignore FILE under Bazaar."
-  (interactive)
-  (vc-bzr-command "ignore" (get-buffer-create "*vc-ignore*") 0
-                 file))
+  (vc-bzr-command "ignore" t 0 file))
 
 (defun vc-bzr-checkout (_file &optional _editable rev)
   (if rev (error "Operation not supported")

=== modified file 'lisp/vc/vc-cvs.el'
--- a/lisp/vc/vc-cvs.el 2013-07-30 00:25:31 +0000
+++ b/lisp/vc/vc-cvs.el 2013-07-30 03:46:06 +0000
@@ -1228,7 +1228,6 @@
 
 (defun vc-cvs-ignore (file)
   "Ignore FILE under CVS."
-  (interactive)
   (cvs-append-to-ignore (file-name-directory file) file))
 
 (defun cvs-append-to-ignore (dir str &optional old-dir)

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2013-07-30 00:25:31 +0000
+++ b/lisp/vc/vc-git.el 2013-07-30 03:46:06 +0000
@@ -682,15 +682,14 @@
 
 (defun vc-git-ignore (file)
   "Ignore FILE under Git."
-  (interactive)
   (with-temp-buffer
     (insert-file-contents
-     (let (gitignore (concat (file-name-as-directory (vc-git-root
-                                                     default-directory)) 
".gitignore"))
-       (unless (search-forward file nil t)
+     (let ((gitignore (concat (file-name-as-directory (vc-git-root
+                                                     default-directory)) 
".gitignore")))
+       (unless (search-forward (concat "\n" file "\n") nil t)
         (goto-char (point-max))
         (insert (concat "\n" file "\n"))
-        (write-region 1 (point-max) gitignore))))))
+        (write-region (point-min) (point-max) gitignore))))))
 
 (defun vc-git-checkout (file &optional _editable rev)
   (vc-git-command nil 0 file "checkout" (or rev "HEAD")))

=== modified file 'lisp/vc/vc-hg.el'
--- a/lisp/vc/vc-hg.el  2013-07-30 00:25:31 +0000
+++ b/lisp/vc/vc-hg.el  2013-07-30 03:46:06 +0000
@@ -461,15 +461,14 @@
 
 (defun vc-hg-ignore (file)
   "Ignore FILE under Mercurial."
-  (interactive)
   (with-temp-buffer
     (insert-file-contents 
-     (let (hgignore (concat (file-name-as-directory (vc-hg-root
-                                                    default-directory)) 
".hgignore"))
-       (unless (search-forward file nil t)
+     (let ((hgignore (concat (file-name-as-directory (vc-hg-root
+                                                    default-directory)) 
".hgignore")))
+       (unless (search-forward (concat "\n" file "\n") nil t)
         (goto-char (point-max))
         (insert (concat "\n" file "\n"))
-        (write-region 1 (point-max) hgignore))))))
+        (write-region (point-min) (point-max) hgignore))))))
 
 ;; Modeled after the similar function in vc-bzr.el
 (defun vc-hg-checkout (file &optional _editable rev)

=== modified file 'lisp/vc/vc-svn.el'
--- a/lisp/vc/vc-svn.el 2013-07-30 00:25:31 +0000
+++ b/lisp/vc/vc-svn.el 2013-07-30 03:46:06 +0000
@@ -354,9 +354,7 @@
 
 (defun vc-svn-ignore (file)
   "Ignore FILE under Subversion."
-  (interactive)
-  (vc-svn-command (get-buffer-create "*vc-ignore*") 0
-                 file "propedit" "svn:ignore"))
+  (vc-svn-command t 0 file "propedit" "svn:ignore"))
 
 (defun vc-svn-checkout (file &optional editable rev)
   (message "Checking out %s..." file)