Commit 3151c2ff authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

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

parent 98722073
2009-01-15 Dan Nicolaescu <dann@ics.uci.edu>
* vc-hg.el (vc-hg-diff): Pass relative file names. (Bug#1903)
2009-01-15 Martin Rudalics <rudalics@gmx.at>
 
* window.el (special-display-p): Revert 2009-01-14 change.
......
......@@ -44,8 +44,8 @@
;; - state-heuristic (file) NOT NEEDED
;; - dir-status (dir update-function) OK
;; - dir-status-files (dir files ds uf) OK
;; - dir-extra-headers (dir) OK
;; - dir-printer (fileinfo) OK
;; - dir-extra-headers (dir) OK
;; - dir-printer (fileinfo) OK
;; * working-revision (file) OK
;; - latest-on-branch-p (file) ??
;; * checkout-model (files) OK
......@@ -80,8 +80,8 @@
;; - annotate-current-time () NOT NEEDED
;; - annotate-extract-revision-at-line () OK
;; TAG SYSTEM
;; - create-tag (dir name branchp) NEEDED
;; - retrieve-tag (dir name update) NEEDED
;; - create-tag (dir name branchp) NEEDED
;; - retrieve-tag (dir name update) NEEDED
;; MISCELLANEOUS
;; - make-version-backups-p (file) ??
;; - repository-hostname (dirname) ??
......@@ -259,15 +259,16 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment