[elpa] externals/vc-hgcmd 4528bac 61/87: use vc-state in find-file-hook; removed done todos

[Stefan Monnier]

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

    use vc-state in find-file-hook; removed done todos
---
 vc-hgcmd.el | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/vc-hgcmd.el b/vc-hgcmd.el
index e754424..b86cfd3 100644
--- a/vc-hgcmd.el
+++ b/vc-hgcmd.el
@@ -405,7 +405,6 @@ Insert output to process buffer and check if amount of data 
is enought to parse
             (set-process-query-on-exit-flag process nil)
             (set-process-coding-system process 'no-conversion 'no-conversion)
             ;; read hello message
-            ;; TODO parse encoding
             ;; check process again because it can be tramp sh process with 
output like "env: hg not found"
             (let ((output (vc-hgcmd--read-output)))
               (while (and (process-live-p process) (or (not output) (not 
(string-prefix-p "capabilities: " (cdr output)))))
@@ -936,8 +935,6 @@ Insert output to process buffer and check if amount of data 
is enought to parse
 
 (defalias 'vc-hgcmd-responsible-p 'vc-hgcmd-root)
 
-;; TODO receive-file
-
 (defun vc-hgcmd-unregister (file)
   "Forget FILE."
   (vc-hgcmd-command "forget" (vc-hgcmd--file-relative-name file)))
@@ -1312,18 +1309,14 @@ Insert output to process buffer and check if amount of 
data is enought to parse
     (vc-hgcmd-mark-resolved (list buffer-file-name))
     (remove-hook 'after-save-hook #'vc-hgcmd--after-save-hook t)))
 
-;; TODO It's really handy to autostart smerge but additional hg command will 
be called on every find-file
 (defun vc-hgcmd-find-file-hook ()
   "Find file hook. Start smerge session if vc state eq conflict."
-  (when (vc-hgcmd--file-unresolved-p buffer-file-name)
+  (when (and buffer-file-name
+             (eq (vc-state buffer-file-name 'Hgcmd) 'conflict))
     (smerge-start-session)
     (add-hook 'after-save-hook #'vc-hgcmd--after-save-hook nil t)
     (vc-message-unresolved-conflicts buffer-file-name)))
 
-;; TODO extra menu
-
-;; TODO extra-dir-menu. update -C for example or commit --close-branch or 
--amend without changes
-
 (defun vc-hgcmd-conflicted-files (&optional _dir)
   "List of files with conflict or resolved conflict."
   (let (result)