procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/vc-hg.el (vc-hg-create-tag, vc-hg-retrieve-tag): New functions.

Browse source 
Fixes: debbugs:17586
This commit is contained in:
Santiago Payà i Miralta 2014-06-06 12:38:44 -04:00 • committed by Stefan Monnier
parent 90b15d9159
commit 3112e4002c
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2014-06-06 Santiago Payà i Miralta <santiagopim@gmail.com>
* vc/vc-hg.el (vc-hg-create-tag, vc-hg-retrieve-tag): New functions
(bug#17586).
* vc/vc-hg.el (vc-hg-log-graph): New var.
(vc-hg-print-log): Use it.
(vc-hg-root-log-format): Include branch name and bookmarks; ignore

26
lisp/vc/vc-hg.el
View file

@ -82,8 +82,8 @@
;; - annotate-current-time () NOT NEEDED
;; - annotate-extract-revision-at-line () OK
;; TAG SYSTEM
;; - create-tag (dir name branchp) NEEDED
;; - retrieve-tag (dir name update) NEEDED
;; - create-tag (dir name branchp) OK
;; - retrieve-tag (dir name update) OK FIXME UPDATE BUFFERS
;; MISCELLANEOUS
;; - make-version-backups-p (file) ??
;; - repository-hostname (dirname) ??
@ -391,8 +391,26 @@ Optional arg REVISION is a revision to annotate from."
(if (match-beginning 3)
(match-string-no-properties 1)
(cons (match-string-no-properties 1)
(expand-file-name (match-string-no-properties 4)
(vc-hg-root default-directory)))))))
(expand-file-name (match-string-no-properties 4)
(vc-hg-root default-directory)))))))
;;; Tag system
(defun vc-hg-create-tag (dir name branchp)
"Attach the tag NAME to the state of the working copy."
(let ((default-directory dir))
(and (vc-hg-command nil 0 nil "status")
(vc-hg-command nil 0 nil (if branchp "bookmark" "tag") name))))
(defun vc-hg-retrieve-tag (dir name update)
"Retrieve the version tagged by NAME of all registered files at or below DIR."
(let ((default-directory dir))
(vc-hg-command nil 0 nil "update" name)
;; FIXME: update buffers if `update' is true
;; TODO: update *vc-change-log* buffer so can see @ if --graph
))
;;; Miscellaneous
(defun vc-hg-previous-revision (_file rev)
(let ((newrev (1- (string-to-number rev))))