19
(defvar bzr-command-prefix "\C-cb"
19
(defvar brz-command-prefix "\C-cb"
20
20
;; This default value breaks the Emacs rules and uses a sequence
21
21
;; reserved for the user's own custom bindings. That's not good but
22
22
;; I can't think of a decent standard one. -luke (14/Mar/2005)
23
"Prefix sequence for bzr-mode commands.")
25
(defvar bzr-command "bzr"
26
"*Shell command to execute bzr.")
28
(defvar bzr-buffer "*bzr-command*"
29
"Buffer for user-visible bzr command output.")
23
"Prefix sequence for brz-mode commands.")
25
(defvar brz-command "brz"
26
"*Shell command to execute brz.")
28
(defvar brz-buffer "*brz-command*"
29
"Buffer for user-visible brz command output.")
33
(define-minor-mode bzr-mode
33
(define-minor-mode brz-mode
37
37
;; Coax define-minor-mode into creating a keymap.
38
38
;; We'll fill it in manually though because define-minor-mode seems
39
39
;; hopeless for changing bindings without restarting Emacs.
40
`((,bzr-command-prefix . fake)))
42
(defvar bzr-mode-commands-map nil
43
"Keymap for bzr-mode commands.
44
This map is bound to a prefix sequence in `bzr-mode-map'.")
46
(defconst bzr-command-keys '(("l" bzr-log)
50
"Keys to bind in `bzr-mode-commands-map'.")
52
(defun bzr-init-command-keymap ()
53
"Bind the bzr-mode keys.
40
`((,brz-command-prefix . fake)))
42
(defvar brz-mode-commands-map nil
43
"Keymap for brz-mode commands.
44
This map is bound to a prefix sequence in `brz-mode-map'.")
46
(defconst brz-command-keys '(("l" brz-log)
50
"Keys to bind in `brz-mode-commands-map'.")
52
(defun brz-init-command-keymap ()
53
"Bind the brz-mode keys.
54
54
This command can be called interactively to redefine the keys from
57
(setq bzr-mode-commands-map (make-sparse-keymap))
58
(dolist (spec bzr-command-keys)
59
(define-key bzr-mode-commands-map (car spec) (cadr spec)))
60
(define-key bzr-mode-map bzr-command-prefix bzr-mode-commands-map))
57
(setq brz-mode-commands-map (make-sparse-keymap))
58
(dolist (spec brz-command-keys)
59
(define-key brz-mode-commands-map (car spec) (cadr spec)))
60
(define-key brz-mode-map brz-command-prefix brz-mode-commands-map))
62
(bzr-init-command-keymap)
62
(brz-init-command-keymap)
68
"Run \"bzr log\" in the repository top-level."
68
"Run \"brz log\" in the repository top-level."
73
"Run \"bzr diff\" in the repository top-level."
73
"Run \"brz diff\" in the repository top-level."
75
75
(save-some-buffers)
76
(bzr-run-command (bzr-command "diff") 'diff-mode))
76
(brz-run-command (brz-command "diff") 'diff-mode))
79
"Run \"bzr diff\" in the repository top-level."
79
"Run \"brz diff\" in the repository top-level."
83
(defun bzr-commit (message)
84
"Run \"bzr diff\" in the repository top-level."
83
(defun brz-commit (message)
84
"Run \"brz diff\" in the repository top-level."
85
85
(interactive "sCommit message: ")
86
86
(save-some-buffers)
87
(bzr "commit -m %s" (shell-quote-argument message)))
87
(brz "commit -m %s" (shell-quote-argument message)))
91
(defun bzr (format &rest args)
92
(bzr-run-command (apply #'bzr-command format args)))
94
(defun bzr-command (format &rest args)
95
(concat bzr-command " " (apply #'format format args)))
97
(defun bzr-run-command (command &optional pre-view-hook)
91
(defun brz (format &rest args)
92
(brz-run-command (apply #'brz-command format args)))
94
(defun brz-command (format &rest args)
95
(concat brz-command " " (apply #'format format args)))
97
(defun brz-run-command (command &optional pre-view-hook)
98
98
"Run COMMAND at the top-level and view the result in another window.
99
99
PRE-VIEW-HOOK is an optional function to call before entering
100
100
view-mode. This is useful to set the major-mode of the result buffer,
101
101
because if you did it afterwards then it would zap view-mode."
103
(let ((toplevel (bzr-toplevel)))
104
(with-current-buffer (get-buffer-create bzr-buffer)
103
(let ((toplevel (brz-toplevel)))
104
(with-current-buffer (get-buffer-create brz-buffer)
105
105
;; prevent `shell-command' from printing output in a message
106
106
(let ((max-mini-window-height 0))
107
107
(let ((default-directory toplevel))
109
109
(goto-char (point-min))
110
110
(when pre-view-hook
111
111
(funcall pre-view-hook))))
112
(if (zerop (buffer-size (get-buffer bzr-buffer)))
113
(message "(bzr command finished with no output.)")
114
(view-buffer-other-window bzr-buffer)
112
(if (zerop (buffer-size (get-buffer brz-buffer)))
113
(message "(brz command finished with no output.)")
114
(view-buffer-other-window brz-buffer)
115
115
;; Bury the buffer when dismissed.
116
(with-current-buffer (get-buffer bzr-buffer)
116
(with-current-buffer (get-buffer brz-buffer)
117
117
(setq view-exit-action #'bury-buffer))))
119
(defun bzr-current-file ()
119
(defun brz-current-file ()
120
120
(or (buffer-file-name)
121
121
(error "Don't know what file to use!")))
123
(defun bzr-cleanup (&optional buffer-name)
123
(defun brz-cleanup (&optional buffer-name)
124
124
"Cleanup before executing a command.
125
125
BUFFER-NAME is the command's output buffer."
126
(let ((name (or buffer-name bzr-buffer)))
127
(when (get-buffer bzr-buffer)
128
(kill-buffer bzr-buffer))))
126
(let ((name (or buffer-name brz-buffer)))
127
(when (get-buffer brz-buffer)
128
(kill-buffer brz-buffer))))
130
(defun bzr-toplevel ()
130
(defun brz-toplevel ()
131
131
"Return the top-level directory of the repository."
132
(let ((dir (bzr-find-repository)))
132
(let ((dir (brz-find-repository)))
134
134
(file-name-directory dir)
135
(error "Can't find bzr repository top-level."))))
135
(error "Can't find brz repository top-level."))))
137
(defun bzr-find-repository (&optional start-directory)
137
(defun brz-find-repository (&optional start-directory)
138
138
"Return the enclosing \".bzr\" directory, or nil if there isn't one."
139
139
(when (and (buffer-file-name)
140
140
(file-directory-p (file-name-directory (buffer-file-name))))
144
144
(or (car (directory-files dir t "^\\.bzr$"))
145
145
(let ((next-dir (file-name-directory (directory-file-name dir))))
146
146
(unless (equal dir next-dir)
147
(bzr-find-repository next-dir)))))))
147
(brz-find-repository next-dir)))))))
151
;;; Automaticaly enter bzr-mode when we open a file that's under bzr
151
;;; Automaticaly enter brz-mode when we open a file that's under brz
152
152
;;; control, i.e. if the .bzr directory can be found.
154
(defun bzr-find-file-hook ()
155
"Enable bzr-mode if the file is inside a bzr repository."
154
(defun brz-find-file-hook ()
155
"Enable brz-mode if the file is inside a brz repository."
156
156
;; Note: This function is called for every file that Emacs opens so
157
157
;; it mustn't make any mistakes.
158
(when (bzr-find-repository) (bzr-mode 1)))
160
(add-hook 'find-file-hooks 'bzr-find-file-hook)
158
(when (brz-find-repository) (brz-mode 1)))
160
(add-hook 'find-file-hooks 'brz-find-file-hook)
added
removed
contrib/emacs/brz-mode.el
