Mercurial > emacs
comparison lisp/vc-arch.el @ 90072:cb67264d6096
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12
Remove "-face" suffix from lazy-highlight face name
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22
<no summary provided>
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40
Fix regressions from latest reftex update
* miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0
tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2
Merge from miles@gnu.org--gnu-2004
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3
Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 16 Jan 2005 03:40:12 +0000 |
parents | f3ec05478165 5173e8c74cae |
children | a1b34dec1104 |
comparison
equal
deleted
inserted
replaced
90071:f6b4d0ebf147 | 90072:cb67264d6096 |
---|---|
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) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004 | 3 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
4 ;; Free Software Foundation, Inc. | 4 ;; Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: FSF (see vc.el for full credits) | 6 ;; Author: FSF (see vc.el for full credits) |
7 ;; Maintainer: Stefan Monnier <monnier@gnu.org> | 7 ;; Maintainer: Stefan Monnier <monnier@gnu.org> |
8 | 8 |
268 'edited))))))))) | 268 'edited))))))))) |
269 | 269 |
270 (defun vc-arch-workfile-version (file) | 270 (defun vc-arch-workfile-version (file) |
271 (let* ((root (expand-file-name "{arch}" (vc-arch-root file))) | 271 (let* ((root (expand-file-name "{arch}" (vc-arch-root file))) |
272 (defbranch (vc-arch-default-version file))) | 272 (defbranch (vc-arch-default-version file))) |
273 (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)--.*\\)--.*\\)\\'" defbranch)) | 273 (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" defbranch)) |
274 (let* ((archive (match-string 1 defbranch)) | 274 (let* ((archive (match-string 1 defbranch)) |
275 (category (match-string 4 defbranch)) | 275 (category (match-string 4 defbranch)) |
276 (branch (match-string 3 defbranch)) | 276 (branch (match-string 3 defbranch)) |
277 (version (match-string 2 defbranch)) | 277 (version (match-string 2 defbranch)) |
278 (sealed nil) (rev-nb 0) | 278 (sealed nil) (rev-nb 0) |
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 (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 |
385 (or buffer "*vc-diff*") | 385 (or buffer "*vc-diff*") |