[Emacs-diffs] emacs/lisp ChangeLog vc-hg.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/01/15 08:10:31

Modified files:
        lisp           : ChangeLog vc-hg.el 

Log message:
        (vc-hg-diff): Pass relative file names.  (Bug#1903)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15108&r2=1.15109
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-hg.el?cvsroot=emacs&r1=1.94&r2=1.95

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15108
retrieving revision 1.15109
diff -u -b -r1.15108 -r1.15109
--- ChangeLog   15 Jan 2009 07:56:58 -0000      1.15108
+++ ChangeLog   15 Jan 2009 08:10:27 -0000      1.15109
@@ -1,3 +1,7 @@
+2009-01-15  Dan Nicolaescu  <address@hidden>
+
+       * vc-hg.el (vc-hg-diff): Pass relative file names.  (Bug#1903)
+
 2009-01-15  Martin Rudalics  <address@hidden>
 
        * window.el (special-display-p): Revert 2009-01-14 change.

Index: vc-hg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- vc-hg.el    5 Jan 2009 03:19:52 -0000       1.94
+++ vc-hg.el    15 Jan 2009 08:10:31 -0000      1.95
@@ -259,15 +259,16 @@
 (defun vc-hg-diff (files &optional oldvers newvers buffer)
   "Get a difference report using hg between two revisions of FILES."
   (let* ((firstfile (car files))
+        (cwd (if firstfile (file-name-directory firstfile)
+               (expand-file-name default-directory)))
         (working (and firstfile (vc-working-revision firstfile))))
     (when (and (equal oldvers working) (not newvers))
       (setq oldvers nil))
     (when (and (not oldvers) newvers)
       (setq oldvers working))
     (apply #'vc-hg-command (or buffer "*vc-diff*") nil
-          (mapcar (lambda (file) (file-name-nondirectory file)) files)
-          "--cwd" (or (when firstfile (file-name-directory firstfile))
-                      (expand-file-name default-directory))
+          (mapcar (lambda (file) (file-relative-name file cwd)) files)
+          "--cwd" cwd
           "diff"
           (append
            (vc-switches 'hg 'diff)