changeset:   109608:f8818ac3a2df
branch:      wilde
tag:         tip
user:        Sascha Wilde <wilde@sha-bang.de>
date:        Sun Aug 01 18:18:35 2010 +0200
files:       lisp/ChangeLog lisp/vc/vc-hg.el
description:
Ignore warnings by hg.


diff -r 955b39955186 -r f8818ac3a2df lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Aug 01 17:27:24 2010 +0200
+++ b/lisp/ChangeLog	Sun Aug 01 18:18:35 2010 +0200
@@ -3,6 +3,10 @@
 	* vc/vc-hg.el (vc-hg-state,vc-hg-working-revision): Replaced
 	setting HGRCPATH to "" by some less invasive --config options.
 
+	* vc/vc-hg.el (vc-hg-state,vc-hg-working-revision): Ignore output
+	on stderr to work even when hg emits any warnings.
+
+
 2010-08-01  Chong Yidong  <cyd@stupidchicken.com>
 
 	* emacs-lisp/package.el (package--list-packages): Fix column
diff -r 955b39955186 -r f8818ac3a2df lisp/vc/vc-hg.el
--- a/lisp/vc/vc-hg.el	Sun Aug 01 17:27:24 2010 +0200
+++ b/lisp/vc/vc-hg.el	Sun Aug 01 18:18:35 2010 +0200
@@ -173,7 +173,7 @@
 			     (append (list "TERM=dumb" "LANGUAGE=C")
 				     process-environment)))
 			(process-file
-			 "hg" nil t nil
+			 "hg" nil '(t nil) nil
 			 "--config" "alias.status=status"
 			 "--config" "defaults.status="
 			 "status" "-A" (file-relative-name file)))
@@ -211,7 +211,7 @@
 		      (let ((process-environment avoid-local-env))
 			;; Ignore all errors.
 			(process-file
-			 "hg" nil t nil
+			 "hg" nil '(t nil) nil
 			 "--config" "alias.parents=parents"
 			 "--config" "defaults.parents="
 			 "parents" "--template" "{rev}" (file-relative-name file)))