mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

Fix the version number for added files.

Browse Source 
* vc-hg.el (vc-hg-working-revision): Check if the file is
registered after hg parent fails (Bug#5961).
This commit is contained in:
Dan Nicolaescu 2010-04-17 09:10:19 -07:00
parent 0433ffa6c7
commit bce3183024
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2010-04-17 Dan Nicolaescu <dann@ics.uci.edu>
Fix the version number for added files.
* vc-hg.el (vc-hg-working-revision): Check if the file is
registered after hg parent fails (Bug#5961).
2010-04-17 Glenn Morris <rgm@gnu.org>
* htmlfontify.el (htmlfontify-buffer)

26
lisp/vc-hg.el
View File

@ -196,16 +196,16 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(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,23 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
;; 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))
(process-file
"hg" nil nil nil
;; We use "log" here, if there's a faster command
;; that returns true for an 'added file and false
;; for an 'unregistered one, we could use that.
"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