comparison contrib/mercurial.el @ 2690:e9ecc45795e8

merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 27 Jul 2006 12:34:02 +0200
parents 7a32b7e6c563
children a5c43944e1ee
comparison
equal deleted inserted replaced
2689:489c3bacce96 2690:e9ecc45795e8
378 (defun hg-read-file-name (&optional prompt default) 378 (defun hg-read-file-name (&optional prompt default)
379 "Read a file or directory name, or a pattern, to use with a command." 379 "Read a file or directory name, or a pattern, to use with a command."
380 (save-excursion 380 (save-excursion
381 (while hg-prev-buffer 381 (while hg-prev-buffer
382 (set-buffer hg-prev-buffer)) 382 (set-buffer hg-prev-buffer))
383 (let ((path (or default (buffer-file-name) default-directory))) 383 (let ((path (or default
384 (buffer-file-name)
385 (expand-file-name default-directory))))
384 (if (or (not path) current-prefix-arg) 386 (if (or (not path) current-prefix-arg)
385 (expand-file-name 387 (expand-file-name
386 (eval (list* 'read-file-name 388 (eval (list* 'read-file-name
387 (format "File, directory or pattern%s: " 389 (format "File, directory or pattern%s: "
388 (or prompt "")) 390 (or prompt ""))
970 (replace-regexp " \\.\\.." " " nil 0 (buffer-size)) 972 (replace-regexp " \\.\\.." " " nil 0 (buffer-size))
971 (goto-char 0) 973 (goto-char 0)
972 (cd (hg-root path))) 974 (cd (hg-root path)))
973 (when update 975 (when update
974 (with-current-buffer buf 976 (with-current-buffer buf
975 (set (make-local-variable 'backup-inhibited) nil) 977 (when (local-variable-p 'backup-inhibited)
978 (kill-local-variable 'backup-inhibited))
976 (hg-mode-line))))) 979 (hg-mode-line)))))
977 980
978 (defun hg-incoming (&optional repo) 981 (defun hg-incoming (&optional repo)
979 "Display changesets present in REPO that are not present locally." 982 "Display changesets present in REPO that are not present locally."
980 (interactive (list (hg-read-repo-name " where changes would come from"))) 983 (interactive (list (hg-read-repo-name " where changes would come from")))