diff options
| author | Santiago Payà i Miralta <santiagopim@gmail.com> | 2014-05-10 19:01:08 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-05-10 19:01:08 -0700 |
| commit | 0add0959909b850c862a2b7bd59768c200147f56 (patch) | |
| tree | 23d23a0d7b9f7e3ccdbe2e05d14e56d7d55bbfbd | |
| parent | e7caef591fa1a4348f40a9da72f2718371bbfefb (diff) | |
| download | emacs-0add0959909b850c862a2b7bd59768c200147f56.tar.gz | |
* lisp/vc/vc-hg.el (vc-hg-unregister): New function (tiny change)
Fixes: debbugs:17454
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-hg.el | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 648f588e7af..69227adfd79 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-05-11 Santiago Payà i Miralta <santiagopim@gmail.com> (tiny change) + + * vc/vc-hg.el (vc-hg-unregister): New function. (Bug#17454) + 2014-05-11 Glenn Morris <rgm@gnu.org> * emacs-lisp/find-gc.el: Move to ../admin. diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index a53ed8758c4..05b53a3eeb6 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -60,7 +60,7 @@ ;; - responsible-p (file) OK ;; - could-register (file) OK ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED -;; - unregister (file) COMMENTED OUT, MAY BE INCORRECT +;; - unregister (file) OK ;; * checkin (files rev comment) OK ;; * find-revision (file rev buffer) OK ;; * checkout (file &optional editable rev) OK @@ -436,10 +436,9 @@ COMMENT is ignored." ;; registered. (error)))) -;; FIXME: This would remove the file. Is that correct? -;; (defun vc-hg-unregister (file) -;; "Unregister FILE from hg." -;; (vc-hg-command nil nil file "remove")) +(defun vc-hg-unregister (file) + "Unregister FILE from hg." + (vc-hg-command nil 0 file "forget")) (declare-function log-edit-extract-headers "log-edit" (headers string)) |