branch: externals/vc-hgcmd
commit e13ae5e81e3095937d141dffb7b187e2ba34727e
Author: muffinmad <andreyk....@gmail.com>
Commit: muffinmad <andreyk....@gmail.com>
Fixed package-lint reported issues
error: You should depend on (emacs "26.1") if you need format field numbers.
warning: Closing parens should not be wrapped onto new lines.
---
vc-hgcmd.el | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/vc-hgcmd.el b/vc-hgcmd.el
index c5aab45..bbeb336 100644
--- a/vc-hgcmd.el
+++ b/vc-hgcmd.el
@@ -1,4 +1,4 @@
-;;; vc-hgcmd.el --- VC mercurial backend that uses hg command server -*-
lexical-binding: t; -*-
+;;; vc-hgcmd.el --- VC mercurial backend that uses hg command server -*-
lexical-binding: t -*-
;; Copyright (C) 2018-2019 Andrii Kolomoiets
@@ -567,12 +567,13 @@ Insert output to process buffer and check if amount of
data is enought to parse
(defun vc-hgcmd--parents (template &optional revision)
"Return parents of REVISION formatted by TEMPLATE string."
- (let ((parents (vc-hgcmd-command
- "log"
- "-r"
- (format "p1(%1$s)+p2(%1$s)" (or revision ""))
- "--template"
- (concat template "\\n"))))
+ (let* ((revision (or revision ""))
+ (parents (vc-hgcmd-command
+ "log"
+ "-r"
+ (format "p1(%s)+p2(%s)" revision revision)
+ "--template"
+ (concat template "\\n"))))
(when parents (split-string parents "\n"))))
(defun vc-hgcmd--file-relative-name (file)
@@ -664,8 +665,7 @@ Insert output to process buffer and check if amount of data
is enought to parse
(forward-line -1)
(vc-hgcmd-create-extra-fileinfo
'renamed-to
- (buffer-substring-no-properties (+ (point)
2) (line-end-position))))))
- ))
+ (buffer-substring-no-properties (+ (point)
2) (line-end-position))))))))
result)))
(forward-line))
(funcall update-function result)))
@@ -1199,8 +1199,7 @@ If FILES is nil show diff for whole changeset."
(defconst vc-hgcmd-annotate-re
(concat
"^\\(?: *[^ ]+ +\\)?\\([0-9]+\\) "
- "\\([0-9]\\{4\\}-[0-1][0-9]-[0-3][0-9]\\)[^:]*: "
- ))
+ "\\([0-9]\\{4\\}-[0-1][0-9]-[0-3][0-9]\\)[^:]*: "))
(defun vc-hgcmd--file-name-at-rev (files rev)
"Return filename of FILES at REV."
