* bug#17454: lisp/vc/vc-hg.el: vc-hg-unregister fixed with the hg forget command.
@ 2014-05-10 15:37 Santiago Payà i Miralta
2014-05-11 2:01 ` Glenn Morris
0 siblings, 1 reply; 2+ messages in thread
From: Santiago Payà i Miralta @ 2014-05-10 15:37 UTC (permalink / raw
To: 17454
[-- Attachment #1: Type: text/plain, Size: 2325 bytes --]
Hi emacs,
I wish to fix the lisp/vc/vc-hg.el (vc-hg-unregister) function with the hg
forget command.
Since Mercurial 1.3 (2009) "forget" shorthands "remove -Af".
As the forget help says forget mark the specified files so they will no
longer be tracked after the next commit. This only removes files from the
current branch, not from the entire project history, and it does not
delete them
from the working directory.
2014-05-17 Santiago Payà i Miralta <santiagopim@gmail.com>
* lisp/vc/vc-hg.el (vc-hg-unregister):
Fixed with the hg forget command.
From f38abf59917445fb96c2950e8880f3e40b896ecc Mon Sep 17 00:00:00 2001
From: Santiago Payà i Miralta <santiagopim@gmail.com>
Date: Sat, 10 May 2014 11:54:49 +0200
Subject: [PATCH] * lisp/vc/vc-hg.el (vc-hg-unregister): Fixed with the hg
forget command.
Since Mercurial 1.3 (2009) "forget" shorthands "remove -Af".
Forget mark the specified files so they will no longer be tracked
after the next commit. This only removes files from the current
branch, not from the entire project history, and it does not delete
them from the working directory.
---
lisp/vc/vc-hg.el | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index a53ed87..05b53a3 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))
--
1.7.9.5
[-- Attachment #2: Type: text/html, Size: 5892 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#17454: lisp/vc/vc-hg.el: vc-hg-unregister fixed with the hg forget command.
2014-05-10 15:37 bug#17454: lisp/vc/vc-hg.el: vc-hg-unregister fixed with the hg forget command Santiago Payà i Miralta
@ 2014-05-11 2:01 ` Glenn Morris
0 siblings, 0 replies; 2+ messages in thread
From: Glenn Morris @ 2014-05-11 2:01 UTC (permalink / raw
To: 17454-done
Version: 24.3.91
Thank you; applied to emacs-24 branch.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-11 2:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-10 15:37 bug#17454: lisp/vc/vc-hg.el: vc-hg-unregister fixed with the hg forget command Santiago Payà i Miralta
2014-05-11 2:01 ` Glenn Morris
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.