Mercurial > emacs
comparison lisp/vc-arch.el @ 100177:5a223111838e
(vc-arch-diff-switches): New option, for consistency with other backends.
(vc-arch-diff): Apply switches.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 03 Dec 2008 07:35:14 +0000 |
parents | 248f432fca05 |
children | a9dc0e7c3f2b |
comparison
equal
deleted
inserted
replaced
100176:5706ca7c3d02 | 100177:5a223111838e |
---|---|
1 ;;; vc-arch.el --- VC backend for the Arch version-control system | 1 ;;; vc-arch.el --- VC backend for the Arch version-control system |
2 | 2 |
3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 |
4 ;; Free Software Foundation, Inc. | |
4 | 5 |
5 ;; Author: FSF (see vc.el for full credits) | 6 ;; Author: FSF (see vc.el for full credits) |
6 ;; Maintainer: Stefan Monnier <monnier@gnu.org> | 7 ;; Maintainer: Stefan Monnier <monnier@gnu.org> |
7 | 8 |
8 ;; This file is part of GNU Emacs. | 9 ;; This file is part of GNU Emacs. |
61 (defun vc-arch-checkout-model (files) 'implicit) | 62 (defun vc-arch-checkout-model (files) 'implicit) |
62 | 63 |
63 ;;; | 64 ;;; |
64 ;;; Customization options | 65 ;;; Customization options |
65 ;;; | 66 ;;; |
67 | |
68 ;; It seems Arch diff does not accept many options, so this is not | |
69 ;; very useful. It exists mainly so that the VC backends are all | |
70 ;; consistent with regards to their treatment of diff switches. | |
71 (defcustom vc-arch-diff-switches t | |
72 "String or list of strings specifying switches for Arch diff under VC. | |
73 If nil, use the value of `vc-diff-switches'. If t, use no switches." | |
74 :type '(choice (const :tag "Unspecified" nil) | |
75 (const :tag "None" t) | |
76 (string :tag "Argument String") | |
77 (repeat :tag "Argument List" :value ("") string)) | |
78 :version "23.1" | |
79 :group 'vc) | |
66 | 80 |
67 (define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1") | 81 (define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1") |
68 | 82 |
69 (defcustom vc-arch-program | 83 (defcustom vc-arch-program |
70 (let ((candidates '("tla" "baz"))) | 84 (let ((candidates '("tla" "baz"))) |
448 (status | 462 (status |
449 (vc-arch-command | 463 (vc-arch-command |
450 (or buffer "*vc-diff*") | 464 (or buffer "*vc-diff*") |
451 (if async 'async 1) | 465 (if async 'async 1) |
452 nil "file-diffs" | 466 nil "file-diffs" |
453 ;; Arch does not support the typical flags. | 467 (vc-switches 'Arch 'diff) |
454 ;; (vc-switches 'Arch 'diff) | |
455 (file-relative-name file) | 468 (file-relative-name file) |
456 (if (equal oldvers (vc-working-revision file)) | 469 (if (equal oldvers (vc-working-revision file)) |
457 nil | 470 nil |
458 oldvers)))) | 471 oldvers)))) |
459 (if async 1 status))))) ; async diff, pessimistic assumption. | 472 (if async 1 status))))) ; async diff, pessimistic assumption. |