Mercurial > emacs

comparison lisp/vc.el @ 19126:c57d673ff676

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-version-diff): Use defaults, not initial input, for reading the arguments.
author Richard M. Stallman <rms@gnu.org>
date Mon, 04 Aug 1997 04:29:53 +0000
parents 5439070e5d46
children 31175a4bf0a6
comparison
equal deleted inserted replaced
19125:8aad7cef6fc0 19126:c57d673ff676
1300 "For FILE, report diffs between two stored versions REL1 and REL2 of it. 1300 "For FILE, report diffs between two stored versions REL1 and REL2 of it.
1301 If FILE is a directory, generate diffs between versions for all registered 1301 If FILE is a directory, generate diffs between versions for all registered
1302 files in or below it." 1302 files in or below it."
1303 (interactive 1303 (interactive
1304 (let ((file (read-file-name "File or directory to diff: " 1304 (let ((file (read-file-name "File or directory to diff: "
1305 default-directory buffer-file-name t 1305 default-directory buffer-file-name t))
1306 (file-name-nondirectory buffer-file-name)))
1307 (rel1-default nil) (rel2-default nil)) 1306 (rel1-default nil) (rel2-default nil))
1308 ;; compute default versions based on the file state 1307 ;; compute default versions based on the file state
1309 (cond 1308 (cond
1310 ;; if it's a directory, don't supply any version defauolt 1309 ;; if it's a directory, don't supply any version defauolt
1311 ((file-directory-p file) 1310 ((file-directory-p file)
1317 (t 1316 (t
1318 (setq rel1-default (vc-previous-version (vc-workfile-version file))) 1317 (setq rel1-default (vc-previous-version (vc-workfile-version file)))
1319 (setq rel2-default (vc-workfile-version file)))) 1318 (setq rel2-default (vc-workfile-version file))))
1320 ;; construct argument list 1319 ;; construct argument list
1321 (list file 1320 (list file
1322 (read-string "Older version: " rel1-default) 1321 (read-string (if rel1-default
1323 (read-string "Newer version: " rel2-default)))) 1322 (concat "Older version: (default "
1323 rel1-default ") ")
1324 "Older version: ")
1325 nil nil rel1-default)
1326 (read-string (if rel2-default
1327 (concat "Newer version: (default "
1328 rel2-default ") ")
1329 "Newer version: ")
1330 nil nil rel2-default))))
1324 (if (string-equal rel1 "") (setq rel1 nil)) 1331 (if (string-equal rel1 "") (setq rel1 nil))
1325 (if (string-equal rel2 "") (setq rel2 nil)) 1332 (if (string-equal rel2 "") (setq rel2 nil))
1326 (if (file-directory-p file) 1333 (if (file-directory-p file)
1327 (let ((camefrom (current-buffer))) 1334 (let ((camefrom (current-buffer)))
1328 (set-buffer (get-buffer-create "*vc-status*")) 1335 (set-buffer (get-buffer-create "*vc-status*"))