Subject: bug#5961 closed by Dan Nicolaescu <[email-masked]> (Re: bug#5961: 23.1 regression: vc-hg does not show 0 version number for 'added files)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 17 Apr 2010 16:11:02 +0000

This is an automatic notification regarding your bug report
which was filed against the emacs package:

#5961: 23.1 regression: vc-hg does not show 0 version number for 'added files

It has been closed by Dan Nicolaescu <[email-masked]>.

Their explanation is attached below along with your original report.
If this explanation is unsatisfactory and you have not received a
better one in a separate message then please contact Dan Nicolaescu <[email-masked]> by
replying to this email.

-- 
5961: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5961
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#5961: 23.1 regression: vc-hg does not show 0 version number for 'added files
From: Dan Nicolaescu <[email-masked]>
To: Chong Yidong <[email-masked]>
Cc: [email-masked]
Date: Sat, 17 Apr 2010 12:10:53 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

Chong Yidong <[email-masked]> writes:

> Dan Nicolaescu <[email-masked]> writes:
>
>> After this change:
>>
>>   Show working revision correctly for mercurial.
>>   * vc-hg.el (vc-hg-working-revision): Use hg parent instead of
>>   hg log as suggested by Alex Harsanyi <[email-masked]>,
>>
>> the mode-line show Hg@ instead of Hg@0 for files in the VC 'added
>> state.  This is a regression from 23.1.
>>
>> The problem is that the "hg parent " command does not distinguish
>> between the 'added and 'unregistered files.
>>
>> Should the patch below go into the 23.2 branch?
>
> Yes please.  I don't have hg installed at the moment, so it's
> inconvenient for me to double check your work, but if you're confident
> it's correct then please go ahead and commit it.

Thanks, done.

Subject: 23.1 regression: vc-hg does not show 0 version number for 'added files
From: Dan Nicolaescu <[email-masked]>
To: [email-masked]
Date: Fri, 16 Apr 2010 16:06:57 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

After this change:

  Show working revision correctly for mercurial.
  * vc-hg.el (vc-hg-working-revision): Use hg parent instead of
  hg log as suggested by Alex Harsanyi <[email-masked]>,

the mode-line show Hg@ instead of Hg@0 for files in the VC 'added state.  This is a regression from 23.1.

The problem is that the "hg parent " command does not distinguish
between the 'added and 'unregistered files.

Should the patch below go into the 23.2 branch?

=== modified file 'lisp/vc-hg.el'
--- lisp/vc-hg.el	2010-04-07 05:56:35 +0000
+++ lisp/vc-hg.el	2010-04-16 19:36:29 +0000
@@ -196,16 +196,16 @@ If nil, use the value of `vc-diff-switch
   (let*
       ((status nil)
        (default-directory (file-name-directory file))
+       ;; Avoid localization of messages so we can parse the output.
+       (avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=")
+				     process-environment))
        (out
         (with-output-to-string
           (with-current-buffer
               standard-output
             (setq status
                   (condition-case nil
-		      (let ((process-environment
-			     ;; Avoid localization of messages so we can parse the output.
-			     (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=")
-				     process-environment)))
+		      (let ((process-environment avoid-local-env))
 			;; Ignore all errors.
 			(process-file
 			 "hg" nil t nil
@@ -213,7 +213,21 @@ If nil, use the value of `vc-diff-switch
                     ;; Some problem happened.  E.g. We can't find an `hg'
                     ;; executable.
                     (error nil)))))))
-    (when (eq 0 status) out)))
+    (if (eq 0 status)
+	out
+      ;; Check if the file is in the 'added state, the above hg
+      ;; command does not distinguish between 'added and 'unregistered.
+      (setq status
+	    (condition-case nil
+		(let ((process-environment avoid-local-env))
+		  ;; Ignore all errors.
+		  (process-file
+		   "hg" nil nil nil
+		   "log" "-l1" (file-relative-name file)))
+	      ;; Some problem happened.  E.g. We can't find an `hg'
+	      ;; executable.
+	      (error nil)))
+      (when (eq 0 status) "0"))))
 
 ;;; History functions