diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2009-01-15 08:10:27 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2009-01-15 08:10:27 +0000 |
| commit | 3151c2ffabe2933ca925558526b25ac21b5bb11d (patch) | |
| tree | 70f4e3dfc991678334a91cf14eb1cf5efeddb28b /lisp/vc-hg.el | |
| parent | 987220737d1c94378abc0925ea33687866de7bb4 (diff) | |
| download | emacs-3151c2ffabe2933ca925558526b25ac21b5bb11d.tar.gz | |
(vc-hg-diff): Pass relative file names. (Bug#1903)
Diffstat (limited to 'lisp/vc-hg.el')
| -rw-r--r-- | lisp/vc-hg.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 05a1ae5473d..d47df2a7b3f 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -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) |