[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch for assertions in vc-hg.el
From: |
Andy Moreton |
Subject: |
Patch for assertions in vc-hg.el |
Date: |
Tue, 19 Sep 2017 17:44:53 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.0.60 (windows-nt) |
For emacs on Windows, the cl-assert calls in vc-hg.el grumble due to file names
being in Windows format, and so failing to match the regexp.
The following fixes this for me (applies cleanly to emacs-26):
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 5fb93bc..5d058bb 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -685,7 +685,8 @@ vc-hg--pcre-to-elisp-re
patterns are rooted. We understand only a subset of PCRE syntax;
if we don't understand a construct, we signal
`vc-hg-unsupported-syntax'."
- (cl-assert (string-match "^/\\(.*/\\)?$" prefix))
+ (cl-assert (and (file-name-absolute-p prefix)
+ (directory-name-p prefix)))
(let ((parts nil)
(i 0)
(anchored nil)
@@ -873,7 +874,8 @@ vc-hg--slurp-hgignore-1
(defun vc-hg--slurp-hgignore (repo)
"Read hg ignore patterns from REPO.
REPO must be the directory name of an hg repository."
- (cl-assert (string-match "^/\\(.*/\\)?$" repo))
+ (cl-assert (and (file-name-absolute-p repo)
+ (directory-name-p repo)))
(let* ((hgignore (concat repo ".hgignore"))
(vc-hg--hgignore-patterns nil)
(vc-hg--hgignore-filenames nil))
@@ -928,7 +929,8 @@ vc-hg--file-ignored-p
(concat repo repo-relative-filename))))
(defun vc-hg--read-repo-requirements (repo)
- (cl-assert (string-match "^/\\(.*/\\)?$" repo))
+ (cl-assert (and (file-name-absolute-p repo)
+ (directory-name-p repo)))
(let* ((requires-filename (concat repo ".hg/requires")))
(and (file-exists-p requires-filename)
(with-temp-buffer
@@ -1000,7 +1001,8 @@ vc-hg-state-fast
;; dirstate must exist
(not (progn
(setf repo (expand-file-name repo))
- (cl-assert (string-match "^/\\(.*/\\)?$" repo))
+ (cl-assert (and (file-name-absolute-p repo)
+ (directory-name-p repo)))
(setf dirstate (concat repo ".hg/dirstate"))
(setf dirstate-attr (file-attributes dirstate))))
;; Repository must be in an understood format
- Patch for assertions in vc-hg.el,
Andy Moreton <=