Commit cf77dd27 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/vc/vc-dir.el (vc-dir-refresh): Reorder operations to try and avoid

bzr locking race condition.
parent 665addc9
2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> 2011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
   
* vc/vc-dir.el (vc-dir-refresh): Reorder operations to try and avoid
bzr locking race condition.
* emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is * emacs-lisp/edebug.el (edebug-instrument-function): Check a marker is
still valid before using it. still valid before using it.
   
......
...@@ -1061,6 +1061,9 @@ Throw an error if another update process is in progress." ...@@ -1061,6 +1061,9 @@ Throw an error if another update process is in progress."
(unless (vc-dir-fileinfo->directory info) (unless (vc-dir-fileinfo->directory info)
(setf (vc-dir-fileinfo->needs-update info) t) nil)) (setf (vc-dir-fileinfo->needs-update info) t) nil))
vc-ewoc) vc-ewoc)
;; Bzr has serious locking problems, so setup the headers first (this is
;; synchronous) rather than doing it while dir-status is running.
(ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) "")
(lexical-let ((buffer (current-buffer))) (lexical-let ((buffer (current-buffer)))
(with-current-buffer vc-dir-process-buffer (with-current-buffer vc-dir-process-buffer
(cd def-dir) (cd def-dir)
...@@ -1081,8 +1084,7 @@ Throw an error if another update process is in progress." ...@@ -1081,8 +1084,7 @@ Throw an error if another update process is in progress."
(vc-dir-refresh-files (vc-dir-refresh-files
(mapcar 'vc-dir-fileinfo->name remaining) (mapcar 'vc-dir-fileinfo->name remaining)
'up-to-date) 'up-to-date)
(setq mode-line-process nil))))))))) (setq mode-line-process nil))))))))))))
(ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) ""))))
(defun vc-dir-show-fileentry (file) (defun vc-dir-show-fileentry (file)
"Insert an entry for a specific file into the current *VC-dir* listing. "Insert an entry for a specific file into the current *VC-dir* listing.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment