diff options
Diffstat (limited to 'lisp/vc/vc-hg.el')
| -rw-r--r-- | lisp/vc/vc-hg.el | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index c9c1e91d483..6bec9edbf35 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -137,8 +137,7 @@ switches." :version "25.1") (defcustom vc-hg-revert-switches nil - "String or list of strings specifying switches for hg revert -under VC." + "String or list of strings specifying switches for hg revert under VC." :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) @@ -271,9 +270,9 @@ If `ask', you will be prompted for a branch type." (defcustom vc-hg-symbolic-revision-styles '(builtin-active-bookmark "{if(bookmarks,sub(' ',',',bookmarks),if(phabdiff,phabdiff,shortest(node,6)))}") - "List of ways to present versions symbolically. The version -that we use is the first one that successfully produces a -non-empty string. + "List of ways to present versions symbolically. +The version that we use is the first one that successfully +produces a non-empty string. Each entry in the list can be either: @@ -291,7 +290,7 @@ and an optional path to which to limit history) and produce a string. The function is called with `default-directory' set to within the repository. -If no list entry produces a useful revision, return `nil'." +If no list entry produces a useful revision, return nil." :type '(repeat (choice (const :tag "Active bookmark" builtin-active-bookmark) (string :tag "Hg template") @@ -301,7 +300,7 @@ If no list entry produces a useful revision, return `nil'." (defcustom vc-hg-use-file-version-for-mode-line-version nil "When enabled, the modeline contains revision information for the visited file. When not, the revision in the modeline is for the repository -working copy. `nil' is the much faster setting for +working copy. nil is the much faster setting for large repositories." :type 'boolean :version "26.1") @@ -643,8 +642,8 @@ Variable `vc-hg-create-bookmark' controls what kind of branch will be created." ;;; Native data structure reading (defcustom vc-hg-parse-hg-data-structures t - "If true, try directly parsing Mercurial data structures -directly instead of always running Mercurial. We try to be safe + "If true, try parsing Mercurial data structures directly. +This is done instead of always running Mercurial. We try to be safe against Mercurial data structure format changes and always fall back to running Mercurial directly." :type 'boolean @@ -673,7 +672,6 @@ Return the byte's value as an integer." (let* ((result nil) (flen (length fname)) (case-fold-search nil) - (inhibit-changing-match-data t) ;; Find a conservative bound for the loop below by using ;; Boyer-Moore on the raw dirstate without parsing it; we ;; know we can't possibly find fname _after_ the last place @@ -811,7 +809,7 @@ if we don't understand a construct, we signal (push c parts) (cond ((eq c ?\\) (setf state 'charclass-backslash)) ((eq c ?\]) (setf state 'normal)))) - (t (error "invalid state"))) + (t (error "Invalid state"))) (setf i (1+ i)))) (unless (eq state 'normal) (signal 'vc-hg-unsupported-syntax (list pcre))) @@ -851,8 +849,8 @@ if we don't understand a construct, we signal (push "\\[" parts)) (t (let ((x (substring glob i j))) - (setf x (replace-regexp-in-string - "\\\\" "\\\\" x t t)) + (setf x (string-replace + "\\" "\\\\" x)) (setf i (1+ j)) (cond ((eq (aref x 0) ?!) (setf (aref x 0) ?^)) @@ -977,10 +975,9 @@ REPO must be the directory name of an hg repository." "Test whether the ignore pattern set HGIP says to ignore FILENAME. FILENAME must be the file's true absolute name." (let ((patterns (vc-hg--ignore-patterns-ignore-patterns hgip)) - (inhibit-changing-match-data t) (ignored nil)) (while (and patterns (not ignored)) - (setf ignored (string-match (pop patterns) filename))) + (setf ignored (string-match-p (pop patterns) filename))) ignored)) (defvar vc-hg--cached-ignore-patterns nil @@ -1017,9 +1014,9 @@ FILENAME must be the file's true absolute name." "remotefilelog" "revlogv1" "store") - "List of Mercurial repository requirements we understand; if a -repository requires features not present in this list, we avoid -attempting to parse Mercurial data structures.") + "List of Mercurial repository requirements we understand. +If a repository requires features not present in this list, we +avoid attempting to parse Mercurial data structures.") (defun vc-hg--requirements-understood-p (repo) "Check that we understand the format of the given repository. @@ -1044,7 +1041,8 @@ Avoids the need to repeatedly scan dirstate on repeated calls to (equal size (pop cache)) (equal ascii-fname (pop cache))) (pop cache) - (let ((result (vc-hg--raw-dirstate-search dirstate ascii-fname))) + (let ((result (save-match-data + (vc-hg--raw-dirstate-search dirstate ascii-fname)))) (setf vc-hg--dirstate-scan-cache (list dirstate mtime size ascii-fname result)) result)))) @@ -1151,7 +1149,7 @@ hg binary." (expand-file-name old))) (defun vc-hg-register (files &optional _comment) - "Register FILES under hg. COMMENT is ignored." + "Register FILES under hg. COMMENT is ignored." (vc-hg-command nil 0 files "add")) (defun vc-hg-create-repo () |