diff options
| author | Santiago PayĆ i Miralta | 2014-05-10 19:01:08 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-10 19:01:08 -0700 |
| commit | 0add0959909b850c862a2b7bd59768c200147f56 (patch) | |
| tree | 23d23a0d7b9f7e3ccdbe2e05d14e56d7d55bbfbd | |
| parent | e7caef591fa1a4348f40a9da72f2718371bbfefb (diff) | |
| download | emacs-0add0959909b850c862a2b7bd59768c200147f56.tar.gz emacs-0add0959909b850c862a2b7bd59768c200147f56.zip | |
* 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 @@ | |||
| 1 | 2014-05-11 Santiago PayĆ i Miralta <santiagopim@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * vc/vc-hg.el (vc-hg-unregister): New function. (Bug#17454) | ||
| 4 | |||
| 1 | 2014-05-11 Glenn Morris <rgm@gnu.org> | 5 | 2014-05-11 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * emacs-lisp/find-gc.el: Move to ../admin. | 7 | * 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 @@ | |||
| 60 | ;; - responsible-p (file) OK | 60 | ;; - responsible-p (file) OK |
| 61 | ;; - could-register (file) OK | 61 | ;; - could-register (file) OK |
| 62 | ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED | 62 | ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED |
| 63 | ;; - unregister (file) COMMENTED OUT, MAY BE INCORRECT | 63 | ;; - unregister (file) OK |
| 64 | ;; * checkin (files rev comment) OK | 64 | ;; * checkin (files rev comment) OK |
| 65 | ;; * find-revision (file rev buffer) OK | 65 | ;; * find-revision (file rev buffer) OK |
| 66 | ;; * checkout (file &optional editable rev) OK | 66 | ;; * checkout (file &optional editable rev) OK |
| @@ -436,10 +436,9 @@ COMMENT is ignored." | |||
| 436 | ;; registered. | 436 | ;; registered. |
| 437 | (error)))) | 437 | (error)))) |
| 438 | 438 | ||
| 439 | ;; FIXME: This would remove the file. Is that correct? | 439 | (defun vc-hg-unregister (file) |
| 440 | ;; (defun vc-hg-unregister (file) | 440 | "Unregister FILE from hg." |
| 441 | ;; "Unregister FILE from hg." | 441 | (vc-hg-command nil 0 file "forget")) |
| 442 | ;; (vc-hg-command nil nil file "remove")) | ||
| 443 | 442 | ||
| 444 | (declare-function log-edit-extract-headers "log-edit" (headers string)) | 443 | (declare-function log-edit-extract-headers "log-edit" (headers string)) |
| 445 | 444 | ||