Mercurial > emacs
changeset 57566:d50f313f6fdd
(vc-arch-workfile-version): Don't burp if the patch-log directory is missing.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 17 Oct 2004 23:01:25 +0000 |
| parents | 5bab1954e91f |
| children | b313796ea830 |
| files | lisp/ChangeLog lisp/vc-arch.el |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 17 20:20:26 2004 +0000 +++ b/lisp/ChangeLog Sun Oct 17 23:01:25 2004 +0000 @@ -1,3 +1,8 @@ +2004-10-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-arch.el (vc-arch-workfile-version): Don't burp if the patch-log + directory is missing. + 2004-10-17 John Paul Wallington <jpw@gnu.org> * ibuffer.el (ibuffer-default-display-maybe-show-predicates): @@ -26,7 +31,7 @@ 2004-10-17 Richard M. Stallman <rms@gnu.org> - * paths.el (news-directory): Renamed from news-path. Old name alias. + * paths.el (news-directory): Rename from news-path. Old name alias. (rmail-spool-directory): Use defvar. (sendmail-program): Use defcustom. (remote-shell-program): Use defcustom.
--- a/lisp/vc-arch.el Sun Oct 17 20:20:26 2004 +0000 +++ b/lisp/vc-arch.el Sun Oct 17 23:01:25 2004 +0000 @@ -283,8 +283,8 @@ (setq logdir (expand-file-name version logdir)) (setq logdir (expand-file-name archive logdir)) (setq logdir (expand-file-name "patch-log" logdir)) - ;; Revision names go: base-0, patch-N, version-0, versionfix-N. - (dolist (file (directory-files logdir)) + (dolist (file (if (file-directory-p logdir) (directory-files logdir))) + ;; Revision names go: base-0, patch-N, version-0, versionfix-M. (when (and (eq (aref file 0) ?v) (not sealed)) (setq sealed t rev-nb 0)) (if (and (string-match "-\\([0-9]+\\)\\'" file)