aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-06-14 15:21:33 +0000
committerJuanma Barranquero2005-06-14 15:21:33 +0000
commitef5c2ecae7fef13c20a14fdf3f23928f88cfcf47 (patch)
tree6d95e1a5757e3fc47e6303fb4232170a95d2f0fe
parente20bb6294d0581eeb98aa827300d1e382f413e2c (diff)
downloademacs-ef5c2ecae7fef13c20a14fdf3f23928f88cfcf47.tar.gz
emacs-ef5c2ecae7fef13c20a14fdf3f23928f88cfcf47.zip
(vc-arch-checkin, vc-arch-diff): Follow error conventions.
-rw-r--r--lisp/vc-arch.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index b821928c539..569f864c0ea 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -178,7 +178,7 @@ Only the value `maybe' can be trusted :-(."
178(defun vc-arch-root (file) 178(defun vc-arch-root (file)
179 "Return the root directory of a Arch project, if any." 179 "Return the root directory of a Arch project, if any."
180 (or (vc-file-getprop file 'arch-root) 180 (or (vc-file-getprop file 'arch-root)
181 (vc-file-setprop 181 (vc-file-setprop
182 ;; Check the =tagging-method, in case someone naively manually 182 ;; Check the =tagging-method, in case someone naively manually
183 ;; creates a {arch} directory somewhere. 183 ;; creates a {arch} directory somewhere.
184 file 'arch-root (vc-find-root file "{arch}/=tagging-method")))) 184 file 'arch-root (vc-find-root file "{arch}/=tagging-method"))))
@@ -357,7 +357,7 @@ Return non-nil if FILE is unchanged."
357(defun vc-arch-checkout-model (file) 'implicit) 357(defun vc-arch-checkout-model (file) 'implicit)
358 358
359(defun vc-arch-checkin (file rev comment) 359(defun vc-arch-checkin (file rev comment)
360 (if rev (error "Committing to a specific revision is unsupported.")) 360 (if rev (error "Committing to a specific revision is unsupported"))
361 (let ((summary (file-relative-name file (vc-arch-root file)))) 361 (let ((summary (file-relative-name file (vc-arch-root file))))
362 ;; Extract a summary from the comment. 362 ;; Extract a summary from the comment.
363 (when (or (string-match "\\`Summary:[ \t]*\\(.*[^ \t\n]\\)\\([ \t]*\n\\)*" comment) 363 (when (or (string-match "\\`Summary:[ \t]*\\(.*[^ \t\n]\\)\\([ \t]*\n\\)*" comment)
@@ -376,7 +376,7 @@ Return non-nil if FILE is unchanged."
376 ;; so we can diff with the current file. 376 ;; so we can diff with the current file.
377 (setq newvers nil)) 377 (setq newvers nil))
378 (if newvers 378 (if newvers
379 (error "Diffing specific revisions not implemented.") 379 (error "Diffing specific revisions not implemented")
380 (let* ((async (and (not vc-disable-async-diff) (fboundp 'start-process))) 380 (let* ((async (and (not vc-disable-async-diff) (fboundp 'start-process)))
381 ;; Run the command from the root dir. 381 ;; Run the command from the root dir.
382 (default-directory (vc-arch-root file)) 382 (default-directory (vc-arch-root file))