# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1184894538 0
# Node ID 5fe5698ac0fb49901dff3137d5586e654c3072d4
# Parent  d3b18c88b7e5455b1694e69be276e94f27dc83ef
* vc-hooks.el (vc-default-workfile-unchanged-p): Pass a list
instead of a file.

* vc-hg.el (vc-hg-print-log): Fix for multiple files.

* vc.el: (vc-directory-exclusion-list): Add .hg and .bzr.
(vc-diff-internal): Pass a list instead of a file.

diff -r d3b18c88b7e5 -r 5fe5698ac0fb lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jul 20 00:19:49 2007 +0000
+++ b/lisp/ChangeLog	Fri Jul 20 01:22:18 2007 +0000
@@ -1,5 +1,8 @@
 2007-07-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* vc-hooks.el (vc-default-workfile-unchanged-p): Pass a list
+	instead of a file.
+
 	* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
 	(vc-hg-registered): Replace if with when.
 	(vc-hg-state): Deal with nonexistent files and handle removed
@@ -7,10 +10,13 @@
 	(vc-hg-dir-state, vc-hg-dired-state-info): New functions.
 	(vc-hg-checkout): Re-enable.
 	(vc-hg-create-repo): Fix typos.
+	(vc-hg-print-log): Fix for multiple files.
 
 	* vc.el: Fix typo.
 	(vc-print-log): Fix call to print-log.
 	(vc-default-comment-history): Likewise.
+	(vc-directory-exclusion-list): Add .hg and .bzr.
+	(vc-diff-internal): Pass a list instead of a file.
 
 	* vc-mcvs.el (vc-mcvs-create-repo): Fix typos.
 
diff -r d3b18c88b7e5 -r 5fe5698ac0fb lisp/vc-hg.el
--- a/lisp/vc-hg.el	Fri Jul 20 00:19:49 2007 +0000
+++ b/lisp/vc-hg.el	Fri Jul 20 01:22:18 2007 +0000
@@ -248,11 +248,7 @@
       (with-current-buffer
 	  buffer
 	(insert "File:        " (file-name-nondirectory file) "\n"))
-      (vc-hg-command
-       buffer
-       ;; XXX Is this stuff really needed?
-       (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
-       file "log"))))
+      (vc-hg-command buffer nil file "log"))))
 
 (defvar log-view-message-re)
 (defvar log-view-file-re)
diff -r d3b18c88b7e5 -r 5fe5698ac0fb lisp/vc-hooks.el
--- a/lisp/vc-hooks.el	Fri Jul 20 00:19:49 2007 +0000
+++ b/lisp/vc-hooks.el	Fri Jul 20 01:22:18 2007 +0000
@@ -528,7 +528,7 @@
   (zerop (condition-case err
              ;; If the implementation supports it, let the output
              ;; go to *vc*, not *vc-diff*, since this is an internal call.
-             (vc-call diff file nil nil "*vc*")
+             (vc-call diff (list file) nil nil "*vc*")
            (wrong-number-of-arguments
             ;; If this error came from the above call to vc-BACKEND-diff,
             ;; try again without the optional buffer argument (for
@@ -539,7 +539,7 @@
                                                         'diff))))
                     (not (eq (caddr err) 4)))
                 (signal (car err) (cdr err))
-              (vc-call diff file))))))
+              (vc-call diff (list file)))))))
 
 (defun vc-workfile-version (file)
   "Return the repository version from which FILE was checked out.
diff -r d3b18c88b7e5 -r 5fe5698ac0fb lisp/vc.el
--- a/lisp/vc.el	Fri Jul 20 00:19:49 2007 +0000
+++ b/lisp/vc.el	Fri Jul 20 01:22:18 2007 +0000
@@ -46,8 +46,9 @@
 
 ;; This mode is fully documented in the Emacs user's manual.
 ;;
-;; Supported version-control systems presently include CVS, RCS, GNU Arch,
-;; Subversion, Meta-CVS, and SCCS (or its free replacement, CSSC).
+;; Supported version-control systems presently include CVS, RCS, GNU
+;; Arch, Subversion, Bzr, Mercurial, Meta-CVS, and SCCS (or its free
+;; replacement, CSSC).
 ;;
 ;; Some features will not work with old RCS versions.  Where
 ;; appropriate, VC finds out which version you have, and allows or
@@ -578,7 +579,8 @@
   :group 'vc
   :version "20.3")
 
-(defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" "{arch}")
+(defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" 
+					 ".hg" ".bzr" "{arch}")
   "List of directory names to be ignored when walking directory trees."
   :type '(repeat string)
   :group 'vc)
@@ -1934,7 +1936,7 @@
                 (error "diff failed"))
             (if (not vc-diff-knows-L) (setq vc-diff-knows-L 'yes)))
           status)
-      (vc-call diff (list file) rev1 rev2 "*vc-diff"))))
+      (vc-call diff (list file) rev1 rev2 "*vc-diff*"))))
 
 (defun vc-switches (backend op)
   (let ((switches