# HG changeset patch # User Stefan Monnier # Date 1104703207 0 # Node ID 945a627eedd995b17b5283028b1aa3085b178840 # Parent 8a9e4a779eb81f569991aea7310c96034c04b679 (vc-arch-workfile-version): Handle the empty-branch case. diff -r 8a9e4a779eb8 -r 945a627eedd9 lisp/ChangeLog --- a/lisp/ChangeLog Sun Jan 02 18:08:12 2005 +0000 +++ b/lisp/ChangeLog Sun Jan 02 22:00:07 2005 +0000 @@ -1,5 +1,7 @@ 2005-01-02 Stefan + * vc-arch.el (vc-arch-workfile-version): Handle the empty-branch case. + * files.el (hack-local-variables): Fix last change. 2005-01-02 Jay Belanger @@ -25,8 +27,7 @@ 2005-01-01 Jay Belanger * calc/calc-yank.el (calc-edit-mode): Change default header. - (calc-edit-finish, calc-show-edit-buffer): Adjust to handle new - header. + (calc-edit-finish, calc-show-edit-buffer): Adjust to handle new header. * calc/calc-store.el (calc-edit-variable): Change title to match new header. * calc/calc-prog.el (calc-edit-user-syntax): Change title in edit diff -r 8a9e4a779eb8 -r 945a627eedd9 lisp/vc-arch.el --- a/lisp/vc-arch.el Sun Jan 02 18:08:12 2005 +0000 +++ b/lisp/vc-arch.el Sun Jan 02 22:00:07 2005 +0000 @@ -1,6 +1,6 @@ ;;; vc-arch.el --- VC backend for the Arch version-control system -;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) @@ -270,7 +270,7 @@ (defun vc-arch-workfile-version (file) (let* ((root (expand-file-name "{arch}" (vc-arch-root file))) (defbranch (vc-arch-default-version file))) - (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)--.*\\)--.*\\)\\'" defbranch)) + (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)\\(--.*\\)?\\)--.*\\)\\'" defbranch)) (let* ((archive (match-string 1 defbranch)) (category (match-string 4 defbranch)) (branch (match-string 3 defbranch))