# HG changeset patch # User Stefan Monnier # Date 1182363534 0 # Node ID 1214f1b9e278615f29c42e2cecbd9df02b020007 # Parent 9785d18889edd127c47e2113b6c0aa58a33499cb (vc-bzr-dir-state): Use setq rather than set. Use vc-bzr-command rather than the ill defined vc-bzr-command*. (vc-bzr-command*): Remove both (incompatible) versions. (vc-bzr-do-command*): Remove. (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): Remove by folding into its only caller vc-bzr-command. (vc-bzr-command): Always set the environment, even when ineffective. (vc-bzr-version): Minor fix up. (vc-bzr-admin-dirname): New var. (vc-bzr-bzr-dir): Remove. (vc-bzr-root-dir): New fun. (vc-bzr-registered): Use it. Add an autoloaded version. (vc-bzr-responsible-p): Use vc-bzr-root-dir as well. (vc-bzr-view-log-function): Remove. (vc-bzr-log-view-mode): New major mode to replace it. (vc-bzr-print-log): Only activate the old hack if needed. diff -r 9785d18889ed -r 1214f1b9e278 lisp/vc-bzr.el --- a/lisp/vc-bzr.el Wed Jun 20 18:18:31 2007 +0000 +++ b/lisp/vc-bzr.el Wed Jun 20 18:18:54 2007 +0000 @@ -58,6 +58,7 @@ ;;; Code: (eval-when-compile + (require 'cl) (require 'vc)) ; for vc-exec-after (defgroup vc-bzr nil @@ -66,18 +67,18 @@ :group 'vc) (defcustom vc-bzr-program "bzr" - "*Name of the bzr command (excluding any arguments)." + "Name of the bzr command (excluding any arguments)." :group 'vc-bzr :type 'string) ;; Fixme: there's probably no call for this. (defcustom vc-bzr-program-args nil - "*List of global arguments to pass to `vc-bzr-program'." + "List of global arguments to pass to `vc-bzr-program'." :group 'vc-bzr :type '(repeat string)) (defcustom vc-bzr-diff-switches nil - "*String/list of strings specifying extra switches for bzr diff under VC." + "String/list of strings specifying extra switches for bzr diff under VC." :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) @@ -91,93 +92,42 @@ "Return a three-numeric element list with components of the bzr version. This is of the form (X Y Z) for revision X.Y.Z. The elements are zero if running `vc-bzr-program' doesn't produce the expected output." - (if vc-bzr-version - vc-bzr-version - (let ((s (shell-command-to-string - (concat (shell-quote-argument vc-bzr-program) " --version")))) - (if (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$" s) - (setq vc-bzr-version (list (string-to-number (match-string 1 s)) - (string-to-number (match-string 2 s)) - (string-to-number (match-string 3 s)))) - '(0 0 0))))) + (or vc-bzr-version + (setq vc-bzr-version + (let ((s (shell-command-to-string + (concat (shell-quote-argument vc-bzr-program) + " --version")))) + (if (string-match "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)$" s) + (list (string-to-number (match-string 1 s)) + (string-to-number (match-string 2 s)) + (string-to-number (match-string 3 s))) + '(0 0 0)))))) (defun vc-bzr-at-least-version (vers) "Return t if the bzr command reports being a least version VERS. First argument VERS is a list of the form (X Y Z), as returned by `vc-bzr-version'." (version-list-<= vers (vc-bzr-version))) -(eval-when-compile - (defmacro vc-bzr-with-process-environment (envspec &rest body) - "Prepend the contents of ENVSPEC to `process-environment', then execute BODY." - `(let ((process-environment process-environment)) - (mapcar (lambda (var) (add-to-list 'process-environment var)) ,envspec) - ,@body)) +;; since v0.9, bzr supports removing the progress indicators +;; by setting environment variable BZR_PROGRESS_BAR to "none". +(defun vc-bzr-command (bzr-command buffer okstatus file &rest args) + "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND. +Invoke the bzr command adding `BZR_PROGRESS_BAR=none' to the environment." + (let ((process-environment + (list* "BZR_PROGRESS_BAR=none" ; Suppress progress output (bzr >=0.9) + "LC_ALL=C" ; Force English output + process-environment)) + ;; bzr may attempt some kind of user interaction if its stdin/stdout + ;; is connected to a PTY; therefore, ask Emacs to use a pipe to + ;; communicate with it. + ;; This is redundant because vc-do-command does it already. --Stef + (process-connection-type nil)) + (apply 'vc-do-command buffer okstatus vc-bzr-program + file bzr-command (append vc-bzr-program-args args)))) - (defmacro vc-bzr-std-process-invocation (&rest body) - `(vc-bzr-with-process-environment - '("BZR_PROGRESS_BAR=none" ; suppress progress output (bzr >=0.9) - "LC_ALL=C") ; force English output - ;; bzr may attempt some kind of user interaction if its stdin/stdout - ;; is connected to a PTY; therefore, ask Emacs to use a pipe to - ;; communicate with it. - (let ((process-connection-type nil)) - ,@body)))) - -;; XXX: vc-do-command is tailored for RCS and assumes that command-line -;; options precede the file name (e.g., "ci -something file"); with bzr, -;; we need to pass options *after* the subcommand, e.g. "bzr ls --versioned". -(defun vc-bzr-do-command* (buffer okstatus command &rest args) - "Execute bzr COMMAND, notifying user and checking for errors. -This is a wrapper around `vc-do-command', which see for detailed -explanation of arguments BUFFER, OKSTATUS and COMMAND. - -If the optional list of ARGS is present, its elements are -appended to the command line, in the order given. - -Unlike `vc-do-command', this has no way of telling which elements -in ARGS are file names and which are command-line options, so be -sure to pass absolute file names if needed. On the other hand, -you can mix options and file names in any order." - (apply 'vc-do-command buffer okstatus command nil args)) - -(cond - ((vc-bzr-at-least-version '(0 9)) - ;; since v0.9, bzr supports removing the progress indicators - ;; by setting environment variable BZR_PROGRESS_BAR to "none". - (defun vc-bzr-command (bzr-command buffer okstatus file &rest args) - "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND. -Invoke the bzr command adding `BZR_PROGRESS_BAR=none' to the environment." - (vc-bzr-std-process-invocation - (apply 'vc-do-command buffer okstatus vc-bzr-program - file bzr-command (append vc-bzr-program-args args)))) - - (defun vc-bzr-command* (bzr-command buffer okstatus file &rest args) - "Wrapper round `vc-bzr-do-command*' using `vc-bzr-program' as COMMAND. -Invoke the bzr command adding `BZR_PROGRESS_BAR=none' to the environment. -First argument BZR-COMMAND is passed as the first optional argument to -`vc-bzr-do-command*'." - (vc-bzr-std-process-invocation - (apply 'vc-bzr-do-command* buffer okstatus vc-bzr-program - bzr-command (append vc-bzr-program-args args))))) - - (t - ;; for older versions, we fall back to washing the log buffer +(unless (vc-bzr-at-least-version '(0 9)) + ;; For older versions, we fall back to washing the log buffer ;; when all output has been gathered. - (defun vc-bzr-command (command buffer okstatus file &rest args) - "Wrapper round `vc-do-command' using `vc-bzr-program' as COMMAND." - ;; Note: The ^Ms from the progress-indicator stuff that bzr prints - ;; on stderr cause auto-detection of a mac coding system on the - ;; stream for async output. bzr ought to be fixed to be able to - ;; suppress this. See also `vc-bzr-post-command-function'. (We - ;; can't sink the stderr output in `vc-do-command'.) - (apply 'vc-do-command buffer okstatus vc-bzr-program - file command (append vc-bzr-program-args args))) - - (defun vc-bzr-command* (command buffer okstatus &rest args) - "Wrapper round `vc-bzr-do-command*' using `vc-bzr-program' as COMMAND." - (apply 'vc-bzr-do-command* buffer okstatus vc-bzr-program - command file (append vc-bzr-program-args args))) - (defun vc-bzr-post-command-function (command file flags) "`vc-post-command-functions' function to remove progress messages." ;; Note that using this requires that the vc command is run @@ -196,29 +146,26 @@ (while (looking-at "read knit.*\n") (replace-match ""))))) - (add-hook 'vc-post-command-functions 'vc-bzr-post-command-function))) + (add-hook 'vc-post-command-functions 'vc-bzr-post-command-function)) + +;;;###autoload +(defconst vc-bzr-admin-dirname ".bzr") ; FIXME: "_bzr" on w32? -(defun vc-bzr-bzr-dir (file) - "Return the .bzr directory in the hierarchy above FILE. +;;;###autoload (defun vc-bzr-registered (file) +;;;###autoload (if (vc-find-root file vc-bzr-admin-dirname) +;;;###autoload (progn +;;;###autoload (load "vc-bzr") +;;;###autoload (vc-bzr-registered file)))) + +(defun vc-bzr-root-dir (file) + "Return the root directory in the hierarchy above FILE. Return nil if there isn't one." - (setq file (expand-file-name file)) - (let ((dir (if (file-directory-p file) - file - (file-name-directory file))) - bzr) - (catch 'found - (while t - (setq bzr (expand-file-name ".bzr" dir)) ; fixme: "_bzr" on Doze?? - (if (file-directory-p bzr) - (throw 'found (file-name-as-directory bzr))) - (if (equal "" (file-name-nondirectory (directory-file-name dir))) - (throw 'found nil) - (setq dir (file-name-directory (directory-file-name dir)))))))) + (vc-find-root file vc-bzr-admin-dirname)) (defun vc-bzr-registered (file) "Return non-nil if FILE is registered with bzr." - (if (vc-bzr-bzr-dir file) ; short cut - (vc-bzr-state file))) ; expensive + (if (vc-bzr-root-dir file) ; Short cut. + (vc-bzr-state file))) ; Expensive. (defun vc-bzr-buffer-nonblank-p (&optional buffer) "Return non-nil if BUFFER contains any non-blank characters." @@ -298,11 +245,10 @@ ;; Could run `bzr status' in the directory and see if it succeeds, but ;; that's relatively expensive. -(defun vc-bzr-responsible-p (file) +(defalias 'vc-bzr-responsible-p 'vc-bzr-root-dir "Return non-nil if FILE is (potentially) controlled by bzr. The criterion is that there is a `.bzr' directory in the same -or a superior directory." - (vc-bzr-bzr-dir file)) +or a superior directory.") (defun vc-bzr-could-register (file) "Return non-nil if FILE could be registered under bzr." @@ -342,43 +288,39 @@ (unless contents-done (with-temp-buffer (vc-bzr-command "revert" t 'async file)))) -(eval-when-compile - (defvar log-view-message-re) - (defvar log-view-file-re) - (defvar log-view-font-lock-keywords) - (defvar log-view-current-tag-function)) +(defvar log-view-message-re) +(defvar log-view-file-re) +(defvar log-view-font-lock-keywords) +(defvar log-view-current-tag-function) -;; Grim hack to account for lack of an extension mechanism for -;; log-view. Should be fixed in VC... -(defun vc-bzr-view-log-function () - "To be added to `log-view-mode-hook' to set variables for bzr output. -Removes itself after running." - (remove-hook 'log-view-mode-hook 'vc-bzr-view-log-function) +(define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View" + (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack. (require 'add-log) ;; Don't have file markers, so use impossible regexp. (set (make-local-variable 'log-view-file-re) "\\'\\`") - (set (make-local-variable 'log-view-message-re) "^ *-+\n *\\(revno: [0-9]+\\|merged: .+\\)") + (set (make-local-variable 'log-view-message-re) + "^ *-+\n *\\(?:revno: \\([0-9]+\\)\\|merged: .+\\)") (set (make-local-variable 'log-view-font-lock-keywords) - `(("^ *committer: \ -\\([^<(]+?\\)[ ]*[(<]\\([A-Za-z0-9_.-]+@[A-Za-z0-9_.-]+\\)[>)]" - nil nil - (1 'change-log-name-face nil t) - (2 'change-log-email-face nil t) - (3 'change-log-email-face nil t)) - ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)) - (,log-view-message-re . 'log-view-message-face) -;; ("^ \\(.*\\)$" (1 'log-view-message-face)) - ))) + ;; log-view-font-lock-keywords is careful to use the buffer-local + ;; value of log-view-message-re only since Emacs-23. + (append `((,log-view-message-re . 'log-view-message-face)) + ;; log-view-font-lock-keywords + '(("^ *committer: \ +\\([^<(]+?\\)[ ]*[(<]\\([[:alnum:]_.-]+@[[:alnum:]_.-]+\\)[>)]" + (1 'change-log-name) + (2 'change-log-email)) + ("^ *timestamp: \\(.*\\)" (1 'change-log-date-face)))))) (defun vc-bzr-print-log (file &optional buffer) ; get buffer arg in Emacs 22 "Get bzr change log for FILE into specified BUFFER." - ;; Fixme: VC needs a hook to sort out the mode for the buffer, or at - ;; least set the regexps right. ;; Fixme: This might need the locale fixing up if things like `revno' ;; got localized, but certainly it shouldn't use LC_ALL=C. ;; NB. Can't be async -- see `vc-bzr-post-command-function'. (vc-bzr-command "log" buffer 0 file) - (add-hook 'log-view-mode-hook 'vc-bzr-view-log-function)) + ;; FIXME: Until Emacs-23, VC was missing a hook to sort out the mode for + ;; the buffer, or at least set the regexps right. + (unless (fboundp 'vc-default-log-view-mode) + (add-hook 'log-view-mode-hook 'vc-bzr-log-view-mode))) (defun vc-bzr-show-log-entry (version) "Find entry for patch name VERSION in bzr change log buffer." @@ -511,21 +453,22 @@ (defun vc-bzr-dir-state (dir &optional localp) "Find the VC state of all files in DIR. Optional argument LOCALP is always ignored." - (let (at-start bzr-root-directory current-bzr-state current-vc-state) - ;; check that DIR is a bzr repository - (set 'bzr-root-directory (vc-bzr-root dir)) - (unless (string-match "^/" bzr-root-directory) + (let ((bzr-root-directory (vc-bzr-root dir)) + (at-start t) + current-bzr-state current-vc-state) + ;; Check that DIR is a bzr repository. + (unless (file-name-absolute-p bzr-root-directory) (error "Cannot find bzr repository for directory `%s'" dir)) ;; `bzr ls --versioned' lists all versioned files; ;; assume they are up-to-date, unless we are given ;; evidence of the contrary. - (set 'at-start t) + (setq at-start t) (with-temp-buffer - (vc-bzr-command* "ls" t 0 "--versioned" "--non-recursive") + (vc-bzr-command "ls" t 0 nil "--versioned" "--non-recursive") (goto-char (point-min)) - (while (or at-start + (while (or at-start (eq 0 (forward-line))) - (set 'at-start nil) + (setq at-start nil) (let ((file (expand-file-name (buffer-substring-no-properties (line-beginning-position) (line-end-position)) @@ -535,26 +478,26 @@ ;; mixes different SCMs in the same dir? (vc-file-setprop file 'vc-backend 'BZR)))) ;; `bzr status' reports on added/modified/renamed and unknown/ignored files - (set 'at-start t) + (setq at-start t) (with-temp-buffer (vc-bzr-command "status" t 0 nil) (goto-char (point-min)) - (while (or at-start + (while (or at-start (eq 0 (forward-line))) - (set 'at-start nil) + (setq at-start nil) (cond ((looking-at "^added") - (set 'current-vc-state 'edited) - (set 'current-bzr-state 'added)) + (setq current-vc-state 'edited) + (setq current-bzr-state 'added)) ((looking-at "^modified") - (set 'current-vc-state 'edited) - (set 'current-bzr-state 'modified)) + (setq current-vc-state 'edited) + (setq current-bzr-state 'modified)) ((looking-at "^renamed") - (set 'current-vc-state 'edited) - (set 'current-bzr-state 'renamed)) + (setq current-vc-state 'edited) + (setq current-bzr-state 'renamed)) ((looking-at "^\\(unknown\\|ignored\\)") - (set 'current-vc-state nil) - (set 'current-bzr-state 'not-versioned)) + (setq current-vc-state nil) + (setq current-bzr-state 'not-versioned)) ((looking-at " ") ;; file names are indented by two spaces (when current-vc-state @@ -575,8 +518,8 @@ (vc-file-setprop file 'vc-state nil)))) (t ;; skip this part of `bzr status' output - (set 'current-vc-state nil) - (set 'current-bzr-state nil))))))) + (setq current-vc-state nil) + (setq current-bzr-state nil))))))) (defun vc-bzr-dired-state-info (file) "Bzr-specific version of `vc-dired-state-info'."