Mercurial > emacs
changeset 101200:bbf505632d29
(vc-hg-diff): Pass relative file names. (Bug#1903)
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 15 Jan 2009 08:10:27 +0000 |
| parents | 7eba5f48f79f |
| children | b9801521d078 |
| files | lisp/ChangeLog lisp/vc-hg.el |
| diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jan 15 07:56:58 2009 +0000 +++ b/lisp/ChangeLog Thu Jan 15 08:10:27 2009 +0000 @@ -1,3 +1,7 @@ +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.
--- a/lisp/vc-hg.el Thu Jan 15 07:56:58 2009 +0000 +++ b/lisp/vc-hg.el Thu Jan 15 08:10:27 2009 +0000 @@ -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 @@ (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)