@matheusbsbs / matheus-bagliano / commits / b9b7bab4b6
Fork 0

git.el: Preserve file marks when doing a full refresh.

Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Alexandre Julliard committed Sep 29, 2007 at 11:58 UTC b9b7bab4b6190ef879bb72c7fabf879fd9ca852f
1 file changed +28 -12
contrib/emacs/git.el
+28 -12
@@ -494,24 +494,31 @@ and returns the process output as a string."
494 (setf (git-fileinfo->orig-name info) nil)
495 (setf (git-fileinfo->needs-refresh info) t))))
496
497 -(defun git-set-filenames-state (status files state)
498 - "Set the state of a list of named files."
497 +(defun git-status-filenames-map (status func files &rest args)
498 + "Apply FUNC to the status files names in the FILES list."
499 (when files
500 (setq files (sort files #'string-lessp))
501 (let ((file (pop files))
502 (node (ewoc-nth status 0)))
503 (while (and file node)
504 (let ((info (ewoc-data node)))
505 - (cond ((string-lessp (git-fileinfo->name info) file)
506 - (setq node (ewoc-next status node)))
507 - ((string-equal (git-fileinfo->name info) file)
508 - (unless (eq (git-fileinfo->state info) state)
509 - (setf (git-fileinfo->state info) state)
510 - (setf (git-fileinfo->rename-state info) nil)
511 - (setf (git-fileinfo->orig-name info) nil)
512 - (setf (git-fileinfo->needs-refresh info) t))
513 - (setq file (pop files)))
514 - (t (setq file (pop files)))))))
505 + (if (string-lessp (git-fileinfo->name info) file)
506 + (setq node (ewoc-next status node))
507 + (if (string-equal (git-fileinfo->name info) file)
508 + (apply func info args))
509 + (setq file (pop files))))))))
510 +
511 +(defun git-set-filenames-state (status files state)
512 + "Set the state of a list of named files."
513 + (when files
514 + (git-status-filenames-map status
515 + (lambda (info state)
516 + (unless (eq (git-fileinfo->state info) state)
517 + (setf (git-fileinfo->state info) state)
518 + (setf (git-fileinfo->rename-state info) nil)
519 + (setf (git-fileinfo->orig-name info) nil)
520 + (setf (git-fileinfo->needs-refresh info) t)))
521 + files state)
522 (unless state ;; delete files whose state has been set to nil
523 (ewoc-filter status (lambda (info) (git-fileinfo->state info))))))
524
@@ -1197,11 +1204,20 @@ Return the list of files that haven't been handled."
1204 (interactive)
1205 (let* ((status git-status)
1206 (pos (ewoc-locate status))
1207 + (marked-files (git-get-filenames (ewoc-collect status (lambda (info) (git-fileinfo->marked info)))))
1208 (cur-name (and pos (git-fileinfo->name (ewoc-data pos)))))
1209 (unless status (error "Not in git-status buffer."))
1210 (git-run-command nil nil "update-index" "--refresh")
1211 (git-clear-status status)
1212 (git-update-status-files nil)
1213 + ; restore file marks
1214 + (when marked-files
1215 + (git-status-filenames-map status
1216 + (lambda (info)
1217 + (setf (git-fileinfo->marked info) t)
1218 + (setf (git-fileinfo->needs-refresh info) t))
1219 + marked-files)
1220 + (git-refresh-files))
1221 ; move point to the current file name if any
1222 (let ((node (and cur-name (git-find-status-file status cur-name))))
1223 (when node (ewoc-goto-node status node)))))