Mercurial > emacs

comparison lisp/vc.el @ 27436:564f85cd6921

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-version-diff): Make sure file name is expanded.
author Gerd Moellmann <gerd@gnu.org>
date Wed, 26 Jan 2000 10:31:13 +0000
parents 40036067f5cf
children 8a724c4f9928
comparison
equal deleted inserted replaced
27435:4bd7fdf959dc 27436:564f85cd6921
3 ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. 3 ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
4 4
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> 6 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
7 7
8 ;; $Id: vc.el,v 1.257 1999/10/15 15:44:52 monnier Exp $ 8 ;; $Id: vc.el,v 1.258 1999/12/02 14:21:08 gerd Exp $
9 9
10 ;; This file is part of GNU Emacs. 10 ;; This file is part of GNU Emacs.
11 11
12 ;; GNU Emacs is free software; you can redistribute it and/or modify 12 ;; GNU Emacs is free software; you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by 13 ;; it under the terms of the GNU General Public License as published by
1404 (defun vc-version-diff (file rel1 rel2) 1404 (defun vc-version-diff (file rel1 rel2)
1405 "For FILE, report diffs between two stored versions REL1 and REL2 of it. 1405 "For FILE, report diffs between two stored versions REL1 and REL2 of it.
1406 If FILE is a directory, generate diffs between versions for all registered 1406 If FILE is a directory, generate diffs between versions for all registered
1407 files in or below it." 1407 files in or below it."
1408 (interactive 1408 (interactive
1409 (let ((file (read-file-name (if buffer-file-name 1409 (let ((file (expand-file-name
1410 "File or dir to diff: (default visited file) " 1410 (read-file-name (if buffer-file-name
1411 "File or dir to diff: ") 1411 "File or dir to diff: (default visited file) "
1412 default-directory buffer-file-name t)) 1412 "File or dir to diff: ")
1413 default-directory buffer-file-name t)))
1413 (rel1-default nil) (rel2-default nil)) 1414 (rel1-default nil) (rel2-default nil))
1414 ;; compute default versions based on the file state 1415 ;; compute default versions based on the file state
1415 (cond 1416 (cond
1416 ;; if it's a directory, don't supply any version defauolt 1417 ;; if it's a directory, don't supply any version defauolt
1417 ((file-directory-p file) 1418 ((file-directory-p file)