emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/vc-hgcmd e0f6e41 63/87: Fixed retrieval of working revi


From: Stefan Monnier
Subject: [elpa] externals/vc-hgcmd e0f6e41 63/87: Fixed retrieval of working revision on merge
Date: Sat, 5 Jun 2021 16:11:47 -0400 (EDT)

branch: externals/vc-hgcmd
commit e0f6e412c66bb8d57549d0d83dcdcab5b71db664
Author: muffinmad <andreyk.mad@gmail.com>
Commit: muffinmad <andreyk.mad@gmail.com>

    Fixed retrieval of working revision on merge
    
    `hg id` returns `rev1+rev2+` in this case
---
 vc-hgcmd.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vc-hgcmd.el b/vc-hgcmd.el
index 8676782..e70e322 100644
--- a/vc-hgcmd.el
+++ b/vc-hgcmd.el
@@ -5,7 +5,7 @@
 ;; Author: Andrii Kolomoiets <andreyk.mad@gmail.com>
 ;; Keywords: vc
 ;; URL: https://github.com/muffinmad/emacs-vc-hgcmd
-;; Package-Version: 1.6.6
+;; Package-Version: 1.6.7
 ;; Package-Requires: ((emacs "25.1"))
 
 ;; This file is NOT part of GNU Emacs.
@@ -870,7 +870,7 @@ Insert output to process buffer and check if amount of data 
is enought to parse
 
 (defun vc-hgcmd-working-revision (file)
   "Working revision of FILE. Result is revision of FILE up to repository 
revision."
-  (let* ((reporev (string-trim-right (vc-hgcmd-command "id" "-n") "+"))
+  (let* ((reporev (car-safe (split-string (vc-hgcmd-command "id" "-n") "+")))
          (filerev (when file
                     (vc-hgcmd-command
                      "log"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]