comparison lisp/vc-arch.el @ 90195:a1b34dec1104

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 358-423) - Update from CVS - Remove "-face" suffix from widget faces - Remove "-face" suffix from custom faces - Remove "-face" suffix from change-log faces - Remove "-face" suffix from compilation faces - Remove "-face" suffix from diff-mode faces - lisp/longlines.el (longlines-visible-face): Face removed - Remove "-face" suffix from woman faces - Remove "-face" suffix from whitespace-highlight face - Remove "-face" suffix from ruler-mode faces - Remove "-face" suffix from show-paren faces - Remove "-face" suffix from log-view faces - Remove "-face" suffix from smerge faces - Remove "-face" suffix from show-tabs faces - Remove "-face" suffix from highlight-changes faces - Remove "-face" suffix from and downcase info faces - Remove "-face" suffix from pcvs faces - Update uses of renamed pcvs faces - Tweak ChangeLog - Remove "-face" suffix from strokes-char face - Remove "-face" suffix from compare-windows face - Remove "-face" suffix from calendar faces - Remove "-face" suffix from diary-button face - Remove "-face" suffix from testcover faces - Remove "-face" suffix from viper faces - Remove "-face" suffix from org faces - Remove "-face" suffix from sgml-namespace face - Remove "-face" suffix from table-cell face - Remove "-face" suffix from tex-mode faces - Remove "-face" suffix from texinfo-heading face - Remove "-face" suffix from flyspell faces - Remove "-face" suffix from gomoku faces - Remove "-face" suffix from mpuz faces - Merge from gnus--rel--5.10 - Remove "-face" suffix from Buffer-menu-buffer face - Remove "-face" suffix from antlr-mode faces - Remove "-face" suffix from ebrowse faces - Remove "-face" suffix from flymake faces - Remove "-face" suffix from idlwave faces - Remove "-face" suffix from sh-script faces - Remove "-face" suffix from vhdl-mode faces - Remove "-face" suffix from which-func face - Remove "-face" suffix from cperl-mode faces - Remove "-face" suffix from ld-script faces - Fix cperl-mode font-lock problem - Tweak which-func face * gnus--rel--5.10 (patch 80-82) - Merge from emacs--cvs-trunk--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 15 Jun 2005 23:32:15 +0000
parents cb67264d6096 8269aa11cce4
children f9a65d7ebd29
comparison
equal deleted inserted replaced
90194:d940db5a66b9 90195:a1b34dec1104
176 'names)))) 176 'names))))
177 177
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"))))
185 185
186 (defun vc-arch-register (file &optional rev comment) 186 (defun vc-arch-register (file &optional rev comment)
355 ) 355 )
356 356
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)
364 (string-match "\\`[ \t]*\\(.*[^ \t\n]\\)[ \t]*\\(\n?\\'\\|\n\\([ \t]*\n\\)+\\)" comment)) 364 (string-match "\\`[ \t]*\\(.*[^ \t\n]\\)[ \t]*\\(\n?\\'\\|\n\\([ \t]*\n\\)+\\)" comment))
365 (setq summary (match-string 1 comment)) 365 (setq summary (match-string 1 comment))
374 (equal newvers (vc-workfile-version file))) 374 (equal newvers (vc-workfile-version file)))
375 ;; Newvers is the base revision and the current file is unchanged, 375 ;; Newvers is the base revision and the current 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))
383 (status 383 (status
384 (vc-arch-command 384 (vc-arch-command